From 5cd7eb88b10d2f6ff0162503ff2cc4a36fb4c00c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:35 +0200 Subject: [PATCH 01/56] Mass rebuild for javapackages-tools 201901 --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index c8720ee..843eef5 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,6 +1,6 @@ Name: plexus-languages Version: 0.9.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -43,6 +43,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 0.9.10-4 +- Mass rebuild for javapackages-tools 201901 + * Mon Jul 23 2018 Michael Simacek - 0.9.10-3 - Repack tarball without bundled jars From 371dc75c13d7b76070131c76f44331e879dd2096 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 7 Jun 2019 08:21:56 +0200 Subject: [PATCH 02/56] Update to upstream version 1.0.3 --- .gitignore | 1 + plexus-languages.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f39dfd5..5dabd4a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /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 diff --git a/plexus-languages.spec b/plexus-languages.spec index 843eef5..1c39782 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,6 +1,6 @@ Name: plexus-languages -Version: 0.9.10 -Release: 4%{?dist} +Version: 1.0.3 +Release: 1%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -30,6 +30,8 @@ language features. %prep %setup -q -n plexus-languages-plexus-languages-%{version} +%pom_remove_plugin :sisu-maven-plugin plexus-java + cp %{SOURCE1} . %build @@ -43,6 +45,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* Fri Jun 07 2019 Marian Koncek - 1.0.3-1 +- Update to upstream version 1.0.3 + * Fri May 24 2019 Mikolaj Izdebski - 0.9.10-4 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index ec0934c..90be670 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-languages-0.9.10.tar.gz) = fe071e50d2881ec524a9b08b6ac0c533d6a7d28b01f26044f8081fe80fe094db5ef17e9c7465f6d3dac843ecfc7cbe4832bbdc0f537f7567d27bb20890e20432 +SHA512 (plexus-languages-1.0.3.tar.gz) = c07129b46461085f246faee197e9bcc490b0d3091b7853b7a6241c3ba8a72266ce02b26c1b70cd88c56dd6fb3a2d981c0fdba607f72361b79e6060c81ed9d4da SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 371000705659ccf225dae5c68f5d5f369ef32224 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 27 Jun 2019 14:53:47 +0200 Subject: [PATCH 03/56] Revert "Update to upstream version 1.0.3" This reverts commit 371dc75c13d7b76070131c76f44331e879dd2096. --- .gitignore | 1 - plexus-languages.spec | 9 ++------- sources | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 5dabd4a..f39dfd5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /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 diff --git a/plexus-languages.spec b/plexus-languages.spec index 1c39782..843eef5 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,6 +1,6 @@ Name: plexus-languages -Version: 1.0.3 -Release: 1%{?dist} +Version: 0.9.10 +Release: 4%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -30,8 +30,6 @@ language features. %prep %setup -q -n plexus-languages-plexus-languages-%{version} -%pom_remove_plugin :sisu-maven-plugin plexus-java - cp %{SOURCE1} . %build @@ -45,9 +43,6 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog -* Fri Jun 07 2019 Marian Koncek - 1.0.3-1 -- Update to upstream version 1.0.3 - * Fri May 24 2019 Mikolaj Izdebski - 0.9.10-4 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 90be670..ec0934c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-languages-1.0.3.tar.gz) = c07129b46461085f246faee197e9bcc490b0d3091b7853b7a6241c3ba8a72266ce02b26c1b70cd88c56dd6fb3a2d981c0fdba607f72361b79e6060c81ed9d4da +SHA512 (plexus-languages-0.9.10.tar.gz) = fe071e50d2881ec524a9b08b6ac0c533d6a7d28b01f26044f8081fe80fe094db5ef17e9c7465f6d3dac843ecfc7cbe4832bbdc0f537f7567d27bb20890e20432 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 5e87be451122d2dffc85d0b6b614d032b2657c37 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 04/56] Mass rebuild for javapackages-tools 201902 --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 843eef5..fc8f044 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,6 +1,6 @@ Name: plexus-languages Version: 0.9.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -43,6 +43,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 0.9.10-5 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 0.9.10-4 - Mass rebuild for javapackages-tools 201901 From b312128417f0875a22850515f4562ce60b9164c6 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 27 Jan 2020 16:19:36 +0100 Subject: [PATCH 05/56] Properly compress taballs --- generate-tarball.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generate-tarball.sh b/generate-tarball.sh index 4472c39..e2ecd09 100755 --- a/generate-tarball.sh +++ b/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 +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" From d8c0ada62d3b93ef5f2b8dfa05ee5e38638b5e17 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 2 Mar 2020 11:45:12 +0100 Subject: [PATCH 06/56] update to version 1.0.5 --- .gitignore | 1 + plexus-languages.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c9e5262..399472a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /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 diff --git a/plexus-languages.spec b/plexus-languages.spec index 4bdd51a..e9c7ddf 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,7 +1,7 @@ Name: plexus-languages Summary: Plexus Languages -Version: 1.0.3 -Release: 2%{?dist} +Version: 1.0.5 +Release: 1%{?dist} License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -34,6 +34,8 @@ language features. cp %{SOURCE1} . +%pom_remove_plugin :maven-enforcer-plugin + %build # we don't have mockito 2 yet + many tests rely on bundled test jars/classes @@ -49,6 +51,9 @@ cp %{SOURCE1} . %changelog +* 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 diff --git a/sources b/sources index 5ffb45a..d2cae68 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-languages-1.0.3.tar.gz) = a3ab1f1828536743cfacdfbf2d1c06e5e33ebd1d1e633f8af911e83f4f58377f7061e97e2faf06fcd42371993963ea3851e72ba3cfbbb5c767cdf257646df6d0 +SHA512 (plexus-languages-1.0.5.tar.gz) = acee4e573f220bd5945c65c6c34520b8e4cfe2da8f0b4c2bf61d8336154e7faacbcd9639c1157dce4480c42b1db18fb60e45263e0e0c8b4bcb541898c50c0c7e SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From fec6f05e94133ca8f7ca6f2766e6903d8233bd2c Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 04:52:00 +0200 Subject: [PATCH 07/56] Rebuilt for JDK-11 --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index e9c7ddf..059ec2e 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,7 +1,7 @@ Name: plexus-languages Summary: Plexus Languages Version: 1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -51,6 +51,9 @@ cp %{SOURCE1} . %changelog +* 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. From 7786638aaf2ab0f17e578c74e09c83e5c52341d9 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 22 Jul 2020 15:32:24 +0200 Subject: [PATCH 08/56] remove Java 9 specific classes for now to fix build --- plexus-languages.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 059ec2e..ee3c537 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,7 +1,7 @@ Name: plexus-languages Summary: Plexus Languages Version: 1.0.5 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -36,6 +36,9 @@ cp %{SOURCE1} . %pom_remove_plugin :maven-enforcer-plugin +# can't figure out how to correctly build Java 9 specific stuff +%pom_xpath_remove 'pom:profiles' plexus-java + %build # we don't have mockito 2 yet + many tests rely on bundled test jars/classes @@ -51,6 +54,9 @@ cp %{SOURCE1} . %changelog +* 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 From 558bb2ce1ad26f4f10e23d7ed348b3bb84247099 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 22:41:59 +0000 Subject: [PATCH 09/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index ee3c537..10b5cdd 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,7 +1,7 @@ Name: plexus-languages Summary: Plexus Languages Version: 1.0.5 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -54,6 +54,9 @@ cp %{SOURCE1} . %changelog +* 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. From 11fb3c80bc1914422b23fc179b7c7fd1a8b685b5 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jul 2020 15:13:45 +0200 Subject: [PATCH 10/56] Update to upstream version 1.0.5 --- .gitignore | 1 + generate-tarball.sh | 2 +- plexus-languages.spec | 15 +++++++++++---- sources | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f39dfd5..e7a2a82 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /plexus-languages-0.9.3.tar.gz /LICENSE-2.0.txt /plexus-languages-0.9.10.tar.gz +/plexus-languages-1.0.5.tar.gz diff --git a/generate-tarball.sh b/generate-tarball.sh index e2ecd09..95953ce 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -10,7 +10,7 @@ wget "https://github.com/codehaus-plexus/plexus-languages/archive/plexus-languag rm -rf tarball-tmp mkdir tarball-tmp pushd tarball-tmp -tar xf "../${name}-${version}.orig.tar.gz" +tar -xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL find -name '*.jar' -delete diff --git a/plexus-languages.spec b/plexus-languages.spec index fc8f044..d5fddcf 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,6 +1,6 @@ Name: plexus-languages -Version: 0.9.10 -Release: 5%{?dist} +Version: 1.0.5 +Release: 1%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -16,9 +16,8 @@ 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) %description @@ -32,6 +31,11 @@ language features. cp %{SOURCE1} . +%pom_remove_plugin :maven-enforcer-plugin + +# Remove module build specific to Java 9 +%pom_xpath_remove 'pom:profiles' plexus-java + %build # we don't have mockito 2 yet + many tests rely on bundled test jars/classes %mvn_build -f @@ -43,6 +47,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* Wed Jul 29 2020 Marian Koncek - 1.0.5-1 +- Update to upstream version 1.0.5 + * Tue Nov 05 2019 Mikolaj Izdebski - 0.9.10-5 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index ec0934c..8524813 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-languages-0.9.10.tar.gz) = fe071e50d2881ec524a9b08b6ac0c533d6a7d28b01f26044f8081fe80fe094db5ef17e9c7465f6d3dac843ecfc7cbe4832bbdc0f537f7567d27bb20890e20432 +SHA512 (plexus-languages-1.0.5.tar.gz) = f1d72ac6004a51faa0f21159f55ecfaf0edf6d64eb499a1c155dbac59e512be5893e57d2b89fa3c85d0e3e55fc6accd9daee7d564e1ad6000e69387b1d65bb1d SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From d673c8c853fb2dc087304cdb5d575deb4a0d7739 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 10 Aug 2020 12:33:35 +0100 Subject: [PATCH 11/56] Bootstrap restoration of essential JPMS classes --- generate-tarball.sh | 2 +- plexus-languages.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/generate-tarball.sh b/generate-tarball.sh index 4472c39..9e1f8b2 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -16,6 +16,6 @@ tar xf "../${name}-${version}.orig.tar.gz" find -name '*.jar' -delete find -name '*.class' -delete -tar cf "../${name}-${version}.tar.gz" * +tar caf "../${name}-${version}.tar.gz" * cd .. rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/plexus-languages.spec b/plexus-languages.spec index 10b5cdd..b44660d 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,7 +1,7 @@ Name: plexus-languages Summary: Plexus Languages Version: 1.0.5 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -36,13 +36,13 @@ cp %{SOURCE1} . %pom_remove_plugin :maven-enforcer-plugin -# can't figure out how to correctly build Java 9 specific stuff +# Temporarily force JPMS classes to be built %pom_xpath_remove 'pom:profiles' plexus-java - +cp -p plexus-java/src/main/java9/org/codehaus/plexus/languages/java/jpms/* plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms %build # we don't have mockito 2 yet + many tests rely on bundled test jars/classes -%mvn_build -f +%mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install @@ -54,6 +54,9 @@ cp %{SOURCE1} . %changelog +* Mon Aug 10 2020 Mat Booth - 1.0.5-5 +- Bootstrap restoration of essential JPMS classes + * Tue Jul 28 2020 Fedora Release Engineering - 1.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index d2cae68..409a15e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-languages-1.0.5.tar.gz) = acee4e573f220bd5945c65c6c34520b8e4cfe2da8f0b4c2bf61d8336154e7faacbcd9639c1157dce4480c42b1db18fb60e45263e0e0c8b4bcb541898c50c0c7e +SHA512 (plexus-languages-1.0.5.tar.gz) = 5320355315b96a566c816a67a5301c92ae2ed2c2d4dc68efa8e843e0de0faefc5ad25522e5f9262800f1960b6955790887fe88eb382adda32c95914e0bd80a6f SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From eeb6f8ab815b82545561e5f2fef537d3dc397a59 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 10 Aug 2020 12:38:41 +0100 Subject: [PATCH 12/56] Rebuild correctly as a proper JPMS module --- plexus-languages.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index b44660d..099c714 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,7 +1,7 @@ Name: plexus-languages Summary: Plexus Languages Version: 1.0.5 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -36,13 +36,9 @@ cp %{SOURCE1} . %pom_remove_plugin :maven-enforcer-plugin -# Temporarily force JPMS classes to be built -%pom_xpath_remove 'pom:profiles' plexus-java -cp -p plexus-java/src/main/java9/org/codehaus/plexus/languages/java/jpms/* plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms - %build # we don't have mockito 2 yet + many tests rely on bundled test jars/classes -%mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%mvn_build -f %install @@ -54,6 +50,9 @@ cp -p plexus-java/src/main/java9/org/codehaus/plexus/languages/java/jpms/* plexu %changelog +* 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 From ad202fe9ca836981550029f6a54f7aa0ee9199ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 08:16:53 +0000 Subject: [PATCH 13/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 099c714..55a9eec 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,7 +1,7 @@ Name: plexus-languages Summary: Plexus Languages Version: 1.0.5 -Release: 6%{?dist} +Release: 7%{?dist} License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -50,6 +50,9 @@ cp %{SOURCE1} . %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.0.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Aug 10 2020 Mat Booth - 1.0.5-6 - Rebuild correctly as a proper JPMS module From ba51f7e5bbb724d2d6e2e54ac28aed5582e8927e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 30 Jan 2021 15:09:07 +0100 Subject: [PATCH 14/56] update to version 1.0.6 --- .gitignore | 1 + plexus-languages.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 399472a..ee688f0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /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 diff --git a/plexus-languages.spec b/plexus-languages.spec index 55a9eec..f26a6c7 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,7 +1,7 @@ Name: plexus-languages Summary: Plexus Languages -Version: 1.0.5 -Release: 7%{?dist} +Version: 1.0.6 +Release: 1%{?dist} License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -37,7 +37,7 @@ 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 @@ -50,6 +50,9 @@ cp %{SOURCE1} . %changelog +* 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 diff --git a/sources b/sources index 409a15e..bb3212b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-languages-1.0.5.tar.gz) = 5320355315b96a566c816a67a5301c92ae2ed2c2d4dc68efa8e843e0de0faefc5ad25522e5f9262800f1960b6955790887fe88eb382adda32c95914e0bd80a6f +SHA512 (plexus-languages-1.0.6.tar.gz) = 0f079c176effe58cc91f1ddf75dbd29963e312693a4285ddbee9c46666db41c0499fcc40743a7094835f914ee80df724e446bb49b200387235103a202f31dd78 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 7b3ec955361ac51199624721a863549ba977c060 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 12 Feb 2021 10:36:28 +0100 Subject: [PATCH 15/56] Update to upstream version 1.0.6 --- .gitignore | 1 + plexus-languages.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e7a2a82..eaed7e8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /LICENSE-2.0.txt /plexus-languages-0.9.10.tar.gz /plexus-languages-1.0.5.tar.gz +/plexus-languages-1.0.6.tar.gz diff --git a/plexus-languages.spec b/plexus-languages.spec index d5fddcf..8109b48 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,5 +1,5 @@ Name: plexus-languages -Version: 1.0.5 +Version: 1.0.6 Release: 1%{?dist} Summary: Plexus Languages License: ASL 2.0 @@ -47,6 +47,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* Tue Jan 26 2021 Marian Koncek - 1.0.6-1 +- Update to upstream version 1.0.6 + * Wed Jul 29 2020 Marian Koncek - 1.0.5-1 - Update to upstream version 1.0.5 diff --git a/sources b/sources index 8524813..93a30cb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-languages-1.0.5.tar.gz) = f1d72ac6004a51faa0f21159f55ecfaf0edf6d64eb499a1c155dbac59e512be5893e57d2b89fa3c85d0e3e55fc6accd9daee7d564e1ad6000e69387b1d65bb1d +SHA512 (plexus-languages-1.0.6.tar.gz) = 273d47d3f0a93cbbf6c79c9c7463c05fa60bbde1aa6ca6914028d788048244c895c72c4d1fbe4b07a4626365e0dc6020bfece8d46f0bc2fb279ab66a70b19677 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From af52bc55fd7481b027ef3d57ce8000e1b3ae45f8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:13 +0200 Subject: [PATCH 16/56] Conditionalize buildrequires in bootstrap mode --- plexus-languages.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plexus-languages.spec b/plexus-languages.spec index 8109b48..cd9c4e7 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: plexus-languages Version: 1.0.6 Release: 1%{?dist} @@ -13,12 +15,16 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: generate-tarball.sh BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else 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 From 997a62399b9a40bf516c0ea1226404ff7c001332 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 17/56] Turn off bootstrap mode by default --- plexus-languages.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index cd9c4e7..e2ea4e9 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: plexus-languages Version: 1.0.6 From c922958e60b41da32bafea0022446f865b91b123 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:50:40 +0200 Subject: [PATCH 18/56] Bootstrap build --- plexus-languages.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 70ea291..2445d3a 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,8 +1,8 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: plexus-languages Version: 1.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -53,6 +53,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* Mon May 17 2021 Mikolaj Izdebski - 1.0.6-2 +- Bootstrap build + * Sat Jan 30 2021 Fabio Valentini - 1.0.6-1 - Update to version 1.0.6. From 96653403522eca75d345476d5508ce589241566b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:48 +0200 Subject: [PATCH 19/56] Non-bootstrap build --- plexus-languages.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 2445d3a..040cb70 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: plexus-languages Version: 1.0.6 @@ -55,6 +55,7 @@ cp %{SOURCE1} . %changelog * 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. From e9dc98ba2f6acc64da12e83d1d865cf3a38512f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 27 Jul 2021 07:45:24 +0000 Subject: [PATCH 20/56] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- plexus-languages.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 040cb70..b9b49e1 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,7 +2,7 @@ Name: plexus-languages Version: 1.0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -53,6 +53,10 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 From 17e57423a8bab4ed563755e96183f77cd884e6fd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 17 Nov 2021 11:32:46 +0100 Subject: [PATCH 21/56] Add patch for SUREFIRE-1897 --- ...-modulename-extraction-cause-an-exce.patch | 39 +++++++++++++++++++ plexus-languages.spec | 11 +++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 0001-70-Jars-of-which-modulename-extraction-cause-an-exce.patch 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/plexus-languages.spec b/plexus-languages.spec index b9b49e1..a19d694 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,7 +2,7 @@ Name: plexus-languages Version: 1.0.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -14,6 +14,11 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt # Sources contain bundled jars that we cannot verify for licensing Source2: generate-tarball.sh +# Upstream patch: Jars of which modulename extraction cause an exception should end up on the classpath +# https://github.com/codehaus-plexus/plexus-languages/issues/70 +# https://issues.apache.org/jira/browse/SUREFIRE-1897 +Patch0: 0001-70-Jars-of-which-modulename-extraction-cause-an-exce.patch + BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -34,6 +39,7 @@ language features. %prep %setup -q -n plexus-languages-plexus-languages-%{version} +%patch0 -p1 cp %{SOURCE1} . @@ -53,6 +59,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 From 0bd681494d385feb105ea5bd007dfef007c69409 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 09:05:52 +0000 Subject: [PATCH 22/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index a19d694..c62fa1a 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,7 +2,7 @@ Name: plexus-languages Version: 1.0.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -59,6 +59,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 From 598112c62baaa0a025079f1633578ce91a57e067 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 23:35:16 +0100 Subject: [PATCH 23/56] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index c62fa1a..7eb14ec 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,7 +2,7 @@ Name: plexus-languages Version: 1.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -59,6 +59,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 From 105d2681866ea20b6dd12b7cd51c0aad5bd3ab16 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 24 Apr 2022 23:00:52 +0200 Subject: [PATCH 24/56] Update to upstream version 1.1.1 --- .gitignore | 1 + plexus-languages.spec | 13 +++++-------- sources | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index ee688f0..2d1e00d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /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/plexus-languages.spec b/plexus-languages.spec index 7eb14ec..4edcba8 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: plexus-languages -Version: 1.0.6 -Release: 6%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -14,11 +14,6 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt # Sources contain bundled jars that we cannot verify for licensing Source2: generate-tarball.sh -# Upstream patch: Jars of which modulename extraction cause an exception should end up on the classpath -# https://github.com/codehaus-plexus/plexus-languages/issues/70 -# https://issues.apache.org/jira/browse/SUREFIRE-1897 -Patch0: 0001-70-Jars-of-which-modulename-extraction-cause-an-exce.patch - BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -39,7 +34,6 @@ language features. %prep %setup -q -n plexus-languages-plexus-languages-%{version} -%patch0 -p1 cp %{SOURCE1} . @@ -59,6 +53,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 diff --git a/sources b/sources index 93a30cb..d81d7fa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-languages-1.0.6.tar.gz) = 273d47d3f0a93cbbf6c79c9c7463c05fa60bbde1aa6ca6914028d788048244c895c72c4d1fbe4b07a4626365e0dc6020bfece8d46f0bc2fb279ab66a70b19677 +SHA512 (plexus-languages-1.1.1.tar.gz) = 8976f0c49457b961fafa2f2297c8ce3e3e6275fcc95f0ed986435cfc6b5d2a05a035c1c0a9b804d66082011a8fd49c301ffd1c61b32b2a535ea0321bdbebae5b SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 46736a46bbf3b4f7a5ae612899570a4f687f08cd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 25/56] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- plexus-languages.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/plexus-languages.spec b/plexus-languages.spec index 4edcba8..e93275a 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -7,6 +7,7 @@ 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 From 6549582c18011a48ef73c22b2460643aa20c1815 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 26/56] Update build-requires in bootstrap mode --- plexus-languages.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index e93275a..cd69207 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -15,10 +15,10 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt # Sources contain bundled jars that we cannot verify for licensing Source2: generate-tarball.sh -BuildRequires: maven-local %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) From 95a82bfcae476ff92d5df4d92335b074913f613b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 15:02:23 +0000 Subject: [PATCH 27/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index cd69207..fa88a2a 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,7 +2,7 @@ Name: plexus-languages Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -54,6 +54,9 @@ cp %{SOURCE1} . %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 From 8a1201abcb37122563b5929959ee8b357c6722be Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 28/56] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf 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/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..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !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 new file mode 100644 index 0000000..8f6c9cb --- /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: f37 +execute: + how: tmt From f54e9d0211556edb4f28704bfabcfc82eaadf54e Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 31 Aug 2022 14:19:56 +0200 Subject: [PATCH 29/56] Enable jpms support --- plexus-languages.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index fa88a2a..50977d0 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,7 +2,7 @@ Name: plexus-languages Version: 1.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -40,9 +40,6 @@ 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 @@ -54,6 +51,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 From e99539e0bc5018d9053dda3876ac99a3a7f5c371 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 2 Nov 2022 10:50:46 +0100 Subject: [PATCH 30/56] Bootstrap build --- plexus-languages.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 50977d0..f40e444 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,4 +1,4 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: plexus-languages Version: 1.1.1 From aef7f2ed45eba37b0f53ece5b274a11bb45489c5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 2 Nov 2022 10:52:40 +0100 Subject: [PATCH 31/56] Non-bootstrap build --- plexus-languages.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index f40e444..50977d0 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: plexus-languages Version: 1.1.1 From fa2a997cf3213163eced12700ecf0cba657c679b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 09:54:49 +0000 Subject: [PATCH 32/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 50977d0..2debc46 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,7 +2,7 @@ Name: plexus-languages Version: 1.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -51,6 +51,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 From 64d740723e0c3e606b5d2f6a2ff22def6dccb652 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 05:51:11 +0000 Subject: [PATCH 33/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 2debc46..169d0ab 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,7 +2,7 @@ Name: plexus-languages Version: 1.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -51,6 +51,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 From e3a0f5227163e6c152574d3a862cf4aa9dce7810 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 23 Aug 2023 07:13:31 +0200 Subject: [PATCH 34/56] Update to upstream version 1.1.2 --- .gitignore | 1 + ...-modulename-extraction-cause-an-exce.patch | 39 ------------------- plexus-languages.spec | 7 +++- sources | 2 +- 4 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 0001-70-Jars-of-which-modulename-extraction-cause-an-exce.patch diff --git a/.gitignore b/.gitignore index 2d1e00d..62b0ece 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /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 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 deleted file mode 100644 index 3adfed4..0000000 --- a/0001-70-Jars-of-which-modulename-extraction-cause-an-exce.patch +++ /dev/null @@ -1,39 +0,0 @@ -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/plexus-languages.spec b/plexus-languages.spec index 169d0ab..b59b8fb 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: plexus-languages -Version: 1.1.1 -Release: 5%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Plexus Languages License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -51,6 +51,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 diff --git a/sources b/sources index d81d7fa..2da9f1d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-languages-1.1.1.tar.gz) = 8976f0c49457b961fafa2f2297c8ce3e3e6275fcc95f0ed986435cfc6b5d2a05a035c1c0a9b804d66082011a8fd49c301ffd1c61b32b2a535ea0321bdbebae5b +SHA512 (plexus-languages-1.1.2.tar.gz) = fe5ec7dd0941c29a95ea31a817c90800df5f8f2fd5fa8aaeb413a06e6a29ea009498ac54d4c0d6eb21bf0deb08e76fb3190bc74666bafdb36af204c07994ec23 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 6ba83f9e4177faa5260410e9e1b69390ffa1b382 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 13:20:36 +0200 Subject: [PATCH 35/56] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- plexus-languages.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index b59b8fb..a49bece 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,9 +2,9 @@ Name: plexus-languages Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?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 @@ -51,6 +51,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 From f31249c01f8abd413866bbfcf918134746abe065 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 36/56] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f37 + ref: f40 execute: how: tmt From c6b6312fb9b7db7f92b0d1a8080c3a72ed5ce494 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 18 Dec 2023 15:32:17 +0100 Subject: [PATCH 37/56] Update to upstream version 1.2.0 --- .gitignore | 1 + plexus-languages.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 62b0ece..c0236c7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /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/plexus-languages.spec b/plexus-languages.spec index a49bece..f716e5d 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: plexus-languages -Version: 1.1.2 -Release: 2%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Plexus Languages License: Apache-2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -11,7 +11,7 @@ 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 @@ -51,6 +51,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 diff --git a/sources b/sources index 2da9f1d..6c84b83 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-languages-1.1.2.tar.gz) = fe5ec7dd0941c29a95ea31a817c90800df5f8f2fd5fa8aaeb413a06e6a29ea009498ac54d4c0d6eb21bf0deb08e76fb3190bc74666bafdb36af204c07994ec23 +SHA512 (plexus-languages-1.2.0.tar.gz) = 3791cca192dba4be99d208a3594ccfd647bb788274e3ae58a79d1f3d9db7918aba176895cc8c5f171fd5205c47f5030b74c12863506833f692a45538363869cf SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From bc869c90ff1f70b5a9986928a08287a60572a579 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:58:42 +0000 Subject: [PATCH 38/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index f716e5d..e40d3a1 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,7 +2,7 @@ Name: plexus-languages Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plexus Languages License: Apache-2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -51,6 +51,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 From 67734422aa9f6dc60622962bf421a683f3a957b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:45:49 +0000 Subject: [PATCH 39/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index e40d3a1..3fb159c 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,7 +2,7 @@ Name: plexus-languages Version: 1.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Plexus Languages License: Apache-2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -51,6 +51,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 From 01e7b99559166724bd915d064000de442231313f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 29 Jan 2024 11:07:55 +0000 Subject: [PATCH 40/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 3fb159c..6ffd6f5 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,7 +2,7 @@ Name: plexus-languages Version: 1.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Plexus Languages License: Apache-2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -51,6 +51,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 From 46f9a3a3d9a5e5a157089c8dff327e6c021f683b Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:38:19 +0100 Subject: [PATCH 41/56] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 6ffd6f5..b65465c 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,7 +2,7 @@ Name: plexus-languages Version: 1.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Plexus Languages License: Apache-2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -51,6 +51,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 From 89c6d76a65425ab4f3825e1092a19e3c7853c377 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 17:51:59 +0100 Subject: [PATCH 42/56] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index b65465c..f3a1598 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,7 +2,7 @@ Name: plexus-languages Version: 1.2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Plexus Languages License: Apache-2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -51,6 +51,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 From 713ece67d9d1e6d1034b85b6c46ba5934c4692f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 08:04:42 +0000 Subject: [PATCH 43/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- plexus-languages.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index f3a1598..0e25ba0 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,7 +2,7 @@ Name: plexus-languages Version: 1.2.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Plexus Languages License: Apache-2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -51,6 +51,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* 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 From c55a462e4b425b482420090b26d6998f5f9dc52a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:30 +0200 Subject: [PATCH 44/56] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From a0daccccf9f911c7a6d87cc24ed77a0df426ee97 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 45/56] Switch from %setup to %autosetup --- plexus-languages.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 0e25ba0..14e4b68 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -34,7 +34,7 @@ language features. %{?javadoc_package} %prep -%setup -q -n plexus-languages-plexus-languages-%{version} +%autosetup -p1 -C cp %{SOURCE1} . From 79444bf41a17e7fa1cfbdb03c938b404ce841ab7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:18 +0200 Subject: [PATCH 46/56] Convert to %autorelease and %autochangelog --- changelog | 130 +++++++++++++++++++++++++++++++++++++++++ plexus-languages.spec | 133 +----------------------------------------- 2 files changed, 132 insertions(+), 131 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..6fe58b0 --- /dev/null +++ b/changelog @@ -0,0 +1,130 @@ +* 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/plexus-languages.spec b/plexus-languages.spec index 14e4b68..a7f9eef 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -2,7 +2,7 @@ Name: plexus-languages Version: 1.2.0 -Release: 7%{?dist} +Release: %autorelease Summary: Plexus Languages License: Apache-2.0 URL: https://github.com/codehaus-plexus/plexus-languages @@ -51,133 +51,4 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog -* 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 +%autochangelog From d80592fb2db9fbe27bba127155e03829fb565d26 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 47/56] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From 0696b80929d20fac9062dfe1a676d2a4638e2963 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 18:06:35 +0100 Subject: [PATCH 48/56] Explicitly declare javadoc subpackage [skip changelog] --- plexus-languages.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index a7f9eef..0c5e0ac 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -31,7 +31,11 @@ BuildRequires: mvn(org.ow2.asm:asm) 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 %autosetup -p1 -C @@ -50,5 +54,7 @@ cp %{SOURCE1} . %files -f .mfiles %license LICENSE-2.0.txt +%files javadoc -f .mfiles-javadoc + %changelog %autochangelog From 2441f1dbd301230a27fe907ff42ba0771f694e49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 10:21:43 +0000 Subject: [PATCH 49/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 349872f01fc2e12b1eb0275145d3e628559859e2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:14 +0100 Subject: [PATCH 50/56] Remove javadoc subpackage --- plexus-languages.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 0c5e0ac..33f9263 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -26,17 +26,13 @@ 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. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -46,7 +42,7 @@ cp %{SOURCE1} . %build # many tests rely on bundled test jars/classes -%mvn_build -f +%mvn_build -j -f %install %mvn_install @@ -54,7 +50,5 @@ cp %{SOURCE1} . %files -f .mfiles %license LICENSE-2.0.txt -%files javadoc -f .mfiles-javadoc - %changelog %autochangelog From d349ff56981a762e0d161b22c6fdf3bfd470a6a2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 51/56] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 7a06781f81150d909915dcd4db32a64d90184a63 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:32 +0200 Subject: [PATCH 52/56] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From 86f329e008ac8127818d1ed7cb126d2e5683a449 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:52 +0200 Subject: [PATCH 53/56] Build with OpenJDK 25 --- plexus-languages.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-languages.spec b/plexus-languages.spec index 33f9263..aaa6bd0 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -18,7 +18,7 @@ Source2: generate-tarball.sh %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(com.thoughtworks.qdox:qdox) BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) From 3b8608d299e008e3a261302cf2052f1e8479342f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:55:12 +0000 Subject: [PATCH 54/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5212ffdd6e796df22cefb91ac990fbc269e4e159 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:05:07 +0200 Subject: [PATCH 55/56] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. From 20ce00880f5ca93fe10510956f85b40887022b17 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 4 Sep 2025 15:11:50 +0200 Subject: [PATCH 56/56] manual bodhi update for jdk25 needed on selected pkgs