From 6ebd919fd547ca43ce0db4d165d2a1ff92187e5f Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 13 Mar 2025 14:07:51 +0000 Subject: [PATCH] import CS plexus-languages-1.2.0-12.module_el9+1171+eb38a622 --- .gitignore | 2 +- .plexus-languages.metadata | 2 +- SOURCES/generate-tarball.sh | 8 +-- SPECS/plexus-languages.spec | 136 +++++++++++++++++++++++++++++++++--- 4 files changed, 133 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index d81509a..921436d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/plexus-languages-0.9.10.tar.gz +SOURCES/plexus-languages-1.2.0.tar.gz diff --git a/.plexus-languages.metadata b/.plexus-languages.metadata index 20f1c78..e14220f 100644 --- a/.plexus-languages.metadata +++ b/.plexus-languages.metadata @@ -1 +1 @@ -bac28e84a65306bf990e3d1c0e0cd2058a3de5b3 SOURCES/plexus-languages-0.9.10.tar.gz +04e6394206ba363b3dae3c0019e20a028bc7bf9b SOURCES/plexus-languages-1.2.0.tar.gz diff --git a/SOURCES/generate-tarball.sh b/SOURCES/generate-tarball.sh index 4472c39..95953ce 100755 --- a/SOURCES/generate-tarball.sh +++ b/SOURCES/generate-tarball.sh @@ -9,13 +9,13 @@ wget "https://github.com/codehaus-plexus/plexus-languages/archive/plexus-languag rm -rf tarball-tmp mkdir tarball-tmp -cd tarball-tmp -tar xf "../${name}-${version}.orig.tar.gz" +pushd tarball-tmp +tar -xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL find -name '*.jar' -delete find -name '*.class' -delete -tar cf "../${name}-${version}.tar.gz" * -cd .. +tar -czf "../${name}-${version}.tar.gz" * +popd rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/SPECS/plexus-languages.spec b/SPECS/plexus-languages.spec index fc8f044..07871da 100644 --- a/SPECS/plexus-languages.spec +++ b/SPECS/plexus-languages.spec @@ -1,39 +1,51 @@ +%bcond_with bootstrap + Name: plexus-languages -Version: 0.9.10 -Release: 5%{?dist} +Version: 1.2.0 +Release: 12%{?dist} Summary: Plexus Languages -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/codehaus-plexus/plexus-languages BuildArch: noarch +ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +Source1: https://www.apache.org/licenses/LICENSE-2.0.txt # Sources contain bundled jars that we cannot verify for licensing Source2: generate-tarball.sh +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local BuildRequires: mvn(com.thoughtworks.qdox:qdox) BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) +BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) BuildRequires: mvn(org.ow2.asm:asm) +%endif %description Plexus Languages is a set of Plexus components that maintain shared language features. -%{?javadoc_package} +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. %prep -%setup -q -n plexus-languages-plexus-languages-%{version} +%autosetup -p1 -n plexus-languages-plexus-languages-%{version} cp %{SOURCE1} . +%pom_remove_plugin :maven-enforcer-plugin + %build -# we don't have mockito 2 yet + many tests rely on bundled test jars/classes +# many tests rely on bundled test jars/classes %mvn_build -f %install @@ -42,13 +54,119 @@ cp %{SOURCE1} . %files -f .mfiles %license LICENSE-2.0.txt +%files javadoc -f .mfiles-javadoc + %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 1.2.0-11 +- Update javapackages test plan to f42 + +* Fri Jul 19 2024 Fedora Release Engineering - 1.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.2.0-6 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1.2.0-5 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 29 2024 Fedora Release Engineering - 1.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 18 2023 Marian Koncek - 1.2.0-1 +- Update to upstream version 1.2.0 + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.1.2-2 +- Convert License tag to SPDX format + +* Wed Aug 23 2023 Mikolaj Izdebski - 1.1.2-1 +- Update to upstream version 1.1.2 + +* Fri Jul 21 2023 Fedora Release Engineering - 1.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 1.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Aug 31 2022 Marian Koncek - 1.1.1-3 +- Enable jpms support + +* Fri Jul 22 2022 Fedora Release Engineering - 1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Apr 24 2022 Mikolaj Izdebski - 1.1.1-1 +- Update to upstream version 1.1.1 + +* Sat Feb 05 2022 Jiri Vanek - 1.0.6-6 +- Rebuilt for java-17-openjdk as system jdk + +* Fri Jan 21 2022 Fedora Release Engineering - 1.0.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Nov 17 2021 Mikolaj Izdebski - 1.0.6-4 +- Add patch for SUREFIRE-1897 + +* Tue Jul 27 2021 Fedora Release Engineering - 1.0.6-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.0.6-2 +- Bootstrap build +- Non-bootstrap build + +* Sat Jan 30 2021 Fabio Valentini - 1.0.6-1 +- Update to version 1.0.6. + +* Wed Jan 27 2021 Fedora Release Engineering - 1.0.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 26 2021 Marian Koncek - 1.0.6-1 +- Update to upstream version 1.0.6 + +* Mon Aug 10 2020 Mat Booth - 1.0.5-6 +- Rebuild correctly as a proper JPMS module + +* Mon Aug 10 2020 Mat Booth - 1.0.5-5 +- Bootstrap restoration of essential JPMS classes + +* Wed Jul 29 2020 Marian Koncek - 1.0.5-1 +- Update to upstream version 1.0.5 + +* Tue Jul 28 2020 Fedora Release Engineering - 1.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 22 2020 Fabio Valentini - 1.0.5-3 +- Remove Java 9 specific classes for now to fix build. + +* Sat Jul 11 2020 Jiri Vanek - 1.0.5-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Mar 04 2020 Fabio Valentini - 1.0.5-1 +- Update to version 1.0.5. + +* Thu Jan 30 2020 Fedora Release Engineering - 1.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 0.9.10-5 - Mass rebuild for javapackages-tools 201902 +* Fri Oct 11 2019 Fabio Valentini - 1.0.3-1 +- Update to version 1.0.3. + +* Fri Jul 26 2019 Fedora Release Engineering - 0.9.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 0.9.10-4 - Mass rebuild for javapackages-tools 201901 +* Sat Feb 02 2019 Fedora Release Engineering - 0.9.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jul 23 2018 Michael Simacek - 0.9.10-3 - Repack tarball without bundled jars