diff --git a/.gitignore b/.gitignore index e69de29..2d1e00d 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,10 @@ +/results_* +/*.src.rpm + +/plexus-languages-0.9.3.tar.gz +/LICENSE-2.0.txt +/plexus-languages-0.9.10.tar.gz +/plexus-languages-1.0.3.tar.gz +/plexus-languages-1.0.5.tar.gz +/plexus-languages-1.0.6.tar.gz +/plexus-languages-1.1.1.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/README.md b/README.md new file mode 100644 index 0000000..c51e835 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# plexus-languages + +The plexus-languages package \ No newline at end of file diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..95953ce --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,21 @@ +#!/bin/bash +set -e + +name=plexus-languages +version="$(sed -n 's/Version:\s*//p' *.spec)" + +# RETRIEVE +wget "https://github.com/codehaus-plexus/plexus-languages/archive/plexus-languages-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" + +rm -rf tarball-tmp +mkdir tarball-tmp +pushd tarball-tmp +tar -xf "../${name}-${version}.orig.tar.gz" + +# CLEAN TARBALL +find -name '*.jar' -delete +find -name '*.class' -delete + +tar -czf "../${name}-${version}.tar.gz" * +popd +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/plexus-languages.spec b/plexus-languages.spec new file mode 100644 index 0000000..fa88a2a --- /dev/null +++ b/plexus-languages.spec @@ -0,0 +1,150 @@ +%bcond_with bootstrap + +Name: plexus-languages +Version: 1.1.1 +Release: 2%{?dist} +Summary: Plexus Languages +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: 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 +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: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} + +%prep +%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 -f + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE-2.0.txt + +%changelog +* 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 new file mode 100644 index 0000000..d81d7fa --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (plexus-languages-1.1.1.tar.gz) = 8976f0c49457b961fafa2f2297c8ce3e3e6275fcc95f0ed986435cfc6b5d2a05a035c1c0a9b804d66082011a8fd49c301ffd1c61b32b2a535ea0321bdbebae5b +SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8