From 5cd7eb88b10d2f6ff0162503ff2cc4a36fb4c00c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:35 +0200 Subject: [PATCH 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 11fb3c80bc1914422b23fc179b7c7fd1a8b685b5 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jul 2020 15:13:45 +0200 Subject: [PATCH 6/9] 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 7b3ec955361ac51199624721a863549ba977c060 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 12 Feb 2021 10:36:28 +0100 Subject: [PATCH 7/9] 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 8/9] 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 9/9] 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