From 0e207c0b74f71a76dac1799c0e5d6e2e1958d8ea Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 Mar 2025 10:48:56 +0100 Subject: [PATCH 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] 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 7/9] 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 8/9] 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 9/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild