From 318b1d32899aadb43891959f7d0822d310673041 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:20:08 +0000 Subject: [PATCH 01/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 4dddee9..057480a 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent Version: 17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -32,6 +32,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 17-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 948238632912444b33c6b2765e64daf6c536fd67 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 17 May 2016 09:34:07 +0200 Subject: [PATCH 02/68] Update to upstream version 18 --- .gitignore | 1 + apache-parent.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 051042c..2a32195 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /apache-15-source-release.zip /apache-16-source-release.zip /apache-17-source-release.zip +/apache-18-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index 057480a..66fff3a 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent -Version: 17 -Release: 3%{?dist} +Version: 18 +Release: 1%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -32,6 +32,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Tue May 17 2016 Mikolaj Izdebski - 18-1 +- Update to upstream version 18 + * Wed Feb 03 2016 Fedora Release Engineering - 17-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 3d277d6..e3487ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -02c8bfc4e3cdf9da423552a8d6633f90 apache-17-source-release.zip +e3dbebccecd8304e92570576a5f1104a apache-18-source-release.zip From 81220acd7ee25b3b437f00fe1b19744920e4db30 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 06:06:31 +0000 Subject: [PATCH 03/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 66fff3a..369ff6a 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent Version: 18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -32,6 +32,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue May 17 2016 Mikolaj Izdebski - 18-1 - Update to upstream version 18 From a143cfe84e00d843228e2a050239c8931223349d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 03:03:04 +0000 Subject: [PATCH 04/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 369ff6a..76de99b 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent Version: 18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -32,6 +32,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 18-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From c13a0a5ab8e8ba54b5982509b93db71cc5d2bc2a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 25 Jan 2018 09:19:50 +0100 Subject: [PATCH 05/68] Update to upstream version 19 --- .gitignore | 1 + apache-parent.spec | 14 ++++++++------ sources | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 2a32195..75e0980 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /apache-16-source-release.zip /apache-17-source-release.zip /apache-18-source-release.zip +/apache-19-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index 76de99b..0516191 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent -Version: 18 -Release: 3%{?dist} +Version: 19 +Release: 1%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -8,9 +8,8 @@ Source0: http://repo1.maven.org/maven2/org/apache/apache/%{version}/apach BuildArch: noarch BuildRequires: maven-local -BuildRequires: jpackage-utils -BuildRequires: apache-resource-bundles -BuildRequires: maven-remote-resources-plugin +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) Requires: apache-resource-bundles @@ -20,7 +19,7 @@ This package contains the parent pom file for apache projects. %prep %setup -n apache-%{version} -%pom_remove_plugin :maven-site-plugin pom.xml +%pom_remove_plugin :maven-site-plugin %build %mvn_build @@ -32,6 +31,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Thu Jan 25 2018 Mikolaj Izdebski - 19-1 +- Update to upstream version 19 + * Wed Jul 26 2017 Fedora Release Engineering - 18-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index e3487ae..b2aad7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3dbebccecd8304e92570576a5f1104a apache-18-source-release.zip +SHA512 (apache-19-source-release.zip) = 408e6fe646b3a6ac397bbd2540a9c188875e06ddd4113b0f15a6b0303fb850d368502fca0906dde4d1b69e6611145402f0a43715a8948ef6cdef6747cd3f24af From 1705ef8ad29e5190976b84469fbcef47f7f7c47d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 25 Jan 2018 09:29:49 +0100 Subject: [PATCH 06/68] Add missing BR on apache-resource-bundles --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 0516191..9e82951 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -11,7 +11,9 @@ BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) -Requires: apache-resource-bundles +# Not generated automatically +BuildRequires: mvn(org.apache:apache-jar-resource-bundle) +Requires: mvn(org.apache:apache-jar-resource-bundle) %description This package contains the parent pom file for apache projects. @@ -33,6 +35,7 @@ This package contains the parent pom file for apache projects. %changelog * Thu Jan 25 2018 Mikolaj Izdebski - 19-1 - Update to upstream version 19 +- Add missing BR on apache-resource-bundles * Wed Jul 26 2017 Fedora Release Engineering - 18-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 05d3dd8ac949bd31c39aef0a494a1d75577073d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:33:16 +0000 Subject: [PATCH 07/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 9e82951..db4733e 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent Version: 19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 25 2018 Mikolaj Izdebski - 19-1 - Update to upstream version 19 - Add missing BR on apache-resource-bundles From 4ecdc83d39b13bd331381eb599a83b0c403a36cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:22:07 +0000 Subject: [PATCH 08/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index db4733e..884e00f 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent Version: 19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 13cab2e07c78eada1698238d8740c2c784de3dfc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:32:17 +0000 Subject: [PATCH 09/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 884e00f..1c83806 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent Version: 19 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 19-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 19-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From b92006228353c03bb4f3e05abcb08031255693ca Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 May 2019 11:46:44 +0200 Subject: [PATCH 10/68] Update to upstream version 21 --- .gitignore | 1 + apache-parent.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 75e0980..3e49c71 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /apache-17-source-release.zip /apache-18-source-release.zip /apache-19-source-release.zip +/apache-21-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index db4733e..17d434e 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent -Version: 19 -Release: 2%{?dist} +Version: 21 +Release: 1%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Tue May 14 2019 Mikolaj Izdebski - 21-1 +- Update to upstream version 21 + * Wed Feb 07 2018 Fedora Release Engineering - 19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index b2aad7e..3118980 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-19-source-release.zip) = 408e6fe646b3a6ac397bbd2540a9c188875e06ddd4113b0f15a6b0303fb850d368502fca0906dde4d1b69e6611145402f0a43715a8948ef6cdef6747cd3f24af +SHA512 (apache-21-source-release.zip) = ea5acf9123158c5140e69460eaa03f360651f597e3f5c908a0b9080f287024f1a54e75b8fe020f0b9847b7ae5be1fa3ee5d094e261bf060d90d568ccd0bc8a53 From 7c00e14b6358c74b98e438c566601cef829395e8 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 17 May 2019 14:25:21 +0200 Subject: [PATCH 11/68] update to version 21 --- .gitignore | 1 + apache-parent.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 75e0980..3e49c71 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /apache-17-source-release.zip /apache-18-source-release.zip /apache-19-source-release.zip +/apache-21-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index 1c83806..ef5b122 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent -Version: 19 -Release: 4%{?dist} +Version: 21 +Release: 1%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Tue May 14 2019 Mikolaj Izdebski - 21-1 +- Update to upstream version 21 + * Thu Jan 31 2019 Fedora Release Engineering - 19-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index b2aad7e..3118980 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-19-source-release.zip) = 408e6fe646b3a6ac397bbd2540a9c188875e06ddd4113b0f15a6b0303fb850d368502fca0906dde4d1b69e6611145402f0a43715a8948ef6cdef6747cd3f24af +SHA512 (apache-21-source-release.zip) = ea5acf9123158c5140e69460eaa03f360651f597e3f5c908a0b9080f287024f1a54e75b8fe020f0b9847b7ae5be1fa3ee5d094e261bf060d90d568ccd0bc8a53 From adaf7a0917d1f3b2007d423b332e3fb637cfd28c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:21 +0200 Subject: [PATCH 12/68] Mass rebuild for javapackages-tools 201901 --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 17d434e..992424d 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent Version: 21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 21-2 +- Mass rebuild for javapackages-tools 201901 + * Tue May 14 2019 Mikolaj Izdebski - 21-1 - Update to upstream version 21 From b7dce9c3e9e4ddb0021a33d7cda0b4ac746ab03a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:09:39 +0000 Subject: [PATCH 13/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index ef5b122..4843900 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent Version: 21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue May 14 2019 Mikolaj Izdebski - 21-1 - Update to upstream version 21 From c38fb68eab765deaa5635b3b9f1f53c4e68873ff Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 14/68] Mass rebuild for javapackages-tools 201902 --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 992424d..26f1def 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent Version: 21 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 21-3 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 21-2 - Mass rebuild for javapackages-tools 201901 From a7c9ff0058944126b4adfe806483e25a57ac2032 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 17 Jan 2020 21:09:21 +0100 Subject: [PATCH 15/68] update to version 22 --- .gitignore | 4 ++++ apache-parent.spec | 9 ++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3e49c71..345c49d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/results_* +/*.src.rpm + /apache-parent-14.pom /LICENSE-2.0.txt /apache-15-source-release.zip @@ -6,3 +9,4 @@ /apache-18-source-release.zip /apache-19-source-release.zip /apache-21-source-release.zip +/apache-22-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index 4843900..20c5f77 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,10 +1,10 @@ Name: apache-parent -Version: 21 -Release: 2%{?dist} +Version: 22 +Release: 1%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ -Source0: http://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip +Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip BuildArch: noarch BuildRequires: maven-local @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Fri Jan 17 2020 Fabio Valentini - 22-1 +- Update to version 22. + * Wed Jul 24 2019 Fedora Release Engineering - 21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 3118980..6e66c5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-21-source-release.zip) = ea5acf9123158c5140e69460eaa03f360651f597e3f5c908a0b9080f287024f1a54e75b8fe020f0b9847b7ae5be1fa3ee5d094e261bf060d90d568ccd0bc8a53 +SHA512 (apache-22-source-release.zip) = 180896d6ada20d029203791d594f657e3874730eaa6ebf5288325766728fee4bb55e1dc8666207ed9d88e735edfe1e3e660492d234d248f5202575edbeb5b7a9 From 7c6c827030b5c6f53db7608137ebb221490a6719 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:47:57 +0000 Subject: [PATCH 16/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 20c5f77..6fce4d5 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent Version: 22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 17 2020 Fabio Valentini - 22-1 - Update to version 22. From 596441bbfeb1f6f21100496111359db5d7135e0b Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jan 2020 16:19:00 +0100 Subject: [PATCH 17/68] Update to upstream version 23 --- .gitignore | 1 + apache-parent.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3e49c71..9190030 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /apache-18-source-release.zip /apache-19-source-release.zip /apache-21-source-release.zip +/apache-23-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index 26f1def..b7ecc41 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,10 +1,10 @@ Name: apache-parent -Version: 21 -Release: 3%{?dist} +Version: 23 +Release: 1%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ -Source0: http://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip +Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip BuildArch: noarch BuildRequires: maven-local @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Wed Jan 29 2020 Marian Koncek - 23-1 +- Update to upstream version 23 + * Tue Nov 05 2019 Mikolaj Izdebski - 21-3 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 3118980..4e38ae4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-21-source-release.zip) = ea5acf9123158c5140e69460eaa03f360651f597e3f5c908a0b9080f287024f1a54e75b8fe020f0b9847b7ae5be1fa3ee5d094e261bf060d90d568ccd0bc8a53 +SHA512 (apache-23-source-release.zip) = a72b94255c5cef7cb53700cfc53287d05361e4d73f0fcf71930c329aeb467787bcc3f7911793839a14a71d372c44e36438c2a4e66e811cead042a799b11587c1 From 8bc9ede49c8bf5c4b2cc9b8e1f358f3fff0062b2 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 2 Mar 2020 13:28:07 +0100 Subject: [PATCH 18/68] update to version 23 --- .gitignore | 1 + apache-parent.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 345c49d..68b0801 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /apache-19-source-release.zip /apache-21-source-release.zip /apache-22-source-release.zip +/apache-23-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index 6fce4d5..1bfdcbc 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent -Version: 22 -Release: 2%{?dist} +Version: 23 +Release: 1%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Mon Mar 02 2020 Fabio Valentini - 23-1 +- Update to version 23. + * Tue Jan 28 2020 Fedora Release Engineering - 22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 6e66c5a..4e38ae4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-22-source-release.zip) = 180896d6ada20d029203791d594f657e3874730eaa6ebf5288325766728fee4bb55e1dc8666207ed9d88e735edfe1e3e660492d234d248f5202575edbeb5b7a9 +SHA512 (apache-23-source-release.zip) = a72b94255c5cef7cb53700cfc53287d05361e4d73f0fcf71930c329aeb467787bcc3f7911793839a14a71d372c44e36438c2a4e66e811cead042a799b11587c1 From 143ab22353d9a18387bb0b4976e937c72546f48c Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 15:59:58 +0200 Subject: [PATCH 19/68] Rebuilt for JDK-11 --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 1bfdcbc..f0acd67 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent Version: 23 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Fri Jul 10 2020 Jiri Vanek - 23-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Mon Mar 02 2020 Fabio Valentini - 23-1 - Update to version 23. From 1eb3eb09ee999fc574d3fa85a6fe0b774b8d45e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:12:47 +0000 Subject: [PATCH 20/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index f0acd67..44e39f8 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent Version: 23 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jiri Vanek - 23-2 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From be8eb3b4b52f58c79a9ae01bc9ef9b1b770dcca2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:16:11 +0000 Subject: [PATCH 21/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 44e39f8..0667574 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent Version: 23 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 23-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9ed7aeb2de1a38ea2f585c43049eaceec73c9f7c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 22/68] Conditionalize buildrequires in bootstrap mode --- apache-parent.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apache-parent.spec b/apache-parent.spec index b7ecc41..9814165 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: apache-parent Version: 23 Release: 1%{?dist} @@ -8,11 +10,17 @@ Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apac BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) +%endif # Not generated automatically +%if %{without bootstrap} BuildRequires: mvn(org.apache:apache-jar-resource-bundle) +%endif Requires: mvn(org.apache:apache-jar-resource-bundle) %description From 16ef6b1bcf27b7f353b4ea02d52602d9f61f336e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 23/68] Turn off bootstrap mode by default --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 9814165..71aebd9 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-parent Version: 23 From 9270b1b58f0be6a60986492a271022a35f3b83b6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:49:31 +0200 Subject: [PATCH 24/68] Bootstrap build --- apache-parent.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-parent.spec b/apache-parent.spec index d193dc5..9e343d4 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,8 +1,8 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: apache-parent Version: 23 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -41,6 +41,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Mon May 17 2021 Mikolaj Izdebski - 23-5 +- Bootstrap build + * Tue Jan 26 2021 Fedora Release Engineering - 23-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 624af08e4390e570c6ea95a8c1c3c598f65df32e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:41 +0200 Subject: [PATCH 25/68] Non-bootstrap build --- apache-parent.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 9e343d4..26375f8 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-parent Version: 23 @@ -43,6 +43,7 @@ This package contains the parent pom file for apache projects. %changelog * Mon May 17 2021 Mikolaj Izdebski - 23-5 - Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 23-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From b5788ea32d5741a02bbf4d355cc292dd5773955d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:48:23 +0000 Subject: [PATCH 26/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 302dc7bf5351a35af16531ee75adc3d99c15fec6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:44:24 +0000 Subject: [PATCH 27/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 26375f8..1bfba6a 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 23 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -41,6 +41,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 23-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Mikolaj Izdebski - 23-5 - Bootstrap build - Non-bootstrap build From 186c9a7d60ffe9ee1fc2ca1589cd1eb9650104be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:26:30 +0000 Subject: [PATCH 28/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 1bfba6a..df36baf 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 23 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -41,6 +41,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 23-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 23-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From dc6482e3e1202c48b2d45307d593e5366cb894d7 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 19:32:29 +0100 Subject: [PATCH 29/68] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index df36baf..564c6fe 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 23 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -41,6 +41,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Sat Feb 05 2022 Jiri Vanek - 23-8 +- Rebuilt for java-17-openjdk as system jdk + * Wed Jan 19 2022 Fedora Release Engineering - 23-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 95812da2a30be1b0d4038574754882efdbd813f3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 22 Apr 2022 01:11:21 +0200 Subject: [PATCH 30/68] Update to upstream version 26 --- .gitignore | 1 + apache-parent.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 68b0801..35c3ca1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /apache-21-source-release.zip /apache-22-source-release.zip /apache-23-source-release.zip +/apache-26-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index 564c6fe..1f8eeb3 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: apache-parent -Version: 23 -Release: 8%{?dist} +Version: 26 +Release: 1%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -41,6 +41,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Thu Apr 21 2022 Mikolaj Izdebski - 26-1 +- Update to upstream version 26 + * Sat Feb 05 2022 Jiri Vanek - 23-8 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index 4e38ae4..3be68d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-23-source-release.zip) = a72b94255c5cef7cb53700cfc53287d05361e4d73f0fcf71930c329aeb467787bcc3f7911793839a14a71d372c44e36438c2a4e66e811cead042a799b11587c1 +SHA512 (apache-26-source-release.zip) = f3dda2215de74de96b4ac7fa99fae7394ba06ad1e592112556330dd9c2b51ce6fddc8fea1684ce76b9d1bc247b815db306fb5fa65a4828f2600a1d81c1a848fc From dd6c923b97fb137d1368a7e0b9f7acdaa19a8f75 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 27 Apr 2022 08:02:27 +0200 Subject: [PATCH 31/68] Workaround build issue with RPM 4.18 See https://bugzilla.redhat.com/show_bug.cgi?id=2079127 --- apache-parent.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-parent.spec b/apache-parent.spec index 1f8eeb3..8365e1b 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 26 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -27,7 +27,7 @@ Requires: mvn(org.apache:apache-jar-resource-bundle) This package contains the parent pom file for apache projects. %prep -%setup -n apache-%{version} +%setup -q -n apache-%{version} %pom_remove_plugin :maven-site-plugin @@ -41,6 +41,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Wed Apr 27 2022 Mikolaj Izdebski - 26-2 +- Workaround build issue with RPM 4.18 + * Thu Apr 21 2022 Mikolaj Izdebski - 26-1 - Update to upstream version 26 From 99a617238667cc62a74463a6315ad09efa930f10 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 32/68] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- apache-parent.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-parent.spec b/apache-parent.spec index 8365e1b..eb38c86 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -8,6 +8,7 @@ License: ASL 2.0 URL: http://apache.org/ Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local %if %{with bootstrap} From 668adc03b5edc1075b2f386be6ebbf9267591a1a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 33/68] Update build-requires in bootstrap mode --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index eb38c86..46b6fc8 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -10,10 +10,10 @@ Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apac BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) %endif From 8961b4ff2b48d7313f21715104c498f666a07ab5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:01:37 +0000 Subject: [PATCH 34/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 46b6fc8..802e32d 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -42,6 +42,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Apr 27 2022 Mikolaj Izdebski - 26-2 - Workaround build issue with RPM 4.18 From 334ea3943b574c25151eb68c1c4eed08ab77f997 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 35/68] 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 a0e8c8d78c66b7e0cba13fa4d32cfca1232bd333 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 6 Sep 2022 10:50:55 +0200 Subject: [PATCH 36/68] Update to upstream version 27 --- .gitignore | 1 + apache-parent.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 35c3ca1..767af86 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /apache-22-source-release.zip /apache-23-source-release.zip /apache-26-source-release.zip +/apache-27-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index 802e32d..3c87cf1 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: apache-parent -Version: 26 -Release: 3%{?dist} +Version: 27 +Release: 1%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -42,6 +42,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Tue Sep 06 2022 Marian Koncek - 27-1 +- Update to upstream version 27 + * Wed Jul 20 2022 Fedora Release Engineering - 26-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 3be68d1..0704973 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-26-source-release.zip) = f3dda2215de74de96b4ac7fa99fae7394ba06ad1e592112556330dd9c2b51ce6fddc8fea1684ce76b9d1bc247b815db306fb5fa65a4828f2600a1d81c1a848fc +SHA512 (apache-27-source-release.zip) = 0e84fd2073944a86bfe1eeb36a2553bb3530c1799ed23f2cbc67334176f08d9c67e98bd96de040bc8fb3d789bd38ea0d7eafe85fc790b3f1eebfde34ce230d6f From f47fe7f3716c814e588599b74157dd10c74ec8f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:56:10 +0000 Subject: [PATCH 37/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 3c87cf1..3918210 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 27 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -42,6 +42,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 27-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Sep 06 2022 Marian Koncek - 27-1 - Update to upstream version 27 From 9697ce537bd27d7e687a612cb52663161619b2f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:31:20 +0000 Subject: [PATCH 38/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 3918210..b9e0fda 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 27 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -42,6 +42,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 27-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 27-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 8c5f6668ab65512639c1ad8e03ac54d1360c3cd6 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 11 Aug 2023 09:23:47 +0200 Subject: [PATCH 39/68] Update license field to SPDX format --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index b9e0fda..9a90cf1 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -4,7 +4,7 @@ Name: apache-parent Version: 27 Release: 3%{?dist} Summary: Parent POM file for Apache projects -License: ASL 2.0 +License: Apache-2.0 URL: http://apache.org/ Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip BuildArch: noarch From 8da13e413c19c7617013f727c4286fd4a8c97747 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 11 Aug 2023 11:52:12 +0200 Subject: [PATCH 40/68] Update to upstream version 30 --- .gitignore | 1 + apache-parent.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 767af86..28ae00e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /apache-23-source-release.zip /apache-26-source-release.zip /apache-27-source-release.zip +/apache-30-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index 9a90cf1..f4f77bb 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,11 +1,11 @@ %bcond_with bootstrap Name: apache-parent -Version: 27 -Release: 3%{?dist} +Version: 30 +Release: 1%{?dist} Summary: Parent POM file for Apache projects License: Apache-2.0 -URL: http://apache.org/ +URL: https://apache.org/ Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -20,9 +20,9 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) # Not generated automatically %if %{without bootstrap} -BuildRequires: mvn(org.apache:apache-jar-resource-bundle) +BuildRequires: mvn(org.apache.apache.resources:apache-jar-resource-bundle) %endif -Requires: mvn(org.apache:apache-jar-resource-bundle) +Requires: mvn(org.apache.apache.resources:apache-jar-resource-bundle) %description This package contains the parent pom file for apache projects. @@ -39,9 +39,12 @@ This package contains the parent pom file for apache projects. %mvn_install %files -f .mfiles -%doc LICENSE NOTICE +%license LICENSE NOTICE %changelog +* Fri Aug 11 2023 Marian Koncek - 30-1 +- Update to upstream version 30 + * Wed Jul 19 2023 Fedora Release Engineering - 27-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 0704973..efc7d12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-27-source-release.zip) = 0e84fd2073944a86bfe1eeb36a2553bb3530c1799ed23f2cbc67334176f08d9c67e98bd96de040bc8fb3d789bd38ea0d7eafe85fc790b3f1eebfde34ce230d6f +SHA512 (apache-30-source-release.zip) = 3c2557de0d8b1a1bfb36d67e7e17cdf338f9812ccb9fd030eedb3ff4693fbac38980bfe022dc033fe454b28f2e49ddedb768c52a62c83b82e1ad0041b5ff9ac7 From 3ca5eb5d9e119c1a1f4320fee55a4ebcef4fe5e3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Aug 2023 15:58:52 +0200 Subject: [PATCH 41/68] Bootstrap build --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index f4f77bb..3d58c60 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,4 +1,4 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: apache-parent Version: 30 From 27d979468e1648b222c2e7fa2baf9ffd47a813ad Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Aug 2023 16:22:35 +0200 Subject: [PATCH 42/68] Non-bootstrap build --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 3d58c60..f4f77bb 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-parent Version: 30 From 55b3a3d53180e33fe9e6fb804022038f5039d332 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 15:58:22 +0200 Subject: [PATCH 43/68] Rebuild --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index f4f77bb..597e20b 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 30 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ @@ -42,6 +42,9 @@ This package contains the parent pom file for apache projects. %license LICENSE NOTICE %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 30-2 +- Rebuild + * Fri Aug 11 2023 Marian Koncek - 30-1 - Update to upstream version 30 From 85aec5dd54f56aeacc34158eb947c0eef78ff30b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:07 +0200 Subject: [PATCH 44/68] 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 3405a81749685ef4ef54c8758f9adc40219037bb Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 8 Dec 2023 10:36:52 +0100 Subject: [PATCH 45/68] Update to upstream version 31 --- .gitignore | 1 + apache-parent.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 28ae00e..e1839a5 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /apache-26-source-release.zip /apache-27-source-release.zip /apache-30-source-release.zip +/apache-31-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index 597e20b..89a5b06 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: apache-parent -Version: 30 -Release: 2%{?dist} +Version: 31 +Release: 1%{?dist} Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ @@ -42,6 +42,9 @@ This package contains the parent pom file for apache projects. %license LICENSE NOTICE %changelog +* Fri Dec 08 2023 Marian Koncek - 31-1 +- Update to upstream version 31 + * Fri Sep 01 2023 Mikolaj Izdebski - 30-2 - Rebuild diff --git a/sources b/sources index efc7d12..e9afd37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-30-source-release.zip) = 3c2557de0d8b1a1bfb36d67e7e17cdf338f9812ccb9fd030eedb3ff4693fbac38980bfe022dc033fe454b28f2e49ddedb768c52a62c83b82e1ad0041b5ff9ac7 +SHA512 (apache-31-source-release.zip) = b60e0ef1899ab77a44b9afe5af50087d353fc67bda991fca11815abc18514f4fea6e90c452a503d56bb342a2a1854f9b4a7f655ce48bda90c5dab67468a06316 From 8b4efef25a59db709260357b64cee59cc21a5dce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:17:40 +0000 Subject: [PATCH 46/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 89a5b06..99edc12 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 31 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ @@ -42,6 +42,9 @@ This package contains the parent pom file for apache projects. %license LICENSE NOTICE %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 31-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Dec 08 2023 Marian Koncek - 31-1 - Update to upstream version 31 From d2e8efb0aee84b6490b7667a1cc31c4bfcb47083 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:15:54 +0000 Subject: [PATCH 47/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 99edc12..d46c21c 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 31 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ @@ -42,6 +42,9 @@ This package contains the parent pom file for apache projects. %license LICENSE NOTICE %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 31-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 31-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a24ec8833c00c225bd4b6fa923d8cb2c0de7505f Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:16:02 +0100 Subject: [PATCH 48/68] 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 --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index d46c21c..67d547b 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 31 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ @@ -42,6 +42,9 @@ This package contains the parent pom file for apache projects. %license LICENSE NOTICE %changelog +* Fri Feb 23 2024 Jiri Vanek - 31-4 +- bump of release for for java-21-openjdk as system jdk + * Mon Jan 22 2024 Fedora Release Engineering - 31-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 673e242faf3ab7333d54902bfd984f7234120d9c Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 14:51:18 +0100 Subject: [PATCH 49/68] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 67d547b..941b7a4 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 31 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ @@ -42,6 +42,9 @@ This package contains the parent pom file for apache projects. %license LICENSE NOTICE %changelog +* Tue Feb 27 2024 Jiri Vanek - 31-5 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 31-4 - bump of release for for java-21-openjdk as system jdk From 5567e8f55bd08fd1c5ee10dd465c86eb173c11d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:13:30 +0000 Subject: [PATCH 50/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 941b7a4..b4e0ca1 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 31 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ @@ -42,6 +42,9 @@ This package contains the parent pom file for apache projects. %license LICENSE NOTICE %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 31-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 31-5 - Rebuilt for java-21-openjdk as system jdk From cbdbb48545f06474359d663a3a8eb0c384fff764 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 51/68] 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 b53392072db64678fe96c4eaab94b42a209c9de9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 52/68] Switch from %setup to %autosetup --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index b4e0ca1..43ee400 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -28,7 +28,7 @@ Requires: mvn(org.apache.apache.resources:apache-jar-resource-bundle) This package contains the parent pom file for apache projects. %prep -%setup -q -n apache-%{version} +%autosetup -p1 -n apache-%{version} %pom_remove_plugin :maven-site-plugin From f1c16fe6fbbe5e37148dd98faa16ff7f295dd89f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:01 +0200 Subject: [PATCH 53/68] Convert to %autorelease and %autochangelog --- apache-parent.spec | 183 +-------------------------------------------- changelog | 180 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+), 181 deletions(-) create mode 100644 changelog diff --git a/apache-parent.spec b/apache-parent.spec index 43ee400..e353304 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -2,7 +2,7 @@ Name: apache-parent Version: 31 -Release: 6%{?dist} +Release: %autorelease Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ @@ -42,183 +42,4 @@ This package contains the parent pom file for apache projects. %license LICENSE NOTICE %changelog -* Wed Jul 17 2024 Fedora Release Engineering - 31-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 31-5 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 31-4 -- bump of release for for java-21-openjdk as system jdk - -* Mon Jan 22 2024 Fedora Release Engineering - 31-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 31-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Dec 08 2023 Marian Koncek - 31-1 -- Update to upstream version 31 - -* Fri Sep 01 2023 Mikolaj Izdebski - 30-2 -- Rebuild - -* Fri Aug 11 2023 Marian Koncek - 30-1 -- Update to upstream version 30 - -* Wed Jul 19 2023 Fedora Release Engineering - 27-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 27-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Sep 06 2022 Marian Koncek - 27-1 -- Update to upstream version 27 - -* Wed Jul 20 2022 Fedora Release Engineering - 26-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Apr 27 2022 Mikolaj Izdebski - 26-2 -- Workaround build issue with RPM 4.18 - -* Thu Apr 21 2022 Mikolaj Izdebski - 26-1 -- Update to upstream version 26 - -* Sat Feb 05 2022 Jiri Vanek - 23-8 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 23-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 23-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 23-5 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 23-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 23-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 23-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Mon Mar 02 2020 Fabio Valentini - 23-1 -- Update to version 23. - -* Wed Jan 29 2020 Marian Koncek - 23-1 -- Update to upstream version 23 - -* Tue Jan 28 2020 Fedora Release Engineering - 22-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 17 2020 Fabio Valentini - 22-1 -- Update to version 22. - -* Tue Nov 05 2019 Mikolaj Izdebski - 21-3 -- Mass rebuild for javapackages-tools 201902 - -* Wed Jul 24 2019 Fedora Release Engineering - 21-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 21-2 -- Mass rebuild for javapackages-tools 201901 - -* Tue May 14 2019 Mikolaj Izdebski - 21-1 -- Update to upstream version 21 - -* Thu Jan 31 2019 Fedora Release Engineering - 19-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 19-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 19-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 25 2018 Mikolaj Izdebski - 19-1 -- Update to upstream version 19 -- Add missing BR on apache-resource-bundles - -* Wed Jul 26 2017 Fedora Release Engineering - 18-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue May 17 2016 Mikolaj Izdebski - 18-1 -- Update to upstream version 18 - -* Wed Feb 03 2016 Fedora Release Engineering - 17-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Apr 27 2015 Mikolaj Izdebski - 17-1 -- Update to upstream version 17 - -* Mon Nov 17 2014 Mikolaj Izdebski - 16-1 -- Update to upstream version 16 - -* Mon Sep 29 2014 Mikolaj Izdebski - 15-1 -- Update to upstream version 15 - -* Sat Jun 07 2014 Fedora Release Engineering - 14-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 28 2014 Mikolaj Izdebski - 14-2 -- Rebuild to regenerate Maven auto-requires - -* Mon Mar 10 2014 Mikolaj Izdebski - 14-1 -- Update to upstream version 14 - -* Tue Mar 04 2014 Stanislav Ochotnicky - 10-15 -- Remove maven-site-plugin from dependencies - -* Fri Sep 20 2013 Mikolaj Izdebski - 10-14 -- Rebuild to regenerate Maven provides - -* Thu Aug 29 2013 Mikolaj Izdebski - 10-13 -- Add missing R: apache-resource-bundles - -* Mon Aug 26 2013 Michal Srb - 10-12 -- Migrate away from mvn-rpmbuild - -* Sat Aug 03 2013 Fedora Release Engineering - 10-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 10-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 10-9 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Tue Dec 18 2012 Michal Srb - 10-8 -- Added license (Resolves: #888287) - -* Wed Nov 21 2012 Stanislav Ochotnicky - 10-7 -- Install patched pom not the original - -* Fri Nov 2 2012 Mikolaj Izdebski - 10-6 -- Add missing R: maven-remote-resources-plugin, apache-resource-bundles -- Add %%check to verify dependencies during build - -* Thu Jul 26 2012 Stanislav Ochotnicky - 10-5 -- Make sure we generate 1.5 version bytecode - -* Wed Jul 18 2012 Fedora Release Engineering - 10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Sep 13 2011 Andy Grimm 10-2 -- Follow suggestions in BZ #736069 - -* Mon Aug 29 2011 Andy Grimm 10-1 -- Initial Build +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..22a9adc --- /dev/null +++ b/changelog @@ -0,0 +1,180 @@ +* Wed Jul 17 2024 Fedora Release Engineering - 31-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 31-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 31-4 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 31-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 31-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 08 2023 Marian Koncek - 31-1 +- Update to upstream version 31 + +* Fri Sep 01 2023 Mikolaj Izdebski - 30-2 +- Rebuild + +* Fri Aug 11 2023 Marian Koncek - 30-1 +- Update to upstream version 30 + +* Wed Jul 19 2023 Fedora Release Engineering - 27-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 27-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Sep 06 2022 Marian Koncek - 27-1 +- Update to upstream version 27 + +* Wed Jul 20 2022 Fedora Release Engineering - 26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Apr 27 2022 Mikolaj Izdebski - 26-2 +- Workaround build issue with RPM 4.18 + +* Thu Apr 21 2022 Mikolaj Izdebski - 26-1 +- Update to upstream version 26 + +* Sat Feb 05 2022 Jiri Vanek - 23-8 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 23-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 23-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 23-5 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 23-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Mar 02 2020 Fabio Valentini - 23-1 +- Update to version 23. + +* Wed Jan 29 2020 Marian Koncek - 23-1 +- Update to upstream version 23 + +* Tue Jan 28 2020 Fedora Release Engineering - 22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jan 17 2020 Fabio Valentini - 22-1 +- Update to version 22. + +* Tue Nov 05 2019 Mikolaj Izdebski - 21-3 +- Mass rebuild for javapackages-tools 201902 + +* Wed Jul 24 2019 Fedora Release Engineering - 21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 21-2 +- Mass rebuild for javapackages-tools 201901 + +* Tue May 14 2019 Mikolaj Izdebski - 21-1 +- Update to upstream version 21 + +* Thu Jan 31 2019 Fedora Release Engineering - 19-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 25 2018 Mikolaj Izdebski - 19-1 +- Update to upstream version 19 +- Add missing BR on apache-resource-bundles + +* Wed Jul 26 2017 Fedora Release Engineering - 18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue May 17 2016 Mikolaj Izdebski - 18-1 +- Update to upstream version 18 + +* Wed Feb 03 2016 Fedora Release Engineering - 17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Apr 27 2015 Mikolaj Izdebski - 17-1 +- Update to upstream version 17 + +* Mon Nov 17 2014 Mikolaj Izdebski - 16-1 +- Update to upstream version 16 + +* Mon Sep 29 2014 Mikolaj Izdebski - 15-1 +- Update to upstream version 15 + +* Sat Jun 07 2014 Fedora Release Engineering - 14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 28 2014 Mikolaj Izdebski - 14-2 +- Rebuild to regenerate Maven auto-requires + +* Mon Mar 10 2014 Mikolaj Izdebski - 14-1 +- Update to upstream version 14 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 10-15 +- Remove maven-site-plugin from dependencies + +* Fri Sep 20 2013 Mikolaj Izdebski - 10-14 +- Rebuild to regenerate Maven provides + +* Thu Aug 29 2013 Mikolaj Izdebski - 10-13 +- Add missing R: apache-resource-bundles + +* Mon Aug 26 2013 Michal Srb - 10-12 +- Migrate away from mvn-rpmbuild + +* Sat Aug 03 2013 Fedora Release Engineering - 10-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 10-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 10-9 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Tue Dec 18 2012 Michal Srb - 10-8 +- Added license (Resolves: #888287) + +* Wed Nov 21 2012 Stanislav Ochotnicky - 10-7 +- Install patched pom not the original + +* Fri Nov 2 2012 Mikolaj Izdebski - 10-6 +- Add missing R: maven-remote-resources-plugin, apache-resource-bundles +- Add %%check to verify dependencies during build + +* Thu Jul 26 2012 Stanislav Ochotnicky - 10-5 +- Make sure we generate 1.5 version bytecode + +* Wed Jul 18 2012 Fedora Release Engineering - 10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Sep 13 2011 Andy Grimm 10-2 +- Follow suggestions in BZ #736069 + +* Mon Aug 29 2011 Andy Grimm 10-1 +- Initial Build From 7fc80046ea4e5d142a5ab25b36f69f792456a211 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 02:31:09 +0200 Subject: [PATCH 54/68] Update to upstream version 33 - Resolves: rhbz#2296782 --- .gitignore | 1 + apache-parent.spec | 4 +++- sources | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e1839a5..431bc7c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /apache-27-source-release.zip /apache-30-source-release.zip /apache-31-source-release.zip +/apache-33-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index e353304..2322235 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-parent -Version: 31 +Version: 33 Release: %autorelease Summary: Parent POM file for Apache projects License: Apache-2.0 @@ -31,6 +31,8 @@ This package contains the parent pom file for apache projects. %autosetup -p1 -n apache-%{version} %pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :maven-site-plugin docs +%pom_remove_plugin :maven-scm-publish-plugin docs %build %mvn_build diff --git a/sources b/sources index e9afd37..9ec533f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-31-source-release.zip) = b60e0ef1899ab77a44b9afe5af50087d353fc67bda991fca11815abc18514f4fea6e90c452a503d56bb342a2a1854f9b4a7f655ce48bda90c5dab67468a06316 +SHA512 (apache-33-source-release.zip) = a819eb75f147baa19661ebb7794d4d711f760bb7fc04f66cfefd0f8c57fa24aa8cf4f4d597c4c665ce8604e6941fa519540ccabd3647134390e023cbd671eabe From 5cc88a926a7785f4d470361b98e48c061d85e8aa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 55/68] 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 df7aecd511380769465874f73505aa6a5c50df05 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 56/68] Use %autosetup -C --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 2322235..245d6be 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -28,7 +28,7 @@ Requires: mvn(org.apache.apache.resources:apache-jar-resource-bundle) This package contains the parent pom file for apache projects. %prep -%autosetup -p1 -n apache-%{version} +%autosetup -p1 -C %pom_remove_plugin :maven-site-plugin %pom_remove_plugin :maven-site-plugin docs From b62085363bdceed317076d0112c729ea6d516a9c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:18 +0100 Subject: [PATCH 57/68] Unify spec style with the rest of Java/Maven packages [skip changelog] --- apache-parent.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache-parent.spec b/apache-parent.spec index 245d6be..f033c38 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -6,6 +6,7 @@ Release: %autorelease Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ + Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -17,9 +18,8 @@ BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) %endif - -# Not generated automatically %if %{without bootstrap} +# Not generated automatically BuildRequires: mvn(org.apache.apache.resources:apache-jar-resource-bundle) %endif Requires: mvn(org.apache.apache.resources:apache-jar-resource-bundle) From 2d61f922f6006982973dbff589dc4ad04185c4ac Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:40:57 +0100 Subject: [PATCH 58/68] Reorder spec file tags [skip changelog] --- apache-parent.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache-parent.spec b/apache-parent.spec index f033c38..71a0eb7 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -6,11 +6,11 @@ Release: %autorelease Summary: Parent POM file for Apache projects License: Apache-2.0 URL: https://apache.org/ - -Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip BuildArch: noarch ExclusiveArch: %{java_arches} noarch +Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip + %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else From 6b756fd93ad95e39524a55be7cbe9f5a743d69d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:18:34 +0000 Subject: [PATCH 59/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 0e207c0b74f71a76dac1799c0e5d6e2e1958d8ea Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 Mar 2025 10:48:56 +0100 Subject: [PATCH 60/68] Disable XMvn javadoc MOJO --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 71a0eb7..262a4b2 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -35,7 +35,7 @@ This package contains the parent pom file for apache projects. %pom_remove_plugin :maven-scm-publish-plugin docs %build -%mvn_build +%mvn_build -j %install %mvn_install From c561443c18843f0a71e75d3a2d348325cb4b0968 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:18 +0100 Subject: [PATCH 61/68] 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 8ab6d1ebfad90fced551af47d588f0a68748674a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 62/68] 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 8daa180799ffd84116a42061a3c07afcef72e7ac Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 63/68] Build with OpenJDK 25 --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 262a4b2..1d9cc22 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -14,7 +14,7 @@ Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apac %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) %endif From 833c7f3ad194d49edabac9160875369ddf82dc4a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 16 Jul 2025 21:01:35 +0200 Subject: [PATCH 64/68] Update to upstream version 35 --- .gitignore | 1 + apache-parent.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 431bc7c..9d5548f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /apache-30-source-release.zip /apache-31-source-release.zip /apache-33-source-release.zip +/apache-35-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index 1d9cc22..27d3283 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-parent -Version: 33 +Version: 35 Release: %autorelease Summary: Parent POM file for Apache projects License: Apache-2.0 diff --git a/sources b/sources index 9ec533f..e50d149 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-33-source-release.zip) = a819eb75f147baa19661ebb7794d4d711f760bb7fc04f66cfefd0f8c57fa24aa8cf4f4d597c4c665ce8604e6941fa519540ccabd3647134390e023cbd671eabe +SHA512 (apache-35-source-release.zip) = 7dcbfa0eacd43e66da1c12274bf558fb2618d3fae0831de6b0309e8df539afc07080eb1963174a0a6cc4d0d81ae8d2a01f147780f7ca44a3caa94d3ffd364b61 From fee32a6b1d585da641c465fd69dd9b95eca65fb2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:07:08 +0000 Subject: [PATCH 65/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 03953bfbadec538ba609cd1dc77dce4470601fd9 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:42:25 +0200 Subject: [PATCH 66/68] 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 d0bf0ba470f9b20a16dd55b590252f9d8b10403f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 8 Sep 2025 19:04:08 -0400 Subject: [PATCH 67/68] Remove maven-enforcer-plugin --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 27d3283..dbb56e7 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -15,7 +15,6 @@ Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apac BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) %endif %if %{without bootstrap} @@ -30,6 +29,7 @@ This package contains the parent pom file for apache projects. %prep %autosetup -p1 -C +%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-site-plugin %pom_remove_plugin :maven-site-plugin docs %pom_remove_plugin :maven-scm-publish-plugin docs From 36d69706dc5acc07f435dbe8a24a72ffb0169d05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:48:23 +0000 Subject: [PATCH 68/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild