.gitignore

@@ -1,2 +1,2 @@
-SOURCES/org.eclipse.sisu.inject-0.3.4.tar.gz
+SOURCES/org.eclipse.sisu.inject-0.3.5.tar.gz
-SOURCES/org.eclipse.sisu.plexus-0.3.4.tar.gz
+SOURCES/org.eclipse.sisu.plexus-0.3.5.tar.gz

.sisu.metadata

@@ -1,2 +1,2 @@
-52bc0ce065136e67bedb1ebec4b5e89f66e94f22 SOURCES/org.eclipse.sisu.inject-0.3.4.tar.gz
+5c7eab1e1698e4121cbbf981145096c82ecc3146 SOURCES/org.eclipse.sisu.inject-0.3.5.tar.gz
-3bd9315a76b32209d018c6ffe07bf55addd3c27c SOURCES/org.eclipse.sisu.plexus-0.3.4.tar.gz
+69e981cda932cb453fa23d9347e586ca194c74f7 SOURCES/org.eclipse.sisu.plexus-0.3.5.tar.gz

SOURCES/sisu-inject.pom

@@ -8,8 +8,7 @@
 		<dependency>
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>
-			<classifier>no_aop</classifier>
+			<version>5.1.0</version>
-			<version>4.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

SOURCES/sisu-plexus.pom

@@ -28,8 +28,7 @@
 		<dependency>
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>
-			<classifier>no_aop</classifier>
+			<version>5.1.0</version>
-			<version>4.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

SPECS/sisu.spec

@@ -2,16 +2,17 @@
 
 Name:           sisu
 Epoch:          1
-Version:        0.3.4
+Version:        0.3.5
-Release:        12%{?dist}
+Release:        14%{?dist}
 Summary:        Eclipse dependency injection framework
 # sisu is EPL-1.0, the bundled asm is BSD
-License:        EPL-1.0 and BSD
+License:        EPL-1.0 AND BSD-3-Clause
-URL:            http://eclipse.org/sisu
+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
+Source0:        https://github.com/eclipse/sisu.inject/archive/refs/tags/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
+Source1:        https://github.com/eclipse/sisu.plexus/archive/refs/tags/releases/%{version}.tar.gz#/org.eclipse.sisu.plexus-%{version}.tar.gz
 
 Source100:      sisu-parent.pom
 Source101:      sisu-inject.pom
@@ -22,12 +23,12 @@ 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:  mvn(javax.enterprise:cdi-api)
 BuildRequires:  mvn(javax.inject:javax.inject)
@@ -40,12 +41,13 @@ BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.testng:testng)
 %endif
 
-Provides:       bundled(objectweb-asm)
-
-Obsoletes:      %{name}-inject < 1:0.3.4-5
-Obsoletes:      %{name}-plexus < 1:0.3.4-5
 Provides:       %{name}-inject = %{epoch}:%{version}-%{release}
 Provides:       %{name}-plexus = %{epoch}:%{version}-%{release}
+Provides:       bundled(objectweb-asm)
+
+# Remove in Fedora 43
+Obsoletes:      plexus-containers < 2.2.0
+Obsoletes:      plexus-containers-container-default < 2.2.0
 
 %description
 Java dependency injection framework with backward support for plexus and bean
@@ -55,17 +57,17 @@ style dependency injection.
 
 %prep
 %setup -q -c -T
-tar xf %{SOURCE0} && mv releases/* sisu-inject && rmdir releases
+tar xf %{SOURCE0} && mv sisu.inject-releases-* sisu-inject
-tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases
+tar xf %{SOURCE1} && mv sisu.plexus-releases-* sisu-plexus
 
 cp %{SOURCE100} pom.xml
 cp %{SOURCE101} sisu-inject/pom.xml
 cp %{SOURCE102} sisu-plexus/pom.xml
 
-%patch -P 0
+%patch0
-%patch -P 2
+%patch2
-%patch -P 3
+%patch3
-%patch -P 4 -p1
+%patch4 -p1
 
 %pom_remove_dep :servlet-api sisu-inject
 
@@ -74,7 +76,7 @@ cp %{SOURCE102} sisu-plexus/pom.xml
 %mvn_file ":{*}" @1
 %mvn_package ":*{inject,plexus}"
 %mvn_package : __noinstall
-%mvn_alias :org.eclipse.sisu.plexus org.sonatype.sisu:sisu-inject-plexus
+%mvn_alias :org.eclipse.sisu.plexus org.sonatype.sisu:sisu-inject-plexus org.codehaus.plexus:plexus-container-default
 
 %build
 %mvn_build
@@ -86,24 +88,57 @@ cp %{SOURCE102} sisu-plexus/pom.xml
 %license sisu-inject/LICENSE.txt
 
 %changelog
-* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1:0.3.4-12
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:0.3.5-14
-- Fix patch usage
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 1:0.3.5-13
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:0.3.5-12
+- Bump release for June 2024 mass rebuild
+
+* Sat Feb 03 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.5-11
+- Add plexus-container-default alias
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.5-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.5-9
+- Rebuild to regenerate auto-Requires on java
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.5-8
+- Convert License tag to SPDX format
+
+* Tue Aug 15 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.5-7
+- Build with default JDK 17
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Mar 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.5-5
+- Rebuild with no changes
+
+* Tue Mar 21 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.5-4
+- Port to Google Guice 5
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1:0.3.4-11
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.5-2
-- Rebuild with regenerated Requires on Java
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.4-10
+* Mon May 09 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.5-1
-- Rebuild to regenerate auto-requires
+- Update to upstream version 0.3.5
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.3.4-9
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:0.3.4-9
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for java-17-openjdk as system jdk
-  Related: rhbz#1991688
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.4-8
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.4-8
-- Rebuild to workaround DistroBaker issue
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.4-7
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.4-7
-- Bootstrap Maven for CentOS Stream 9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Tue Jun 01 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.4-6
 - Fix obsoletes on removed subpackages