From 95af642ebe457243a02caee5c3cde7964d752682 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 1/9] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index a8dccb1..ce4353a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc1549c64c6878d5917a770fa339893e maven-parent-27-source-release.zip +SHA512 (maven-parent-27-source-release.zip) = 65ffaac57c2f8e7fe4be5736ad0b59a15ef952276ce1214c18c504e6c1909cd9a1c9372e0f1cbbb1ed77889bb5151c44ae7d617bc6f0fce321c66b085bc5803e From 7f2f04b68324d297feff1f646e0d59f4c5da7a45 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 May 2019 08:24:04 +0200 Subject: [PATCH 2/9] Update to upstream version 33 --- .gitignore | 1 + maven-parent.spec | 14 +++++++++++--- sources | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8e05cdd..d71b27f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /maven-parent-25-source-release.zip /maven-parent-26-source-release.zip /maven-parent-27-source-release.zip +/maven-parent-33-source-release.zip diff --git a/maven-parent.spec b/maven-parent.spec index 4fb30d3..a662cb4 100644 --- a/maven-parent.spec +++ b/maven-parent.spec @@ -1,6 +1,6 @@ Name: maven-parent -Version: 27 -Release: 5%{?dist} +Version: 33 +Release: 1%{?dist} Summary: Apache Maven parent POM License: ASL 2.0 URL: http://maven.apache.org @@ -8,7 +8,12 @@ Source0: http://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version BuildArch: noarch BuildRequires: maven-local -BuildRequires: apache-parent +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) +BuildRequires: mvn(org.apache:apache:pom:) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) %description Apache Maven parent POM file used by other Maven projects. @@ -29,6 +34,9 @@ Apache Maven parent POM file used by other Maven projects. %doc LICENSE NOTICE %changelog +* Tue May 14 2019 Mikolaj Izdebski - 33-1 +- Update to upstream version 33 + * Thu Feb 08 2018 Fedora Release Engineering - 27-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index ce4353a..b6ac26f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-parent-27-source-release.zip) = 65ffaac57c2f8e7fe4be5736ad0b59a15ef952276ce1214c18c504e6c1909cd9a1c9372e0f1cbbb1ed77889bb5151c44ae7d617bc6f0fce321c66b085bc5803e +SHA512 (maven-parent-33-source-release.zip) = ebbcf83d2d8b3f9ff681669cef54559eed42c1453dfc913888de90f23d1a6f7de73b43030d94803e037c41d8efa908f99ab25fefec1e250b3c8704e0b44d9c6b From ca3c9a1aba4c108bc039f8619b38d5a802d98a46 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:08 +0200 Subject: [PATCH 3/9] Mass rebuild for javapackages-tools 201901 --- maven-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-parent.spec b/maven-parent.spec index a662cb4..c27f039 100644 --- a/maven-parent.spec +++ b/maven-parent.spec @@ -1,6 +1,6 @@ Name: maven-parent Version: 33 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Maven parent POM License: ASL 2.0 URL: http://maven.apache.org @@ -34,6 +34,9 @@ Apache Maven parent POM file used by other Maven projects. %doc LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 33-2 +- Mass rebuild for javapackages-tools 201901 + * Tue May 14 2019 Mikolaj Izdebski - 33-1 - Update to upstream version 33 From b58b9ac85d041a5f40591e06f525c051b9e23d47 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 3 Sep 2019 02:29:07 +0200 Subject: [PATCH 4/9] Disable apache-resource-bundles module --- maven-parent.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/maven-parent.spec b/maven-parent.spec index c27f039..2cec883 100644 --- a/maven-parent.spec +++ b/maven-parent.spec @@ -20,6 +20,7 @@ Apache Maven parent POM file used by other Maven projects. %prep %setup -q +%pom_disable_module apache-resource-bundles %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-checkstyle-plugin %pom_remove_plugin :apache-rat-plugin From 0da9f41e4b6bc52e55a51d27688d3a0733e785fe Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 5/9] Mass rebuild for javapackages-tools 201902 --- maven-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-parent.spec b/maven-parent.spec index 2cec883..fabcfdb 100644 --- a/maven-parent.spec +++ b/maven-parent.spec @@ -1,6 +1,6 @@ Name: maven-parent Version: 33 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Maven parent POM License: ASL 2.0 URL: http://maven.apache.org @@ -35,6 +35,9 @@ Apache Maven parent POM file used by other Maven projects. %doc LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 33-3 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 33-2 - Mass rebuild for javapackages-tools 201901 From af21faec0f995951aa287ef08c76d68f78e5d57f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 27 Apr 2020 14:19:29 +0200 Subject: [PATCH 6/9] Disable generation of help MOJOs --- maven-parent.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maven-parent.spec b/maven-parent.spec index fabcfdb..b39020c 100644 --- a/maven-parent.spec +++ b/maven-parent.spec @@ -25,6 +25,8 @@ Apache Maven parent POM file used by other Maven projects. %pom_remove_plugin :maven-checkstyle-plugin %pom_remove_plugin :apache-rat-plugin +%pom_xpath_remove "pom:execution[pom:id='generate-helpmojo']" maven-plugins + %build %mvn_build From 8ca0ffb16284ef1615edb879d7a747b70189d7d5 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 22 Jun 2020 15:55:59 +0200 Subject: [PATCH 7/9] Update to upstream version 34 --- .gitignore | 1 + maven-parent.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d71b27f..98e7928 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /maven-parent-26-source-release.zip /maven-parent-27-source-release.zip /maven-parent-33-source-release.zip +/maven-parent-34-source-release.zip diff --git a/maven-parent.spec b/maven-parent.spec index b39020c..1f65493 100644 --- a/maven-parent.spec +++ b/maven-parent.spec @@ -1,10 +1,10 @@ Name: maven-parent -Version: 33 -Release: 3%{?dist} +Version: 34 +Release: 1%{?dist} Summary: Apache Maven parent POM License: ASL 2.0 -URL: http://maven.apache.org -Source0: http://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip +URL: https://maven.apache.org +Source0: https://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip BuildArch: noarch BuildRequires: maven-local @@ -37,6 +37,9 @@ Apache Maven parent POM file used by other Maven projects. %doc LICENSE NOTICE %changelog +* Mon Jun 22 2020 Marian Koncek - 34-1 +- Update to upstream version 34 + * Tue Nov 05 2019 Mikolaj Izdebski - 33-3 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index b6ac26f..85d767d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-parent-33-source-release.zip) = ebbcf83d2d8b3f9ff681669cef54559eed42c1453dfc913888de90f23d1a6f7de73b43030d94803e037c41d8efa908f99ab25fefec1e250b3c8704e0b44d9c6b +SHA512 (maven-parent-34-source-release.zip) = caf523e3def4d414985b3f96ec6939a43a96d977510001e08f23aa3b44dd182b92ec7557204de649e63d6a5bc926042f62fde83406cd428ca710d62af7151b7a From 9566e6e0c7bfc5531980d68cf516a3d4ed9c1174 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 8/9] Conditionalize buildrequires in bootstrap mode --- maven-parent.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-parent.spec b/maven-parent.spec index 1f65493..4adc170 100644 --- a/maven-parent.spec +++ b/maven-parent.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: maven-parent Version: 34 Release: 1%{?dist} @@ -8,12 +10,16 @@ Source0: https://repo1.maven.org/maven2/org/apache/maven/%{name}/%{versio BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) +%endif %description Apache Maven parent POM file used by other Maven projects. From 3d4901b74eca4f6766861a76de0df848435ddb9d 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 --- maven-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-parent.spec b/maven-parent.spec index 4adc170..b5271e1 100644 --- a/maven-parent.spec +++ b/maven-parent.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: maven-parent Version: 34