diff --git a/.gitignore b/.gitignore index 5c8a293..9e641a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/org.eclipse.sisu.inject-0.3.4.tar.gz -SOURCES/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 diff --git a/.sisu.metadata b/.sisu.metadata deleted file mode 100644 index 32c8d3c..0000000 --- a/.sisu.metadata +++ /dev/null @@ -1,2 +0,0 @@ -52bc0ce065136e67bedb1ebec4b5e89f66e94f22 SOURCES/org.eclipse.sisu.inject-0.3.4.tar.gz -3bd9315a76b32209d018c6ffe07bf55addd3c27c SOURCES/org.eclipse.sisu.plexus-0.3.4.tar.gz diff --git a/SOURCES/0001-Remove-dependency-on-glassfish-servlet-api.patch b/0001-Remove-dependency-on-glassfish-servlet-api.patch similarity index 100% rename from SOURCES/0001-Remove-dependency-on-glassfish-servlet-api.patch rename to 0001-Remove-dependency-on-glassfish-servlet-api.patch diff --git a/SOURCES/sisu-OSGi-import-guava.patch b/sisu-OSGi-import-guava.patch similarity index 100% rename from SOURCES/sisu-OSGi-import-guava.patch rename to sisu-OSGi-import-guava.patch diff --git a/SOURCES/sisu-ignored-tests.patch b/sisu-ignored-tests.patch similarity index 100% rename from SOURCES/sisu-ignored-tests.patch rename to sisu-ignored-tests.patch diff --git a/SOURCES/sisu-inject.pom b/sisu-inject.pom similarity index 97% rename from SOURCES/sisu-inject.pom rename to sisu-inject.pom index 798a515..7f64c0d 100644 --- a/SOURCES/sisu-inject.pom +++ b/sisu-inject.pom @@ -8,8 +8,7 @@ com.google.inject guice - no_aop - 4.0 + 5.1.0 provided diff --git a/SOURCES/sisu-osgi-api.patch b/sisu-osgi-api.patch similarity index 100% rename from SOURCES/sisu-osgi-api.patch rename to sisu-osgi-api.patch diff --git a/SOURCES/sisu-parent.pom b/sisu-parent.pom similarity index 100% rename from SOURCES/sisu-parent.pom rename to sisu-parent.pom diff --git a/SOURCES/sisu-plexus.pom b/sisu-plexus.pom similarity index 97% rename from SOURCES/sisu-plexus.pom rename to sisu-plexus.pom index 32eee04..5fd449d 100644 --- a/SOURCES/sisu-plexus.pom +++ b/sisu-plexus.pom @@ -28,8 +28,7 @@ com.google.inject guice - no_aop - 4.0 + 5.1.0 provided diff --git a/SPECS/sisu.spec b/sisu.spec similarity index 67% rename from SPECS/sisu.spec rename to sisu.spec index 8d9d2a2..634d72f 100644 --- a/SPECS/sisu.spec +++ b/sisu.spec @@ -1,15 +1,18 @@ -Name: sisu -Version: 0.3.4 -Release: 2%{?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 -BuildArch: noarch +%bcond_with bootstrap -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 +Name: sisu +Epoch: 1 +Version: 0.3.5 +Release: 14%{?dist} +Summary: Eclipse dependency injection framework +# 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: https://github.com/eclipse/sisu.inject/archive/refs/tags/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 Source100: sisu-parent.pom Source101: sisu-inject.pom @@ -20,33 +23,42 @@ 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.enterprise:cdi-api) BuildRequires: mvn(javax.inject:javax.inject) 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.codehaus.plexus:plexus-classworlds) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) +BuildRequires: 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 releases/* sisu-inject && rmdir releases -tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases +tar xf %{SOURCE0} && mv sisu.inject-releases-* sisu-inject +tar xf %{SOURCE1} && mv sisu.plexus-releases-* sisu-plexus cp %{SOURCE100} pom.xml cp %{SOURCE101} sisu-inject/pom.xml @@ -64,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 @@ -72,10 +84,84 @@ cp %{SOURCE102} sisu-plexus/pom.xml %install %mvn_install -%files -n %{?module_prefix}sisu -f .mfiles +%files -f .mfiles %license sisu-inject/LICENSE.txt %changelog +* Tue Oct 29 2024 Troy Dawson - 1:0.3.5-14 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Thu Aug 01 2024 Troy Dawson - 1:0.3.5-13 +- Bump release for Aug 2024 java mass rebuild + +* Mon Jun 24 2024 Troy Dawson - 1:0.3.5-12 +- Bump release for June 2024 mass rebuild + +* 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 +171,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 diff --git a/sources b/sources new file mode 100644 index 0000000..17f0b8c --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (org.eclipse.sisu.inject-0.3.5.tar.gz) = 53efe8c948359eef9d9a569fc6e479e2747af06b8b36976edce52bae6100b0e3d01fa5b64ab55b24324dee5dac17d415c4e7bc150538e93c309341c99f65a7b8 +SHA512 (org.eclipse.sisu.plexus-0.3.5.tar.gz) = 168d3ef5c501f8ea5846f101b5361a295c48ed1bb9fe51ed21b8dae935336dff4cf538f598f2b675f1431efdc6866eab642d45fc0d53a1d1578c358d2766f24b