Compare commits

..

No commits in common. "c8-stream-3.6" and "stream-javapackages-tools-202201-rhel-8.10.0" have entirely different histories.

11 changed files with 113 additions and 23 deletions

37
.gitignore vendored
View File

@ -1,2 +1,35 @@
SOURCES/org.eclipse.sisu.inject-0.3.4.tar.gz /results_*
SOURCES/org.eclipse.sisu.plexus-0.3.4.tar.gz /*.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

View File

@ -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

View File

@ -1,15 +1,18 @@
Name: sisu %bcond_with bootstrap
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
Source0: http://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/snapshot/releases/%{version}.tar.gz#/org.eclipse.sisu.inject-%{version}.tar.gz Name: sisu
Source1: http://git.eclipse.org/c/sisu/org.eclipse.sisu.plexus.git/snapshot/releases/%{version}.tar.gz#/org.eclipse.sisu.plexus-%{version}.tar.gz Epoch: 1
Version: 0.3.5
Release: 4%{?dist}
Summary: Eclipse dependency injection framework
# sisu is EPL-1.0, the bundled asm is BSD
License: EPL-1.0 and BSD
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 Source100: sisu-parent.pom
Source101: sisu-inject.pom Source101: sisu-inject.pom
@ -20,33 +23,38 @@ Patch2: sisu-ignored-tests.patch
Patch3: sisu-osgi-api.patch Patch3: sisu-osgi-api.patch
Patch4: 0001-Remove-dependency-on-glassfish-servlet-api.patch Patch4: 0001-Remove-dependency-on-glassfish-servlet-api.patch
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap-openjdk8
%else
BuildRequires: maven-local-openjdk8 BuildRequires: maven-local-openjdk8
BuildRequires: mvn(com.google.inject.extensions:guice-servlet) BuildRequires: mvn(com.google.inject.extensions:guice-servlet)
BuildRequires: mvn(com.google.inject:guice::no_aop:) BuildRequires: mvn(com.google.inject:guice::no_aop:)
BuildRequires: mvn(javax.annotation:javax.annotation-api) 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(javax.inject:javax.inject)
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-classworlds) BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds)
BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.osgi:osgi.core)
BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.testng:testng) BuildRequires: mvn(org.testng:testng)
%endif
Provides: %{name}-inject = %{epoch}:%{version}-%{release}
Provides: %{name}-plexus = %{epoch}:%{version}-%{release}
Provides: bundled(objectweb-asm) Provides: bundled(objectweb-asm)
%description %description
Java dependency injection framework with backward support for plexus and bean Java dependency injection framework with backward support for plexus and bean
style dependency injection. style dependency injection.
%{?module_package}
%{?javadoc_package} %{?javadoc_package}
%prep %prep
%setup -q -c -T %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 %{SOURCE100} pom.xml
cp %{SOURCE101} sisu-inject/pom.xml cp %{SOURCE101} sisu-inject/pom.xml
@ -72,10 +80,53 @@ cp %{SOURCE102} sisu-plexus/pom.xml
%install %install
%mvn_install %mvn_install
%files -n %{?module_prefix}sisu -f .mfiles %files -f .mfiles
%license sisu-inject/LICENSE.txt %license sisu-inject/LICENSE.txt
%changelog %changelog
* Thu Feb 08 2024 Marián Konček <mkoncek@redhat.com> - 1:0.3.5-4
- Rebuild to regenerate auto-requires
* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.5-3
- Rebuild to regenerate auto-requires
* 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 * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.4-2
- Build with OpenJDK 8 - Build with OpenJDK 8
@ -85,12 +136,18 @@ cp %{SOURCE102} sisu-plexus/pom.xml
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.3-9 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.3-9
- Mass rebuild for javapackages-tools 201902 - 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 * Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.3-8
- Merge inject and plexus subpackages - Merge inject and plexus subpackages
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.3-7 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.3-7
- Mass rebuild for javapackages-tools 201901 - 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 * Tue Jul 24 2018 Michael Simacek <msimacek@redhat.com> - 1:0.3.3-6
- Declare bundled objectweb-asm - Declare bundled objectweb-asm
- Fix license tag to include BSD for asm - Fix license tag to include BSD for asm

2
sources Normal file
View File

@ -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