diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index c0236c7..2d1e00d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,3 @@ /plexus-languages-1.0.5.tar.gz /plexus-languages-1.0.6.tar.gz /plexus-languages-1.1.1.tar.gz -/plexus-languages-1.1.2.tar.gz -/plexus-languages-1.2.0.tar.gz diff --git a/0001-70-Jars-of-which-modulename-extraction-cause-an-exce.patch b/0001-70-Jars-of-which-modulename-extraction-cause-an-exce.patch new file mode 100644 index 0000000..3adfed4 --- /dev/null +++ b/0001-70-Jars-of-which-modulename-extraction-cause-an-exce.patch @@ -0,0 +1,39 @@ +From fbe59511ace6372b09cd34ca465d92bf69fa4edb Mon Sep 17 00:00:00 2001 +From: rfscholte +Date: Fri, 26 Mar 2021 21:08:15 +0100 +Subject: [PATCH] #70 Jars of which modulename extraction cause an exception + should end up on the classpath + +--- + .../codehaus/plexus/languages/java/jpms/LocationManager.java | 3 +++ + .../codehaus/plexus/languages/java/jpms/LocationManagerIT.java | 1 + + 2 files changed, 4 insertions(+) + +diff --git a/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/LocationManager.java b/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/LocationManager.java +index bec925a..94c094c 100644 +--- a/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/LocationManager.java ++++ b/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/LocationManager.java +@@ -205,6 +205,9 @@ public class LocationManager + catch ( Exception e ) + { + result.getPathExceptions().put( t, e ); ++ ++ pathElements.put( t, null ); ++ + continue; + } + +diff --git a/plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/LocationManagerIT.java b/plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/LocationManagerIT.java +index 41ddc75..c79a29f 100644 +--- a/plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/LocationManagerIT.java ++++ b/plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/LocationManagerIT.java +@@ -132,5 +132,6 @@ public class LocationManagerIT + ResolvePathsResult result = locationManager.resolvePaths( request ); + + assertThat( result.getPathExceptions().size(), is( 1 ) ); ++ assertThat( result.getClasspathElements().size(), is(1) ); + } + } +-- +2.33.1 + diff --git a/changelog b/changelog deleted file mode 100644 index 6fe58b0..0000000 --- a/changelog +++ /dev/null @@ -1,130 +0,0 @@ -* 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 - -* Fri Jul 13 2018 Fedora Release Engineering - 0.9.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jun 29 2018 Michael Simacek - 0.9.10-1 -- Update to upstream version 0.9.10 - -* Fri Jun 29 2018 Michael Simacek - 0.9.3-5 -- Disable broken test - -* Wed Feb 14 2018 Mikolaj Izdebski - 0.9.3-4 -- Generate javadoc package automatically - -* Fri Feb 09 2018 Fedora Release Engineering - 0.9.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Sep 12 2017 Mikolaj Izdebski - 0.9.3-2 -- Replace JARs used as test resources with symlinks to system JARs - -* Mon Sep 11 2017 Mikolaj Izdebski - 0.9.3-1 -- Initial packaging diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 0d484d7..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_contexts: - - bodhi_update_push_testing - - bodhi_update_push_stable -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf deleted file mode 100644 index ae17c0c..0000000 --- a/plans/javapackages.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Run javapackages-specific tests -discover: - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f43 -execute: - how: tmt diff --git a/plexus-languages.spec b/plexus-languages.spec index aaa6bd0..fa88a2a 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,24 +1,24 @@ %bcond_with bootstrap Name: plexus-languages -Version: 1.2.0 -Release: %autorelease +Version: 1.1.1 +Release: 2%{?dist} Summary: Plexus Languages -License: Apache-2.0 +License: ASL 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: https://www.apache.org/licenses/LICENSE-2.0.txt +Source1: http://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-openjdk25 +BuildRequires: maven-local BuildRequires: mvn(com.thoughtworks.qdox:qdox) BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) @@ -26,23 +26,26 @@ BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) BuildRequires: mvn(org.ow2.asm:asm) %endif -# TODO Remove in Fedora 46 -Obsoletes: %{name}-javadoc < 1.2.0-15 %description Plexus Languages is a set of Plexus components that maintain shared language features. +%{?javadoc_package} + %prep -%autosetup -p1 -C +%setup -q -n plexus-languages-plexus-languages-%{version} cp %{SOURCE1} . %pom_remove_plugin :maven-enforcer-plugin +# Remove module build specific to Java 9 +%pom_xpath_remove 'pom:profiles' plexus-java + %build # many tests rely on bundled test jars/classes -%mvn_build -j -f +%mvn_build -f %install %mvn_install @@ -51,4 +54,97 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog -%autochangelog +* 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 + +* Fri Jul 13 2018 Fedora Release Engineering - 0.9.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 29 2018 Michael Simacek - 0.9.10-1 +- Update to upstream version 0.9.10 + +* Fri Jun 29 2018 Michael Simacek - 0.9.3-5 +- Disable broken test + +* Wed Feb 14 2018 Mikolaj Izdebski - 0.9.3-4 +- Generate javadoc package automatically + +* Fri Feb 09 2018 Fedora Release Engineering - 0.9.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Sep 12 2017 Mikolaj Izdebski - 0.9.3-2 +- Replace JARs used as test resources with symlinks to system JARs + +* Mon Sep 11 2017 Mikolaj Izdebski - 0.9.3-1 +- Initial packaging diff --git a/sources b/sources index 6c84b83..d81d7fa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-languages-1.2.0.tar.gz) = 3791cca192dba4be99d208a3594ccfd647bb788274e3ae58a79d1f3d9db7918aba176895cc8c5f171fd5205c47f5030b74c12863506833f692a45538363869cf +SHA512 (plexus-languages-1.1.1.tar.gz) = 8976f0c49457b961fafa2f2297c8ce3e3e6275fcc95f0ed986435cfc6b5d2a05a035c1c0a9b804d66082011a8fd49c301ffd1c61b32b2a535ea0321bdbebae5b SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8