commit d868abc2dde23db9e8a34111e6c04a783165d0c9 Author: Johnny Hughes Date: Wed Jan 15 12:54:50 2025 -0600 Import from Fedora diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..972ae37 --- /dev/null +++ b/.gitignore @@ -0,0 +1,36 @@ +/results_* +/*.src.rpm + +/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-0.9.0~M3.tar.gz diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..df26947 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,7 @@ +--- !Policy +product_versions: + - rhel-9 +decision_contexts: + - osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8ba3510 --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: c9s +execute: + how: tmt diff --git a/sisu.spec b/sisu.spec new file mode 100644 index 0000000..405e095 --- /dev/null +++ b/sisu.spec @@ -0,0 +1,424 @@ +%bcond_with bootstrap +%global upstream_version %(echo %{version} | tr '~' '.') + +Name: sisu +Epoch: 1 +Version: 0.9.0~M3 +Release: 7%{?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/sisu-project/archive/refs/tags/milestones/0.9.0.M3.tar.gz#/sisu-%{version}.tar.gz + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local +BuildRequires: mvn(com.google.inject.extensions:guice-servlet) +BuildRequires: mvn(com.google.inject:guice) +BuildRequires: mvn(javax.annotation:javax.annotation-api) +BuildRequires: mvn(javax.enterprise:cdi-api) +BuildRequires: mvn(javax.servlet:servlet-api) +BuildRequires: mvn(junit:junit) +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. + +%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 +%autosetup -p1 -n sisu-project-milestones-%{upstream_version} + +%pom_disable_module org.eclipse.sisu.inject.extender +%pom_disable_module org.eclipse.sisu.plexus.extender + +%pom_remove_dep :junit-bom +%pom_remove_dep :plexus-xml org.eclipse.sisu.plexus + +%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 + +%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 -f + +%install +%mvn_install + +%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 + +* Wed Nov 06 2019 Mikolaj Izdebski - 0.3.4-1 +- Update to upstream version 0.3.4 + +* 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 + +* Sat Jul 14 2018 Fedora Release Engineering - 1:0.3.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 2 2018 Mikolaj Izdebski - 1:0.3.3-4 +- Update license tag + +* Fri Feb 09 2018 Fedora Release Engineering - 1:0.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1:0.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Apr 11 2017 Michael Simacek - 1:0.3.3-1 +- Update to upstream version 0.3.3 + +* Sat Feb 11 2017 Fedora Release Engineering - 1:0.3.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Jan 29 2017 Mikolaj Izdebski - 1:0.3.2-6 +- Restore alias for org.sonatype.sisu:sisu-inject-plexus + +* Sun Jan 29 2017 Mikolaj Izdebski - 1:0.3.2-5 +- Build without Tycho +- Remove sisu-tests subpackage +- Drop old obsoletes + +* Mon Feb 22 2016 Mikolaj Izdebski - 1:0.3.2-4 +- Add alias for org.sonatype.sisu:sisu-inject-plexus + +* Fri Feb 05 2016 Fedora Release Engineering - 1:0.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jan 7 2016 Mikolaj Izdebski - 1:0.3.2-2 +- Remove unneeded patch + +* Wed Sep 16 2015 Mikolaj Izdebski - 1:0.3.2-1 +- Update to upstream version 0.3.2 + +* Fri Jun 19 2015 Fedora Release Engineering - 1:0.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon May 18 2015 Mikolaj Izdebski - 1:0.3.1-1 +- Update to upstream version 0.3.1 + +* Thu Apr 23 2015 Mikolaj Izdebski - 1:0.3.0-2 +- Install test artifacts + +* Mon Feb 23 2015 Mikolaj Izdebski - 1:0.3.0-1 +- Update to upstream version 0.3.0 + +* Wed Feb 18 2015 Mikolaj Izdebski - 1:0.3.0-0.2.M1 +- Unbundle ASM +- Resolves: rhbz#1085903 + +* Wed Feb 4 2015 Mikolaj Izdebski - 1:0.3.0-0.1.M1 +- Update to upstream milestone 0.3.0.M1 + +* Tue Sep 30 2014 Mikolaj Izdebski - 1:0.2.1-10 +- Port to plexus-utils 3.0.18 + +* Thu Sep 18 2014 Michal Srb - 1:0.2.1-9 +- Rebuild to fix metadata +- Remove explicit Requires + +* Fri Sep 12 2014 Mikolaj Izdebski - 1:0.2.1-8 +- Update to latest XMvn version +- Enable tests + +* Mon Aug 4 2014 Mikolaj Izdebski - 1:0.2.1-7 +- Fix build-requires on sonatype-oss-parent + +* Sun Jun 08 2014 Fedora Release Engineering - 1:0.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 30 2014 Mikolaj Izdebski - 1:0.2.1-5 +- Install JARs and POMs only + +* Thu May 29 2014 Mikolaj Izdebski - 1:0.2.1-4 +- Build with XMvn 2.0.0 + +* Wed May 07 2014 Michael Simacek - 1:0.2.1-3 +- Build with Java 8 + +* Wed Apr 23 2014 Mikolaj Izdebski - 1:0.2.1-2 +- Import guava in OSGi manifest + +* Tue Apr 22 2014 Mikolaj Izdebski - 1:0.2.1-1 +- Update to upstream version 0.2.1 +- Remove patch for Eclipse bug 429369 + +* Wed Apr 16 2014 Mikolaj Izdebski - 1:0.2.0-5 +- Update upstream patch for bug 429369 +- Force usage of Java 1.7 + +* Mon Mar 3 2014 Mikolaj Izdebski - 1:0.2.0-4 +- Revert upstream feature which introduced a regression +- Resolves: rhbz#1070915 + +* Thu Feb 20 2014 Michal Srb - 1:0.2.0-3 +- Remove R on cdi-api + +* Thu Feb 20 2014 Michal Srb - 1:0.2.0-2 +- Update BR/R for version 0.2.0 +- Enable tests + +* Mon Feb 17 2014 Mikolaj Izdebski - 1:0.2.0-1 +- Update to upstream version 0.2.0 + +* Wed Dec 4 2013 Mikolaj Izdebski - 1:0.1.1-1 +- Update to upstream version 0.1.1 + +* Wed Nov 13 2013 Mikolaj Izdebski - 1:0.1.0-1 +- Update to upstream version 0.1.0 + +* Wed Oct 23 2013 Mikolaj Izdebski - 1:0.0.0-0.7.M5 +- Rebuild to regenerate broken POMs +- Related: rhbz#1021484 + +* Fri Oct 18 2013 Mikolaj Izdebski - 1:0.0.0-0.6.M5 +- Don't inject pom.properties + +* Wed Sep 25 2013 Michal Srb - 1:0.0.0-0.5.M5 +- Update to upstream version 0.0.0.M5 +- Install EPL license file +- Inject pom.properties +- Regenerate BR +- Add R + +* Fri Sep 20 2013 Mikolaj Izdebski - 1:0.0.0-0.4.M4 +- Update to XMvn 1.0.0 + +* Tue Aug 13 2013 Mikolaj Izdebski - 1:0.0.0-0.3.M4 +- Obsolete sisu main package, resolves: rhbz#996288 + +* Tue Jul 23 2013 Mikolaj Izdebski - 1:0.0.0-0.2.M4 +- Remove unneeded provides and compat symlinks + +* Mon Jul 22 2013 Mikolaj Izdebski - 1:0.0.0-0.1.M4 +- Update to upstream version 0.0.0.M4 + +* Wed Mar 27 2013 Stanislav Ochotnicky - 2.3.0-8 +- Remove unneeded animal-sniffer BuildRequires +- Add forge-parent to BuildRequires to ensure it's present + +* Thu Mar 14 2013 Michal Srb - 2.3.0-7 +- sisu-inject-bean: add dependency on asm +- Fix dependencies on javax.inject and javax.enterprise.inject +- Remove bundled JARs and .class files from tarball + +* Thu Feb 7 2013 Mikolaj Izdebski - 2.3.0-6 +- Add ASM dependency only to a single module, not all of them +- Disable animal-sniffer plugin +- Don't generate auto-requires for optional dependencies + +* Wed Feb 06 2013 Tomas Radej - 2.3.0-5 +- Added BR on animal-sniffer + +* Tue Feb 05 2013 Tomas Radej - 2.3.0-4 +- Split into subpackages +- Build with new macros +- Unbundled objectweb-asm + +* Wed Dec 5 2012 Mikolaj Izdebski - 2.3.0-3 +- Fix OSGi __requires_exclude + +* Wed Dec 5 2012 Mikolaj Izdebski - 2.3.0-2 +- Disable OSGi auto-requires: org.sonatype.sisu.guava + +* Mon Dec 3 2012 Mikolaj Izdebski - 2.3.0-1 +- Update to upstream version 2.3.0 + +* Tue Jul 24 2012 Mikolaj Izdebski - 2.2.3-6 +- Convert patches to POM macros + +* Mon Jul 23 2012 Mikolaj Izdebski - 2.2.3-5 +- Fix license tag + +* Sat Jul 21 2012 Fedora Release Engineering - 2.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 2.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Aug 19 2011 Stanislav Ochotnicky - 2.2.3-2 +- Add backward compatible package path for lifecycles +- Remove temporary BRs/Rs + +* Thu Jun 23 2011 Stanislav Ochotnicky - 2.2.3-1 +- Update to latest upstream 2.2.3 (#683795) +- Add forge-parent to Requires +- Rework spec to be more simple, update patches + +* Tue Mar 1 2011 Stanislav Ochotnicky - 2.1.1-2 +- Add atinject into poms as dependency + +* Mon Feb 28 2011 Stanislav Ochotnicky - 2.1.1-1 +- Update to 2.1.1 +- Update patch +- Disable guice-eclipse for now + +* Wed Feb 09 2011 Fedora Release Engineering - 1.4.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Feb 2 2011 Stanislav Ochotnicky - 1.4.3.2-1 +- Update to latest upstream version +- Versionless jars & javadocs + +* Mon Oct 18 2010 Stanislav Ochotnicky - 1.4.2-2 +- Add felix-framework BR + +* Thu Oct 14 2010 Stanislav Ochotnicky - 1.4.2-1 +- Initial version of the package diff --git a/sources b/sources new file mode 100644 index 0000000..7d544fe --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (sisu-0.9.0~M3.tar.gz) = 9db26a463bc17ce68cd0e80495125808ca544099284b63f120b0ea02f24f620c39ca3067d4c7c2c5c6db4449656fe5175b8b19c3b4a8ad655de37fbe67afdff1