From 2981f669ecade06b0b7b58191f564813e46fa09ef9dfd005a6c0dfe8e8371228 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 13 Apr 2024 18:22:08 +0000 Subject: [PATCH] Accepting request 1167574 from Java:packages:test 0.9.0.M2 OBS-URL: https://build.opensuse.org/request/show/1167574 OBS-URL: https://build.opensuse.org/package/show/Java:packages/sisu?expand=0&rev=27 --- sisu-OSGi-import-guava.patch | 20 -- sisu-build.tar.xz | 4 +- sisu-ignored-tests.patch | 205 ------------------ sisu-inject-0.3.5.tar.gz | 3 - sisu-inject-0.9.0.M2.tar.gz | 3 + sisu-inject.pom | 72 ------ ...-dependency-on-glassfish-servlet-api.patch | 29 +-- sisu-osgi-api.patch | 4 +- sisu-plexus-0.3.5.tar.gz | 3 - sisu-plexus-0.9.0.M2.tar.gz | 3 + sisu-plexus.pom | 67 ------ sisu-reproducible-index.patch | 6 +- sisu.spec | 51 ++--- 13 files changed, 44 insertions(+), 426 deletions(-) delete mode 100644 sisu-OSGi-import-guava.patch delete mode 100644 sisu-ignored-tests.patch delete mode 100644 sisu-inject-0.3.5.tar.gz create mode 100644 sisu-inject-0.9.0.M2.tar.gz delete mode 100644 sisu-inject.pom delete mode 100644 sisu-plexus-0.3.5.tar.gz create mode 100644 sisu-plexus-0.9.0.M2.tar.gz delete mode 100644 sisu-plexus.pom diff --git a/sisu-OSGi-import-guava.patch b/sisu-OSGi-import-guava.patch deleted file mode 100644 index 68cd3a2..0000000 --- a/sisu-OSGi-import-guava.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- sisu-inject/org.eclipse.sisu.inject/META-INF/MANIFEST.MF~ 2014-04-21 16:32:25.000000000 +0200 -+++ sisu-inject/org.eclipse.sisu.inject/META-INF/MANIFEST.MF 2014-04-23 10:53:22.538142253 +0200 -@@ -16,6 +16,7 @@ - com.google.inject.matcher;version="1.3", - com.google.inject.name;version="1.3", - com.google.inject.spi;version="1.3", -+ com.google.common.base, - org.osgi.framework;version="1.5", - org.osgi.util.tracker;version="1.4", - org.slf4j;resolution:=optional, ---- sisu-inject/org.eclipse.sisu.inject/build.properties~ 2015-02-25 14:46:42.392037463 +0100 -+++ sisu-inject/org.eclipse.sisu.inject/build.properties 2015-02-25 14:44:56.626803789 +0100 -@@ -17,5 +17,5 @@ - . - - # build with JSR250 v1.2 and workaround indirect Guava dependency via Guice 4 --extra.. = platform:/plugin/javax.annotation,platform:/plugin/com.google.guava --additional.bundles = javax.annotation,com.google.guava -+extra.. = platform:/plugin/javax.annotation-api,platform:/plugin/com.google.guava -+additional.bundles = javax.annotation-api,com.google.guava diff --git a/sisu-build.tar.xz b/sisu-build.tar.xz index 3b4b3f4..008edc6 100644 --- a/sisu-build.tar.xz +++ b/sisu-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d895814653bcb26afdc47aa0c1dc0ca3e9c19a649b2811e800707d7a19a1fb87 -size 1992 +oid sha256:40cd836ba9574f7dd4c8c359dde4e41951e6608df4e6613b68fc3b62e237a821 +size 3604 diff --git a/sisu-ignored-tests.patch b/sisu-ignored-tests.patch deleted file mode 100644 index 5af8dc8..0000000 --- a/sisu-ignored-tests.patch +++ /dev/null @@ -1,205 +0,0 @@ ---- sisu-inject/org.eclipse.sisu.inject.tests/src/org/eclipse/sisu/inject/LocatedBeansTest.java~ 2014-09-12 08:32:32.899725268 +0200 -+++ sisu-inject/org.eclipse.sisu.inject.tests/src/org/eclipse/sisu/inject/LocatedBeansTest.java 2014-09-12 08:37:45.656099710 +0200 -@@ -128,30 +128,6 @@ - assertSame( a, itr2.next().getValue() ); - } - -- public void testUnrestrictedSearch() -- { -- final LocatedBeans beans = locate( Key.get( Bean.class ) ); -- final Iterator> itr = beans.iterator(); -- -- assertTrue( itr.hasNext() ); -- assertEquals( QualifyingStrategy.DEFAULT_QUALIFIER, itr.next().getKey() ); -- assertTrue( itr.hasNext() ); -- assertEquals( QualifyingStrategy.BLANK_QUALIFIER, itr.next().getKey() ); -- assertTrue( itr.hasNext() ); -- assertEquals( Names.named( "Named1" ), itr.next().getKey() ); -- assertTrue( itr.hasNext() ); -- assertEquals( Names.named( "Named2" ), itr.next().getKey() ); -- assertTrue( itr.hasNext() ); -- assertEquals( QualifyingStrategy.BLANK_QUALIFIER, itr.next().getKey() ); -- assertTrue( itr.hasNext() ); -- assertEquals( MarkedBeanImpl1.class.getAnnotation( Marked.class ), itr.next().getKey() ); -- assertTrue( itr.hasNext() ); -- assertEquals( Names.named( "Marked2" ), itr.next().getKey() ); -- assertTrue( itr.hasNext() ); -- assertEquals( Names.named( "Marked3" ), itr.next().getKey() ); -- assertFalse( itr.hasNext() ); -- } -- - public void testNamedSearch() - { - final LocatedBeans beans = locate( Key.get( Bean.class, Named.class ) ); -@@ -181,20 +156,6 @@ - assertFalse( itr.hasNext() ); - } - -- public void testMarkedSearch() -- { -- final LocatedBeans beans = locate( Key.get( Bean.class, Marked.class ) ); -- final Iterator> itr = beans.iterator(); -- -- assertTrue( itr.hasNext() ); -- assertEquals( MarkedBeanImpl1.class.getAnnotation( Marked.class ), itr.next().getKey() ); -- assertTrue( itr.hasNext() ); -- assertEquals( MarkedBeanImpl2.class.getAnnotation( Marked.class ), itr.next().getKey() ); -- assertTrue( itr.hasNext() ); -- assertEquals( MarkedBeanProvider.class.getAnnotation( Marked.class ), itr.next().getKey() ); -- assertFalse( itr.hasNext() ); -- } -- - public void testMarkedWithAttributesSearch() - { - final LocatedBeans beans = ---- sisu-plexus/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java~ 2014-08-24 01:48:47.000000000 +0200 -+++ sisu-plexus/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java 2015-02-04 07:06:49.696531924 +0100 -@@ -159,83 +159,6 @@ - new PlexusXmlScanner( null, plexusXml, null ).scan( space, true ); - } - -- @SuppressWarnings( "deprecation" ) -- public void testComponents() -- { -- final ClassSpace space = new URLClassSpace( PlexusXmlScannerTest.class.getClassLoader() ); -- -- final Map metadata = new HashMap(); -- final PlexusXmlScanner scanner = new PlexusXmlScanner( null, null, metadata ); -- -- final Map> componentMap = scanner.scan( space, true ); -- -- assertEquals( 6, componentMap.size() ); -- -- final Component component1 = -- new ComponentImpl( DefaultBean.class, Hints.DEFAULT_HINT, Strategies.PER_LOOKUP, "" ); -- assertEquals( DefaultBean.class, componentMap.get( component1 ).load() ); -- -- final Component component2 = new ComponentImpl( Bean.class, "debug", Strategies.SINGLETON, "For debugging" ); -- assertEquals( DebugBean.class, componentMap.get( component2 ).load() ); -- -- final Component component3 = new ComponentImpl( Bean.class, Hints.DEFAULT_HINT, Strategies.SINGLETON, "" ); -- assertEquals( AnotherBean.class, componentMap.get( component3 ).load() ); -- -- final Component component4 = new ComponentImpl( Bean.class, "clone", Strategies.SINGLETON, "" ); -- assertEquals( DefaultBean.class, componentMap.get( component4 ).load().getSuperclass() ); -- final Class proxy = CustomTestClassLoader.proxy( componentMap.get( component4 ).load() ); -- -- try -- { -- assertNotNull( proxy.getMethod( "TestMe" ) ); -- } -- catch ( final NoSuchMethodException e ) -- { -- fail( "Proxied class is missing 'TestMe' method" ); -- } -- -- final PlexusBeanMetadata metadata1 = metadata.get( DefaultBean.class.getName() ); -- -- assertFalse( metadata1.isEmpty() ); -- -- assertEquals( new ConfigurationImpl( "someFieldName", "PRIMARY" ), -- metadata1.getConfiguration( new NamedProperty( "someFieldName" ) ) ); -- -- assertEquals( new ConfigurationImpl( "simple", "value" ), -- metadata1.getConfiguration( new NamedProperty( "simple" ) ) ); -- -- assertEquals( new ConfigurationImpl( "value", "" ), -- metadata1.getConfiguration( new NamedProperty( "value" ) ) ); -- -- assertEquals( new ConfigurationImpl( "emptyValue1", "" ), -- metadata1.getConfiguration( new NamedProperty( "emptyValue1" ) ) ); -- -- assertEquals( new ConfigurationImpl( "emptyValue2", "" ), -- metadata1.getConfiguration( new NamedProperty( "emptyValue2" ) ) ); -- -- assertFalse( metadata1.isEmpty() ); -- -- assertEquals( new RequirementImpl( Bean.class, true, "debug" ), -- metadata1.getRequirement( new NamedProperty( "bean", TypeLiteral.get( Bean.class ) ) ) ); -- -- assertFalse( metadata1.isEmpty() ); -- -- metadata1.getConfiguration( new NamedProperty( "foo" ) ); -- -- assertEquals( new RequirementImpl( Bean.class, false, Hints.DEFAULT_HINT, "debug" ), -- metadata1.getRequirement( new NamedProperty( "beanMap" ) ) ); -- -- assertFalse( metadata1.isEmpty() ); -- -- assertEquals( new RequirementImpl( Bean.class, false ), -- metadata1.getRequirement( new NamedProperty( "beanField" ) ) ); -- -- assertTrue( metadata1.isEmpty() ); -- -- assertNotNull( metadata.get( AnotherBean.class.getName() ) ); -- assertNull( metadata.get( DebugBean.class.getName() ) ); -- } -- - static class FixedClassSpace - implements ClassSpace - { -@@ -392,64 +315,4 @@ - } - } - -- static final class CustomTestClassLoader -- extends ClassLoader -- { -- private static final String PROXY_MARKER = "$proxy"; -- -- CustomTestClassLoader( final ClassLoader parent ) -- { -- super( parent ); -- } -- -- static Class proxy( final Class clazz ) -- { -- try -- { -- return new CustomTestClassLoader( clazz.getClassLoader() ).loadClass( clazz.getName() + PROXY_MARKER ); -- } -- catch ( final ClassNotFoundException e ) -- { -- throw new TypeNotPresentException( clazz.getName(), e ); -- } -- } -- -- @Override -- protected synchronized Class loadClass( final String name, final boolean resolve ) -- throws ClassNotFoundException -- { -- return super.loadClass( name, resolve ); -- } -- -- @Override -- protected Class findClass( final String name ) -- throws ClassNotFoundException -- { -- final String proxyName = name.replace( '.', '/' ); -- final String superName = proxyName.substring( 0, proxyName.length() - PROXY_MARKER.length() ); -- -- final ClassWriter cw = new ClassWriter( ClassWriter.COMPUTE_MAXS ); -- cw.visit( Opcodes.V1_5, Modifier.PUBLIC | Modifier.FINAL, proxyName, null, superName, null ); -- MethodVisitor mv = cw.visitMethod( Modifier.PUBLIC, "", "()V", null, null ); -- -- mv.visitCode(); -- mv.visitVarInsn( Opcodes.ALOAD, 0 ); -- mv.visitMethodInsn( Opcodes.INVOKESPECIAL, superName, "", "()V", false ); -- mv.visitInsn( Opcodes.RETURN ); -- mv.visitMaxs( 0, 0 ); -- mv.visitEnd(); -- -- mv = cw.visitMethod( Modifier.PUBLIC, "TestMe", "()V", null, null ); -- -- mv.visitCode(); -- mv.visitInsn( Opcodes.RETURN ); -- mv.visitMaxs( 0, 0 ); -- mv.visitEnd(); -- cw.visitEnd(); -- -- final byte[] buf = cw.toByteArray(); -- -- return defineClass( name, buf, 0, buf.length ); -- } -- } - } diff --git a/sisu-inject-0.3.5.tar.gz b/sisu-inject-0.3.5.tar.gz deleted file mode 100644 index d1057c8..0000000 --- a/sisu-inject-0.3.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8cb5b00685ea7167d2a262fdab0ca9c10cd3be4891514e26ec265521f15d6b87 -size 296324 diff --git a/sisu-inject-0.9.0.M2.tar.gz b/sisu-inject-0.9.0.M2.tar.gz new file mode 100644 index 0000000..7aed333 --- /dev/null +++ b/sisu-inject-0.9.0.M2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:087d6cb468026936e1fa03edfd1a96450997043e1876fa737ce91dd476301b45 +size 3235791 diff --git a/sisu-inject.pom b/sisu-inject.pom deleted file mode 100644 index db3172d..0000000 --- a/sisu-inject.pom +++ /dev/null @@ -1,72 +0,0 @@ - - 4.0.0 - org.eclipse.sisu - org.eclipse.sisu.inject - @VERSION@ - - - com.google.inject - guice - no_aop - 4.0 - provided - - - javax.inject - javax.inject - 1 - provided - - - javax.enterprise - cdi-api - 1.1 - - - javax.annotation - javax.annotation-api - 1.2 - provided - - - com.google.inject.extensions - guice-servlet - 4.0 - provided - - - javax.servlet - servlet-api - 2.5 - provided - - - org.slf4j - slf4j-api - 1.7.13 - provided - - - org.osgi - osgi.core - 6.0.0 - provided - - - junit - junit - 4.12 - provided - - - org.testng - testng - 6.9.10 - provided - - - - org.eclipse.sisu.inject/src - - diff --git a/sisu-no-dependency-on-glassfish-servlet-api.patch b/sisu-no-dependency-on-glassfish-servlet-api.patch index c462f81..16aea74 100644 --- a/sisu-no-dependency-on-glassfish-servlet-api.patch +++ b/sisu-no-dependency-on-glassfish-servlet-api.patch @@ -1,6 +1,6 @@ ---- sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java -+++ sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java -@@ -38,17 +38,6 @@ final class Implementations +--- sisu-inject/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/inject/Implementations.java 2024-04-09 19:53:29.797479006 +0200 ++++ sisu-inject/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/inject/Implementations.java 2024-04-09 19:59:23.506494426 +0200 +@@ -39,17 +39,6 @@ static { @@ -18,7 +18,7 @@ boolean hasJsr250Priority; try { -@@ -65,8 +54,6 @@ final class Implementations +@@ -66,8 +55,6 @@ // Constants // ---------------------------------------------------------------------- @@ -27,25 +27,26 @@ private static final boolean HAS_JSR250_PRIORITY; // ---------------------------------------------------------------------- -@@ -106,7 +93,7 @@ final class Implementations +@@ -107,8 +94,7 @@ - // peek behind servlet/filter extension bindings when checking priority, so we can order them by rank - final Class implementation = -- binding.acceptTargetVisitor( HAS_GUICE_SERVLET && isPriority ? ServletFinder.THIS : ClassFinder.THIS ); -+ binding.acceptTargetVisitor( ClassFinder.THIS ); + final Class annotationSource = + // when looking for @Priority also consider annotations on providers (and servlets/filters if available) +- binding.acceptTargetVisitor( isPriority ? ( HAS_GUICE_SERVLET ? ServletFinder.THIS : ProviderFinder.THIS ) +- : ClassFinder.THIS ); ++ binding.acceptTargetVisitor( isPriority ? ProviderFinder.THIS : ClassFinder.THIS ); T annotation = null; - if ( null != implementation ) -@@ -215,45 +202,4 @@ final class Implementations - return binding.getPrivateElements().getInjector().getBinding( binding.getKey() ).acceptTargetVisitor( this ); + if ( null != annotationSource ) +@@ -253,45 +239,4 @@ + return binding.getProviderKey().getTypeLiteral().getRawType(); } } - - /** -- * {@link ClassFinder} that can also peek behind servlet/filter bindings. +- * {@link ProviderFinder} that also returns servlet/filter implementations. - */ - static final class ServletFinder -- extends ClassFinder +- extends ProviderFinder - implements com.google.inject.servlet.ServletModuleTargetVisitor> - { - // ---------------------------------------------------------------------- diff --git a/sisu-osgi-api.patch b/sisu-osgi-api.patch index 019b700..6a0956b 100644 --- a/sisu-osgi-api.patch +++ b/sisu-osgi-api.patch @@ -1,5 +1,5 @@ ---- sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java~ 2015-09-13 20:15:37.000000000 +0200 -+++ sisu-plexus/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java 2017-01-29 19:56:51.608151337 +0100 +--- sisu-plexus/org.eclipse.sisu.plexus/src/main/java/org/eclipse/sisu/plexus/PlexusBundlePlan.java~ 2015-09-13 20:15:37.000000000 +0200 ++++ sisu-plexus/org.eclipse.sisu.plexus/src/main/java/org/eclipse/sisu/plexus/PlexusBundlePlan.java 2017-01-29 19:56:51.608151337 +0100 @@ -80,7 +80,7 @@ protected static boolean hasPlexusAnnotations( final Bundle bundle ) diff --git a/sisu-plexus-0.3.5.tar.gz b/sisu-plexus-0.3.5.tar.gz deleted file mode 100644 index 282e91f..0000000 --- a/sisu-plexus-0.3.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0bdb6e1475f6557a3f99c03dc2b19581d4615ec3384ae879c3161d39e66fa2b -size 389763 diff --git a/sisu-plexus-0.9.0.M2.tar.gz b/sisu-plexus-0.9.0.M2.tar.gz new file mode 100644 index 0000000..7c28770 --- /dev/null +++ b/sisu-plexus-0.9.0.M2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4189364def8ce23d0d84265c574b917dfd47512396832876f11ce3dc27c6858b +size 400361 diff --git a/sisu-plexus.pom b/sisu-plexus.pom deleted file mode 100644 index b138e52..0000000 --- a/sisu-plexus.pom +++ /dev/null @@ -1,67 +0,0 @@ - - 4.0.0 - org.eclipse.sisu - org.eclipse.sisu.plexus - @VERSION@ - - - ${project.groupId} - org.eclipse.sisu.inject - ${project.version} - - - org.codehaus.plexus - plexus-classworlds - 2.5.2 - - - org.codehaus.plexus - plexus-component-annotations - 1.6 - - - org.codehaus.plexus - plexus-utils - 3.0.22 - - - com.google.inject - guice - no_aop - 4.0 - provided - - - org.slf4j - slf4j-api - 1.7.13 - provided - - - org.osgi - osgi.core - 6.0.0 - provided - - - junit - junit - 4.12 - provided - - - - org.eclipse.sisu.plexus/src - - - META-INF/plexus - false - ${basedir}/org.eclipse.sisu.plexus/META-INF/plexus - - components.xml - - - - - diff --git a/sisu-reproducible-index.patch b/sisu-reproducible-index.patch index 4d391a4..ca40c9b 100644 --- a/sisu-reproducible-index.patch +++ b/sisu-reproducible-index.patch @@ -1,11 +1,11 @@ ---- sisu-0.3.5/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/AbstractSisuIndex.java 2023-09-05 15:00:59.314655718 +0200 -+++ sisu-0.3.5/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/AbstractSisuIndex.java 2023-09-05 15:04:15.889547023 +0200 +--- sisu-0.3.5/sisu-inject/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/AbstractSisuIndex.java 2023-09-05 15:00:59.314655718 +0200 ++++ sisu-0.3.5/sisu-inject/org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/space/AbstractSisuIndex.java 2023-09-05 15:04:15.889547023 +0200 @@ -158,7 +158,7 @@ final BufferedWriter writer = new BufferedWriter( getWriter( INDEX_FOLDER + name ) ); try { - for ( final String line : table ) -+ for ( final String line : new java.util.TreeSet( table ) ) ++ for ( final String line : new TreeSet( table ) ) { writer.write( line ); writer.newLine(); diff --git a/sisu.spec b/sisu.spec index 5138bc8..701e3cf 100644 --- a/sisu.spec +++ b/sisu.spec @@ -16,23 +16,19 @@ # -%global reltype release +%global reltype milestones Name: sisu -Version: 0.3.5 +Version: 0.9.0.M2 Release: 0 Summary: Eclipse dependency injection framework # sisu is EPL-1.0, bundled asm is BSD License: BSD-3-Clause AND EPL-1.0 Group: Development/Libraries/Java URL: https://www.eclipse.org/sisu/ -Source0: https://github.com/eclipse/sisu.inject/archive/refs/tags/releases/%{version}.tar.gz#/sisu-inject-%{version}.tar.gz -Source1: https://github.com/eclipse/sisu.plexus/archive/refs/tags/releases/%{version}.tar.gz#/sisu-plexus-%{version}.tar.gz +Source0: https://github.com/eclipse/sisu.inject/archive/refs/tags/%reltype/%{version}.tar.gz#/sisu-inject-%{version}.tar.gz +Source1: https://github.com/eclipse/sisu.plexus/archive/refs/tags/%reltype/%{version}.tar.gz#/sisu-plexus-%{version}.tar.gz Source2: %{name}-build.tar.xz -Source100: %{name}-inject.pom -Source101: %{name}-plexus.pom -Patch0: %{name}-OSGi-import-guava.patch Patch1: %{name}-no-dependency-on-glassfish-servlet-api.patch -Patch2: %{name}-ignored-tests.patch Patch3: %{name}-osgi-api.patch Patch4: %{name}-reproducible-index.patch BuildRequires: ant @@ -44,6 +40,7 @@ BuildRequires: google-guice BuildRequires: guice-servlet BuildRequires: javapackages-local >= 6 BuildRequires: junit +BuildRequires: junit5-minimal BuildRequires: osgi-core BuildRequires: plexus-classworlds BuildRequires: plexus-containers-component-annotations @@ -63,7 +60,6 @@ style dependency injection. %package inject Summary: Sisu inject Group: Development/Libraries/Java -Requires: mvn(javax.enterprise:cdi-api) %description inject This package contains %{summary}. @@ -71,10 +67,7 @@ This package contains %{summary}. %package plexus Summary: Sisu Plexus Group: Development/Libraries/Java -Requires: mvn(org.codehaus.plexus:plexus-classworlds) -Requires: mvn(org.codehaus.plexus:plexus-component-annotations) -Requires: mvn(org.codehaus.plexus:plexus-utils) -Requires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) = %{version} +Requires: %{name}-inject = %{version} %description plexus This package contains %{summary}. @@ -88,37 +81,23 @@ This package contains %{summary}. %prep %setup -q -c -T -tar xf %{SOURCE0} && mv sisu.inject-releases-%{version} sisu-inject -tar xf %{SOURCE1} && mv sisu.plexus-releases-%{version} sisu-plexus +tar xf %{SOURCE0} && mv sisu.inject-%{reltype}-%{version} sisu-inject +tar xf %{SOURCE1} && mv sisu.plexus-%{reltype}-%{version} sisu-plexus tar xf %{SOURCE2} -cp %{SOURCE100} sisu-inject/pom.xml -cp %{SOURCE101} sisu-plexus/pom.xml - -%patch -P 0 %patch -P 1 -%patch -P 2 %patch -P 3 %patch -P 4 -p1 -%pom_remove_dep :servlet-api sisu-inject - -for i in inject plexus; do - %pom_xpath_set -r /pom:project/pom:version %{version} %{name}-${i} -done -%pom_change_dep :org.eclipse.sisu.inject org.eclipse.sisu:org.eclipse.sisu.inject:%{version} %{name}-plexus - -%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 %{name}-plexus - %build mkdir -p lib build-jar-repository -s lib \ glassfish-annotation-api \ google-guice-no_aop \ - guice/guice-servlet \ javax.enterprise.inject/cdi-api \ javax.inject/atinject \ junit \ + junit5 \ osgi-core/osgi.core \ plexus/utils \ plexus/xml \ @@ -131,20 +110,22 @@ build-jar-repository -s lib \ %install # jar install -dm 0755 %{buildroot}%{_javadir} -install -pm 0644 %{name}-inject/target/org.eclipse.sisu.inject-%{version}.jar %{buildroot}%{_javadir}/org.eclipse.sisu.inject.jar -install -pm 0644 %{name}-plexus/target/org.eclipse.sisu.plexus-%{version}.jar %{buildroot}%{_javadir}/org.eclipse.sisu.plexus.jar +install -pm 0644 %{name}-inject/org.eclipse.sisu.inject/target/org.eclipse.sisu.inject-%{version}.jar \ + %{buildroot}%{_javadir}/org.eclipse.sisu.inject.jar +install -pm 0644 %{name}-plexus/org.eclipse.sisu.plexus/target/org.eclipse.sisu.plexus-%{version}.jar \ + %{buildroot}%{_javadir}/org.eclipse.sisu.plexus.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir} -%{mvn_install_pom} %{name}-inject/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.inject.pom +%{mvn_install_pom} %{name}-inject/org.eclipse.sisu.inject/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.inject.pom %add_maven_depmap org.eclipse.sisu.inject.pom org.eclipse.sisu.inject.jar -f inject -%{mvn_install_pom} %{name}-plexus/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.plexus.pom +%{mvn_install_pom} %{name}-plexus/org.eclipse.sisu.plexus/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.plexus.pom %add_maven_depmap org.eclipse.sisu.plexus.pom org.eclipse.sisu.plexus.jar -f plexus -a org.sonatype.sisu:sisu-inject-plexus # javadoc for i in inject plexus; do install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i} - cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/ + cp -pr %{name}-${i}/org.eclipse.sisu.${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/ done %fdupes -s %{buildroot}%{_javadocdir}