diff --git a/.gitignore b/.gitignore index 5c8a293..079e1e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/org.eclipse.sisu.inject-0.3.4.tar.gz -SOURCES/org.eclipse.sisu.plexus-0.3.4.tar.gz +SOURCES/sisu-0.9.0~M3.tar.gz diff --git a/.sisu.metadata b/.sisu.metadata index 32c8d3c..cb9e9de 100644 --- a/.sisu.metadata +++ b/.sisu.metadata @@ -1,2 +1 @@ -52bc0ce065136e67bedb1ebec4b5e89f66e94f22 SOURCES/org.eclipse.sisu.inject-0.3.4.tar.gz -3bd9315a76b32209d018c6ffe07bf55addd3c27c SOURCES/org.eclipse.sisu.plexus-0.3.4.tar.gz +c0c98c78e126180487cdb2d11a165a879bf1454b SOURCES/sisu-0.9.0~M3.tar.gz diff --git a/SOURCES/0001-Remove-dependency-on-glassfish-servlet-api.patch b/SOURCES/0001-Remove-dependency-on-glassfish-servlet-api.patch deleted file mode 100644 index a7f038e..0000000 --- a/SOURCES/0001-Remove-dependency-on-glassfish-servlet-api.patch +++ /dev/null @@ -1,98 +0,0 @@ -From b14ee1ef509d9717eaa29e672282901847f2f735 Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Mon, 16 Sep 2019 10:48:10 +0200 -Subject: [PATCH] Remove dependency on glassfish-servlet-api - ---- - .../eclipse/sisu/inject/Implementations.java | 56 +------------------ - 1 file changed, 1 insertion(+), 55 deletions(-) - -diff --git a/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java b/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java -index 523c9b2..89db5da 100644 ---- a/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java -+++ b/sisu-inject/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/Implementations.java -@@ -38,17 +38,6 @@ final class Implementations - - static - { -- boolean hasGuiceServlet; -- try -- { -- hasGuiceServlet = BindingTargetVisitor.class.isInstance( ServletFinder.THIS ); -- } -- catch ( final LinkageError e ) -- { -- hasGuiceServlet = false; -- } -- HAS_GUICE_SERVLET = hasGuiceServlet; -- - boolean hasJsr250Priority; - try - { -@@ -65,8 +54,6 @@ final class Implementations - // Constants - // ---------------------------------------------------------------------- - -- private static final boolean HAS_GUICE_SERVLET; -- - private static final boolean HAS_JSR250_PRIORITY; - - // ---------------------------------------------------------------------- -@@ -106,7 +93,7 @@ final class Implementations - - // 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 ); - - T annotation = null; - if ( null != implementation ) -@@ -215,45 +202,4 @@ final class Implementations - return binding.getPrivateElements().getInjector().getBinding( binding.getKey() ).acceptTargetVisitor( this ); - } - } -- -- /** -- * {@link ClassFinder} that can also peek behind servlet/filter bindings. -- */ -- static final class ServletFinder -- extends ClassFinder -- implements com.google.inject.servlet.ServletModuleTargetVisitor> -- { -- // ---------------------------------------------------------------------- -- // Constants -- // ---------------------------------------------------------------------- -- -- @SuppressWarnings( "hiding" ) -- static final BindingTargetVisitor> THIS = new ServletFinder(); -- -- // ---------------------------------------------------------------------- -- // Public methods -- // ---------------------------------------------------------------------- -- -- public Class visit( final com.google.inject.servlet.InstanceFilterBinding binding ) -- { -- return binding.getFilterInstance().getClass(); -- } -- -- public Class visit( final com.google.inject.servlet.InstanceServletBinding binding ) -- { -- return binding.getServletInstance().getClass(); -- } -- -- public Class visit( final com.google.inject.servlet.LinkedFilterBinding binding ) -- { -- // this assumes only one level of indirection: api-->impl -- return binding.getLinkedKey().getTypeLiteral().getRawType(); -- } -- -- public Class visit( final com.google.inject.servlet.LinkedServletBinding binding ) -- { -- // this assumes only one level of indirection: api-->impl -- return binding.getLinkedKey().getTypeLiteral().getRawType(); -- } -- } - } --- -2.21.0 - diff --git a/SOURCES/sisu-OSGi-import-guava.patch b/SOURCES/sisu-OSGi-import-guava.patch deleted file mode 100644 index 8ab5759..0000000 --- a/SOURCES/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/SOURCES/sisu-ignored-tests.patch b/SOURCES/sisu-ignored-tests.patch deleted file mode 100644 index 484fa7d..0000000 --- a/SOURCES/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/SOURCES/sisu-inject.pom b/SOURCES/sisu-inject.pom deleted file mode 100644 index 798a515..0000000 --- a/SOURCES/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/SOURCES/sisu-osgi-api.patch b/SOURCES/sisu-osgi-api.patch deleted file mode 100644 index 9250a6c..0000000 --- a/SOURCES/sisu-osgi-api.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 -@@ -80,7 +80,7 @@ - - protected static boolean hasPlexusAnnotations( final Bundle bundle ) - { -- final String imports = bundle.getHeaders().get( Constants.IMPORT_PACKAGE ); -+ final String imports = bundle.getHeaders().get( Constants.IMPORT_PACKAGE ).toString(); - return null != imports && imports.contains( "org.codehaus.plexus.component.annotations" ); - } - diff --git a/SOURCES/sisu-parent.pom b/SOURCES/sisu-parent.pom deleted file mode 100644 index 8df47e4..0000000 --- a/SOURCES/sisu-parent.pom +++ /dev/null @@ -1,12 +0,0 @@ - - 4.0.0 - org.fedoraproject.maven - aggregator-project - @VERSION@ - pom - - sisu-inject - sisu-plexus - - diff --git a/SOURCES/sisu-plexus.pom b/SOURCES/sisu-plexus.pom deleted file mode 100644 index 32eee04..0000000 --- a/SOURCES/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/SPECS/sisu.spec b/SPECS/sisu.spec index 8d9d2a2..405e095 100644 --- a/SPECS/sisu.spec +++ b/SPECS/sisu.spec @@ -1,81 +1,190 @@ +%bcond_with bootstrap +%global upstream_version %(echo %{version} | tr '~' '.') + Name: sisu -Version: 0.3.4 -Release: 2%{?dist} +Epoch: 1 +Version: 0.9.0~M3 +Release: 7%{?dist} Summary: Eclipse dependency injection framework -# sisu is EPL-1.0 -# bundled asm is BSD -License: EPL-1.0 and BSD -URL: http://eclipse.org/sisu +# sisu is EPL-1.0, the bundled asm is BSD +License: EPL-1.0 AND BSD-3-Clause +URL: https://eclipse.org/sisu/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -Source0: http://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/snapshot/releases/%{version}.tar.gz#/org.eclipse.sisu.inject-%{version}.tar.gz -Source1: http://git.eclipse.org/c/sisu/org.eclipse.sisu.plexus.git/snapshot/releases/%{version}.tar.gz#/org.eclipse.sisu.plexus-%{version}.tar.gz +Source0: https://github.com/eclipse-sisu/sisu-project/archive/refs/tags/milestones/0.9.0.M3.tar.gz#/sisu-%{version}.tar.gz -Source100: sisu-parent.pom -Source101: sisu-inject.pom -Source102: sisu-plexus.pom - -Patch0: sisu-OSGi-import-guava.patch -Patch2: sisu-ignored-tests.patch -Patch3: sisu-osgi-api.patch -Patch4: 0001-Remove-dependency-on-glassfish-servlet-api.patch - -BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local BuildRequires: mvn(com.google.inject.extensions:guice-servlet) -BuildRequires: mvn(com.google.inject:guice::no_aop:) +BuildRequires: mvn(com.google.inject:guice) BuildRequires: mvn(javax.annotation:javax.annotation-api) -BuildRequires: %{?module_prefix}mvn(javax.enterprise:cdi-api) -BuildRequires: mvn(javax.inject:javax.inject) +BuildRequires: mvn(javax.enterprise:cdi-api) +BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(junit:junit) -BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-classworlds) -BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-component-annotations) -BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) +BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-model) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.slf4j:slf4j-nop) +BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) BuildRequires: mvn(org.testng:testng) - +%endif +# Remove in Fedora 43 +Obsoletes: plexus-containers < 2.2.0 +# Remove in Fedora 43 +Obsoletes: plexus-containers-container-default < 2.2.0 +Provides: %{name}-inject = %{epoch}:%{version}-%{release} +Provides: %{name}-plexus = %{epoch}:%{version}-%{release} Provides: bundled(objectweb-asm) %description Java dependency injection framework with backward support for plexus and bean style dependency injection. -%{?module_package} -%{?javadoc_package} +%package maven-plugin +Summary: Sisu plugin for Apache Maven +# Remove in Fedora 45 +Obsoletes: sisu-mojos < 0.9.0~M3 + +%description maven-plugin +The Sisu Plugin for Maven provides mojos to generate +META-INF/sisu/javax.inject.Named index files for the Sisu container. + +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. %prep -%setup -q -c -T -tar xf %{SOURCE0} && mv releases/* sisu-inject && rmdir releases -tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases +%autosetup -p1 -n sisu-project-milestones-%{upstream_version} -cp %{SOURCE100} pom.xml -cp %{SOURCE101} sisu-inject/pom.xml -cp %{SOURCE102} sisu-plexus/pom.xml +%pom_disable_module org.eclipse.sisu.inject.extender +%pom_disable_module org.eclipse.sisu.plexus.extender -%patch0 -%patch2 -%patch3 -%patch4 -p1 +%pom_remove_dep :junit-bom +%pom_remove_dep :plexus-xml org.eclipse.sisu.plexus -%pom_remove_dep :servlet-api sisu-inject +%pom_remove_plugin -r :bnd-maven-plugin +%pom_remove_plugin -r :maven-jar-plugin +%pom_remove_plugin -r :jacoco-maven-plugin +%pom_remove_plugin -r :maven-enforcer-plugin +%pom_remove_plugin -r :maven-dependency-plugin +%pom_remove_plugin -r :maven-clean-plugin -%pom_xpath_set -r /pom:project/pom:version %{version} - -%mvn_file ":{*}" @1 -%mvn_package ":*{inject,plexus}" -%mvn_package : __noinstall -%mvn_alias :org.eclipse.sisu.plexus org.sonatype.sisu:sisu-inject-plexus +%mvn_package :sisu-maven-plugin maven-plugin +%mvn_alias :org.eclipse.sisu.plexus org.sonatype.sisu:sisu-inject-plexus org.codehaus.plexus:plexus-container-default %build -%mvn_build +%mvn_build -f %install %mvn_install -%files -n %{?module_prefix}sisu -f .mfiles -%license sisu-inject/LICENSE.txt +%files -f .mfiles +%doc README.md +%license LICENSE.txt + +%files maven-plugin -f .mfiles-maven-plugin + +%files javadoc -f .mfiles-javadoc %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 1:0.9.0~M3-3 +- Update javapackages test plan to f42 + +* Tue Aug 20 2024 Mikolaj Izdebski - 1:0.9.0~M3-1 +- Update to upstream version 0.9.0.M3 + +* Sat Jul 20 2024 Fedora Release Engineering - 1:0.3.5-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 31 2024 Mikolaj Izdebski - 1:0.3.5-14 +- Switch to a newer patch macro syntax + +* Tue Feb 27 2024 Jiri Vanek - 1:0.3.5-13 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1:0.3.5-12 +- bump of release for for java-21-openjdk as system jdk + +* Sat Feb 03 2024 Mikolaj Izdebski - 1:0.3.5-11 +- Add plexus-container-default alias + +* Sat Jan 27 2024 Fedora Release Engineering - 1:0.3.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Mikolaj Izdebski - 1:0.3.5-9 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 1:0.3.5-8 +- Convert License tag to SPDX format + +* Tue Aug 15 2023 Mikolaj Izdebski - 1:0.3.5-7 +- Build with default JDK 17 + +* Sat Jul 22 2023 Fedora Release Engineering - 1:0.3.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Mar 31 2023 Mikolaj Izdebski - 1:0.3.5-5 +- Rebuild with no changes + +* Tue Mar 21 2023 Mikolaj Izdebski - 1:0.3.5-4 +- Port to Google Guice 5 + +* Sat Jan 21 2023 Fedora Release Engineering - 1:0.3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1:0.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon May 09 2022 Mikolaj Izdebski - 1:0.3.5-1 +- Update to upstream version 0.3.5 + +* Sat Feb 05 2022 Jiri Vanek - 1:0.3.4-9 +- Rebuilt for java-17-openjdk as system jdk + +* Sat Jan 22 2022 Fedora Release Engineering - 1:0.3.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1:0.3.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 01 2021 Mikolaj Izdebski - 1:0.3.4-6 +- Fix obsoletes on removed subpackages + +* Mon May 17 2021 Mikolaj Izdebski - 1:0.3.4-5 +- Bootstrap build +- Non-bootstrap build + +* Wed Jan 27 2021 Fedora Release Engineering - 1:0.3.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1:0.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 1:0.3.4-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Feb 13 2020 Fabio Valentini - 1:0.3.4-1 +- Update to version 0.3.4. + +* Thu Jan 30 2020 Fedora Release Engineering - 1:0.3.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jan 25 2020 Mikolaj Izdebski - 0.3.4-2 - Build with OpenJDK 8 @@ -85,12 +194,18 @@ cp %{SOURCE102} sisu-plexus/pom.xml * Tue Nov 05 2019 Mikolaj Izdebski - 0.3.3-9 - Mass rebuild for javapackages-tools 201902 +* Fri Jul 26 2019 Fedora Release Engineering - 1:0.3.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jun 28 2019 Mikolaj Izdebski - 1:0.3.3-8 - Merge inject and plexus subpackages * Fri May 24 2019 Mikolaj Izdebski - 1:0.3.3-7 - Mass rebuild for javapackages-tools 201901 +* Sat Feb 02 2019 Fedora Release Engineering - 1:0.3.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jul 24 2018 Michael Simacek - 1:0.3.3-6 - Declare bundled objectweb-asm - Fix license tag to include BSD for asm