.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,35 +1,2 @@
-/results_*
+SOURCES/org.eclipse.sisu.inject-0.3.4.tar.gz
-/*.src.rpm
+SOURCES/org.eclipse.sisu.plexus-0.3.4.tar.gz
-
-/sonatype-sisu-sisu-1.4.2-0-gae9a407.tar.gz
-/sisu-1.4.3.2.tar.gz
-/sisu-2.1.1.tar.bz2
-/sisu-2.2.3.tar.xz
-/sisu-2.3.0.tar.xz
-/sisu-2.3.0.tar.gz
-/org.eclipse.sisu.inject-0.0.0.M4.tar.bz2
-/org.eclipse.sisu.plexus-0.0.0.M4.tar.bz2
-/org.eclipse.sisu.inject-0.0.0.M5.tar.bz2
-/org.eclipse.sisu.plexus-0.0.0.M5.tar.bz2
-/org.eclipse.sisu.inject-0.1.0.tar.bz2
-/org.eclipse.sisu.plexus-0.1.0.tar.bz2
-/org.eclipse.sisu.inject-0.1.1.tar.bz2
-/org.eclipse.sisu.plexus-0.1.1.tar.bz2
-/org.eclipse.sisu.inject-0.2.0.tar.bz2
-/org.eclipse.sisu.plexus-0.2.0.tar.bz2
-/org.eclipse.sisu.inject-0.2.1.tar.bz2
-/org.eclipse.sisu.plexus-0.2.1.tar.bz2
-/org.eclipse.sisu.inject-0.3.0.M1.tar.bz2
-/org.eclipse.sisu.plexus-0.3.0.M1.tar.bz2
-/org.eclipse.sisu.inject-0.3.0.tar.bz2
-/org.eclipse.sisu.plexus-0.3.0.tar.bz2
-/org.eclipse.sisu.inject-0.3.1.tar.bz2
-/org.eclipse.sisu.plexus-0.3.1.tar.bz2
-/org.eclipse.sisu.inject-0.3.2.tar.bz2
-/org.eclipse.sisu.plexus-0.3.2.tar.bz2
-/org.eclipse.sisu.inject-0.3.3.tar.bz2
-/org.eclipse.sisu.plexus-0.3.3.tar.bz2
-/org.eclipse.sisu.inject-0.3.4.tar.gz
-/org.eclipse.sisu.plexus-0.3.4.tar.gz
-/org.eclipse.sisu.inject-0.3.5.tar.gz
-/org.eclipse.sisu.plexus-0.3.5.tar.gz

.sisu.metadata

@@ -0,0 +1,2 @@
+52bc0ce065136e67bedb1ebec4b5e89f66e94f22 SOURCES/org.eclipse.sisu.inject-0.3.4.tar.gz
+3bd9315a76b32209d018c6ffe07bf55addd3c27c SOURCES/org.eclipse.sisu.plexus-0.3.4.tar.gz

SOURCES/sisu-inject.pom

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

SOURCES/sisu-plexus.pom

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

SPECS/sisu.spec

@@ -1,18 +1,15 @@
-%bcond_with bootstrap
-
 Name:           sisu
-Epoch:          1
+Version:        0.3.4
-Version:        0.3.5
+Release:        2%{?dist}
-Release:        14%{?dist}
 Summary:        Eclipse dependency injection framework
-# sisu is EPL-1.0, the bundled asm is BSD
+# sisu is EPL-1.0
-License:        EPL-1.0 AND BSD-3-Clause
+# bundled asm is BSD
-URL:            https://eclipse.org/sisu/
+License:        EPL-1.0 and BSD
+URL:            http://eclipse.org/sisu
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
-Source0:        https://github.com/eclipse/sisu.inject/archive/refs/tags/releases/%{version}.tar.gz#/org.eclipse.sisu.inject-%{version}.tar.gz
+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:        https://github.com/eclipse/sisu.plexus/archive/refs/tags/releases/%{version}.tar.gz#/org.eclipse.sisu.plexus-%{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
 
 Source100:      sisu-parent.pom
 Source101:      sisu-inject.pom
@@ -23,42 +20,33 @@ Patch2:         sisu-ignored-tests.patch
 Patch3:         sisu-osgi-api.patch
 Patch4:         0001-Remove-dependency-on-glassfish-servlet-api.patch
 
-%if %{with bootstrap}
+BuildRequires:  maven-local-openjdk8
-BuildRequires:  javapackages-bootstrap
-%else
-BuildRequires:  maven-local
 BuildRequires:  mvn(com.google.inject.extensions:guice-servlet)
-BuildRequires:  mvn(com.google.inject:guice)
+BuildRequires:  mvn(com.google.inject:guice::no_aop:)
 BuildRequires:  mvn(javax.annotation:javax.annotation-api)
-BuildRequires:  mvn(javax.enterprise:cdi-api)
+BuildRequires:  %{?module_prefix}mvn(javax.enterprise:cdi-api)
 BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-classworlds)
+BuildRequires:  %{?module_prefix}mvn(org.codehaus.plexus:plexus-classworlds)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
+BuildRequires:  %{?module_prefix}mvn(org.codehaus.plexus:plexus-component-annotations)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.osgi:osgi.core)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.testng:testng)
-%endif
 
-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
 style dependency injection.
 
+%{?module_package}
 %{?javadoc_package}
 
 %prep
 %setup -q -c -T
-tar xf %{SOURCE0} && mv sisu.inject-releases-* sisu-inject
+tar xf %{SOURCE0} && mv releases/* sisu-inject && rmdir releases
-tar xf %{SOURCE1} && mv sisu.plexus-releases-* sisu-plexus
+tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases
 
 cp %{SOURCE100} pom.xml
 cp %{SOURCE101} sisu-inject/pom.xml
@@ -76,7 +64,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 org.codehaus.plexus:plexus-container-default
+%mvn_alias :org.eclipse.sisu.plexus org.sonatype.sisu:sisu-inject-plexus
 
 %build
 %mvn_build
@@ -84,84 +72,10 @@ cp %{SOURCE102} sisu-plexus/pom.xml
 %install
 %mvn_install
 
-%files -f .mfiles
+%files -n %{?module_prefix}sisu -f .mfiles
 %license sisu-inject/LICENSE.txt
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:0.3.5-14
-- 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
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon May 09 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.5-1
-- Update to upstream version 0.3.5
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:0.3.4-9
-- Rebuilt for java-17-openjdk as system jdk
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.4-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.4-7
-- 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
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.4-5
-- Bootstrap build
-- Non-bootstrap build
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1:0.3.4-2
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu Feb 13 2020 Fabio Valentini <decathorpe@gmail.com> - 1:0.3.4-1
-- Update to version 0.3.4.
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.3-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.4-2
 - Build with OpenJDK 8
 
@@ -171,18 +85,12 @@ cp %{SOURCE102} sisu-plexus/pom.xml
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.3-9
 - Mass rebuild for javapackages-tools 201902
 
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.3-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.3-8
 - Merge inject and plexus subpackages
 
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.3-7
 - Mass rebuild for javapackages-tools 201901
 
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.3-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Tue Jul 24 2018 Michael Simacek <msimacek@redhat.com> - 1:0.3.3-6
 - Declare bundled objectweb-asm
 - Fix license tag to include BSD for asm

ci.fmf

@@ -1 +0,0 @@
-resultsdb-testcase: separate

gating.yaml

@@ -1,7 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_contexts:
-  - osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}

plans/javapackages.fmf

@@ -1,7 +0,0 @@
-summary: Run javapackages-specific tests
-discover:
-  how: fmf
-  url: https://src.fedoraproject.org/tests/javapackages
-  ref: c10s
-execute:
-  how: tmt

sources

@@ -1,2 +0,0 @@
-SHA512 (org.eclipse.sisu.inject-0.3.5.tar.gz) = 53efe8c948359eef9d9a569fc6e479e2747af06b8b36976edce52bae6100b0e3d01fa5b64ab55b24324dee5dac17d415c4e7bc150538e93c309341c99f65a7b8
-SHA512 (org.eclipse.sisu.plexus-0.3.5.tar.gz) = 168d3ef5c501f8ea5846f101b5361a295c48ed1bb9fe51ed21b8dae935336dff4cf538f598f2b675f1431efdc6866eab642d45fc0d53a1d1578c358d2766f24b