From c16588687ddb7589be150d70824229b6d650090c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:48:43 +0000 Subject: [PATCH 01/12] Remove Group tags --- plexus-pom.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/plexus-pom.spec b/plexus-pom.spec index e72b484..a0f3132 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -2,7 +2,6 @@ Name: plexus-pom Version: 5.0 Release: 2%{?dist} Summary: Root Plexus Projects POM -Group: Development/Libraries License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-pom Source0: https://github.com/codehaus-plexus/plexus-pom/archive/plexus-%{version}.tar.gz From 3b5b0bc156fb81414813895a8fc02c162cddb7e1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:36 +0200 Subject: [PATCH 02/12] Mass rebuild for javapackages-tools 201901 --- plexus-pom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-pom.spec b/plexus-pom.spec index a0f3132..9cd42fa 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -1,6 +1,6 @@ Name: plexus-pom Version: 5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Root Plexus Projects POM License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-pom @@ -36,6 +36,9 @@ cp -p %{SOURCE1} LICENSE %license LICENSE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 5.0-3 +- Mass rebuild for javapackages-tools 201901 + * Fri Feb 09 2018 Fedora Release Engineering - 5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 6457e437fcd78773d3f8c5831dd059991cc8a825 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 29 Jul 2019 15:54:28 +0200 Subject: [PATCH 03/12] Update to upstream version 5.1 --- .gitignore | 1 + plexus-pom.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 96809fa..5219b3f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /LICENSE-2.0.txt /plexus-3.3.3.tar.gz /plexus-5.0.tar.gz +/plexus-5.1.tar.gz diff --git a/plexus-pom.spec b/plexus-pom.spec index 9cd42fa..9054767 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -1,6 +1,6 @@ Name: plexus-pom -Version: 5.0 -Release: 3%{?dist} +Version: 5.1 +Release: 1%{?dist} Summary: Root Plexus Projects POM License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-pom @@ -9,7 +9,6 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch BuildRequires: maven-local -BuildRequires: maven-enforcer-plugin %description The Plexus project provides a full software stack for creating and @@ -22,6 +21,8 @@ Plexus packages. # org.apache.maven.wagon wagon-webdav-jackrabbit 1.0 %pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :maven-enforcer-plugin + %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin %pom_remove_plugin org.codehaus.mojo:taglist-maven-plugin cp -p %{SOURCE1} LICENSE @@ -36,6 +37,9 @@ cp -p %{SOURCE1} LICENSE %license LICENSE %changelog +* Mon Jul 29 2019 Marian Koncek - 5.1-1 +- Update to upstream version 5.1 + * Fri May 24 2019 Mikolaj Izdebski - 5.0-3 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 43032dc..5cae7ce 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-5.0.tar.gz) = c476b2a915ab77d98515dc8eede1382256e49bea34e04bbe93a1b132166582af7c6ac8c9f111a2cf2d14c805011f72a114af174494bd122a72d950ab706b01f2 +SHA512 (plexus-5.1.tar.gz) = 1e811e1dd113a479a9fcec0706c04938f89c46dd5311fc2c3e92d71aa3088570517c2911bc251f5e245c0c97585de78edcfd23c34f92ff15b4bb1d9d6b0436b3 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 56e1ff997468a7e290c4c5c47b58fc08e2cf9188 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 31 Oct 2019 14:40:06 +0100 Subject: [PATCH 04/12] Add requires on junit --- plexus-pom.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plexus-pom.spec b/plexus-pom.spec index 9054767..da743c8 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -10,6 +10,9 @@ BuildArch: noarch BuildRequires: maven-local +# Test dependency that should be propagated down the POM hierarchy +Requires: mvn(junit:junit) + %description The Plexus project provides a full software stack for creating and executing software projects. This package provides parent POM for From d44cf21cceedb825d42c1bd95969b9d18c5b714c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 05/12] Mass rebuild for javapackages-tools 201902 --- plexus-pom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-pom.spec b/plexus-pom.spec index da743c8..537eeb6 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -1,6 +1,6 @@ Name: plexus-pom Version: 5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Root Plexus Projects POM License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-pom @@ -40,6 +40,9 @@ cp -p %{SOURCE1} LICENSE %license LICENSE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 5.1-2 +- Mass rebuild for javapackages-tools 201902 + * Mon Jul 29 2019 Marian Koncek - 5.1-1 - Update to upstream version 5.1 From 7a5e01c4781b66fbf39ed79964d09cce54d3a2b9 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jul 2020 08:52:54 +0200 Subject: [PATCH 06/12] Update to upstream version 6.3 --- .gitignore | 1 + plexus-pom.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5219b3f..d8fa1ff 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /plexus-3.3.3.tar.gz /plexus-5.0.tar.gz /plexus-5.1.tar.gz +/plexus-6.3.tar.gz diff --git a/plexus-pom.spec b/plexus-pom.spec index 537eeb6..af6481b 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -1,6 +1,6 @@ Name: plexus-pom -Version: 5.1 -Release: 2%{?dist} +Version: 6.3 +Release: 1%{?dist} Summary: Root Plexus Projects POM License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-pom @@ -40,6 +40,9 @@ cp -p %{SOURCE1} LICENSE %license LICENSE %changelog +* Wed Jul 29 2020 Marian Koncek - 6.3-1 +- Update to upstream version 6.3 + * Tue Nov 05 2019 Mikolaj Izdebski - 5.1-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 5cae7ce..0eeea7c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-5.1.tar.gz) = 1e811e1dd113a479a9fcec0706c04938f89c46dd5311fc2c3e92d71aa3088570517c2911bc251f5e245c0c97585de78edcfd23c34f92ff15b4bb1d9d6b0436b3 +SHA512 (plexus-6.3.tar.gz) = 2639c0f7d78090a8935655320595e762ead6f2d484bc613b7d4c74259d301b1a34fe409aa4c571c3b72ee4697c194b9fad71fc8fe4e976e642161186004419fb SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 50001cdd73398c1151d232c1a71a772d0dedacd2 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jul 2020 08:55:08 +0200 Subject: [PATCH 07/12] Use https, fix typo in description --- plexus-pom.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plexus-pom.spec b/plexus-pom.spec index af6481b..176048e 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -5,7 +5,7 @@ Summary: Root Plexus Projects POM License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-pom Source0: https://github.com/codehaus-plexus/plexus-pom/archive/plexus-%{version}.tar.gz -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +Source1: https://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch BuildRequires: maven-local @@ -15,7 +15,7 @@ Requires: mvn(junit:junit) %description The Plexus project provides a full software stack for creating and -executing software projects. This package provides parent POM for +executing software projects. This package provides parent POM for Plexus packages. %prep From 0068c15d70d2411c230186880b6a628deb5e8a63 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 11 Sep 2020 09:21:58 +0200 Subject: [PATCH 08/12] Update to upstream version 6.4 --- .gitignore | 1 + plexus-pom.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d8fa1ff..5e694b7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /plexus-5.0.tar.gz /plexus-5.1.tar.gz /plexus-6.3.tar.gz +/plexus-6.4.tar.gz diff --git a/plexus-pom.spec b/plexus-pom.spec index 176048e..00fa142 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -1,6 +1,6 @@ Name: plexus-pom -Version: 6.3 -Release: 1%{?dist} +Version: 6.4 +Release: 2%{?dist} Summary: Root Plexus Projects POM License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-pom @@ -40,6 +40,9 @@ cp -p %{SOURCE1} LICENSE %license LICENSE %changelog +* Fri Sep 11 2020 Marian Koncek - 6.4-2 +- Update to upstream version 6.4 + * Wed Jul 29 2020 Marian Koncek - 6.3-1 - Update to upstream version 6.3 diff --git a/sources b/sources index 0eeea7c..549751b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-6.3.tar.gz) = 2639c0f7d78090a8935655320595e762ead6f2d484bc613b7d4c74259d301b1a34fe409aa4c571c3b72ee4697c194b9fad71fc8fe4e976e642161186004419fb +SHA512 (plexus-6.4.tar.gz) = f03f556913c005e99fd88e7a9b1820c2b9e4fd746b9b3abb61821f527455aeb6473f1edcb90909ffbe86843fb117870fdd5800b2b5451d3de5f7cb920914e935 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 7e7f2528f3a1c48107433aec60c7a7c4513f9ef5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 4 Dec 2020 12:49:28 +0100 Subject: [PATCH 09/12] Update to upstream version 6.5 --- .gitignore | 1 + plexus-pom.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5e694b7..8e85f86 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /plexus-5.1.tar.gz /plexus-6.3.tar.gz /plexus-6.4.tar.gz +/plexus-6.5.tar.gz diff --git a/plexus-pom.spec b/plexus-pom.spec index 00fa142..5198a68 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -1,6 +1,6 @@ Name: plexus-pom -Version: 6.4 -Release: 2%{?dist} +Version: 6.5 +Release: 1%{?dist} Summary: Root Plexus Projects POM License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-pom @@ -40,6 +40,9 @@ cp -p %{SOURCE1} LICENSE %license LICENSE %changelog +* Fri Dec 4 2020 Mikolaj Izdebski - 6.5-1 +- Update to upstream version 6.5 + * Fri Sep 11 2020 Marian Koncek - 6.4-2 - Update to upstream version 6.4 diff --git a/sources b/sources index 549751b..01bfe61 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-6.4.tar.gz) = f03f556913c005e99fd88e7a9b1820c2b9e4fd746b9b3abb61821f527455aeb6473f1edcb90909ffbe86843fb117870fdd5800b2b5451d3de5f7cb920914e935 +SHA512 (plexus-6.5.tar.gz) = 41767eb50fa28a376e19e3cdbe9aa2db5c7a562d227587a911e125feeb78d6092bf8a9fd4c54b72ca33fba2384f7f3d6afad7dc5cbb11d009501ef576bf319b9 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From c9ab220024c0991328c2b57f9a64533e9af45dc0 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 12 Feb 2021 10:38:15 +0100 Subject: [PATCH 10/12] Update to upstream version 7 --- .gitignore | 1 + plexus-pom.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8e85f86..52a3a6c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /plexus-6.3.tar.gz /plexus-6.4.tar.gz /plexus-6.5.tar.gz +/plexus-7.tar.gz diff --git a/plexus-pom.spec b/plexus-pom.spec index 5198a68..a0507c0 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -1,5 +1,5 @@ Name: plexus-pom -Version: 6.5 +Version: 7 Release: 1%{?dist} Summary: Root Plexus Projects POM License: ASL 2.0 @@ -40,6 +40,9 @@ cp -p %{SOURCE1} LICENSE %license LICENSE %changelog +* Tue Jan 26 2021 Marian Koncek - 7-1 +- Update to upstream version 7 + * Fri Dec 4 2020 Mikolaj Izdebski - 6.5-1 - Update to upstream version 6.5 diff --git a/sources b/sources index 01bfe61..b605710 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-6.5.tar.gz) = 41767eb50fa28a376e19e3cdbe9aa2db5c7a562d227587a911e125feeb78d6092bf8a9fd4c54b72ca33fba2384f7f3d6afad7dc5cbb11d009501ef576bf319b9 +SHA512 (plexus-7.tar.gz) = 67ead444acfcc2b988591f04ede0701e30011a652b979a5a40fff3bb0ce8e959ed8b25ae2db6bb7c3a3c27548a12a749250fe0b77e33dad2c3c05e947f1766a3 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 899cb7e873c03fb02db4b7022c066879a9bd6578 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:13 +0200 Subject: [PATCH 11/12] Conditionalize buildrequires in bootstrap mode --- plexus-pom.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plexus-pom.spec b/plexus-pom.spec index a0507c0..b984ebb 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: plexus-pom Version: 7 Release: 1%{?dist} @@ -9,6 +11,9 @@ Source1: https://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%endif # Test dependency that should be propagated down the POM hierarchy Requires: mvn(junit:junit) From 88a0d5e2f1bb220fd2d7e24939fd65dd695ecde3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 12/12] Turn off bootstrap mode by default --- plexus-pom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-pom.spec b/plexus-pom.spec index b984ebb..0107c23 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: plexus-pom Version: 7