From 75daf2b40712e2c73894fccfd16e9dc25c285e8c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 1/9] Remove javadoc subpackage --- apache-commons-logging.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 81df12e..ba52d78 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -26,6 +26,8 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.moditect:moditect-maven-plugin) BuildRequires: mvn(org.slf4j:slf4j-api) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.3.4-8 %description The commons-logging package provides a simple, component oriented @@ -38,12 +40,6 @@ commons-logging abstraction is meant to minimize the differences between the two, and to allow a developer to not tie himself to a particular logging implementation. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -73,7 +69,7 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %build # missing test dependencies -%mvn_build -f +%mvn_build -j -f %install %mvn_install @@ -82,7 +78,5 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %license LICENSE.txt NOTICE.txt %doc PROPOSAL.html RELEASE-NOTES.txt -%files javadoc -f .mfiles-javadoc - %changelog %autochangelog From 19dca87a5211028783ec0caa5c1d47b3ead28dc4 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 b51933a1fc7854945e0e73b4efe69f7f791e2473 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 15c98d63155ea37dd39cc0c4bfd66ce7eead5b5e 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-commons-logging.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index ba52d78..caaff1e 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -14,7 +14,7 @@ Source0: https://www.apache.org/dist/commons/logging/source/commons-loggi %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.logging.log4j:log4j-1.2-api) From 61e2f21283ab6468c25d50392bbb21be7af3499a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 16 Jul 2025 21:00:17 +0200 Subject: [PATCH 5/9] Update to upstream version 1.3.5 --- .gitignore | 1 + apache-commons-logging.spec | 3 +-- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 21564a1..80385b6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ commons-logging-1.1.1-src.tar.gz /commons-logging-1.2-src.tar.gz /commons-logging-1.3.0-src.tar.gz /commons-logging-1.3.4-src.tar.gz +/commons-logging-1.3.5-src.tar.gz diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index caaff1e..9fbc325 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-commons-logging -Version: 1.3.4 +Version: 1.3.5 Release: %autorelease Summary: Apache Commons Logging License: Apache-2.0 @@ -53,7 +53,6 @@ rm src/test/java/org/apache/commons/logging/pathable/{Parent,Child}FirstTestCase # Avoid hard-coded versions in OSGi metadata %pom_xpath_set "pom:properties/pom:commons.osgi.import" '*;resolution:=optional' -%pom_remove_plugin :cobertura-maven-plugin %pom_remove_plugin :maven-scm-publish-plugin sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt diff --git a/sources b/sources index 2bb5c0a..ab4f76c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-logging-1.3.4-src.tar.gz) = a4049d8d7ea0d97f337e169fa5f572e32be1882e07102ab004d8b2de74170cb075a251ee9603590d6e10bee5933651e8e33e108a734fc100e8b2d5acd669cb44 +SHA512 (commons-logging-1.3.5-src.tar.gz) = 07463385a3d997413fd7cb996d7266d0325e0829d88ee1d844ee13cdee702da5ec5817ccdd2b4bbccc3c9f6defd0f08f0397e6218bbd658b3e8336e9f146c0c3 From cef02c5ee91c8114a1757c316483fc61d7e24b99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:06:10 +0000 Subject: [PATCH 6/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 757a901f64387ec0cce95ed6e9c51789850a7ad2 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:06:34 +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 d469b3fe0513e86f80423652f8a288ef7b0ec0a3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 9 Sep 2025 12:18:13 +0200 Subject: [PATCH 8/9] Remove build-dependency on maven-enforcer-plugin --- apache-commons-logging.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 9fbc325..c0736f1 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -21,7 +21,6 @@ BuildRequires: mvn(org.apache.logging.log4j:log4j-1.2-api) BuildRequires: mvn(org.apache.logging.log4j:log4j-api) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.moditect:moditect-maven-plugin) BuildRequires: mvn(org.slf4j:slf4j-api) @@ -54,6 +53,7 @@ rm src/test/java/org/apache/commons/logging/pathable/{Parent,Child}FirstTestCase %pom_xpath_set "pom:properties/pom:commons.osgi.import" '*;resolution:=optional' %pom_remove_plugin :maven-scm-publish-plugin +%pom_remove_plugin :maven-enforcer-plugin sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt From 5c69d5b65ddf41d95de194eabc3a8f907132e5e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:47:24 +0000 Subject: [PATCH 9/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild