From 352353d99014cd3bacaa146351e070e9d0a0dfb2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 01/62] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 87aa2f2..bff5513 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ce977548f1cbf46918e93cd38ac35163 commons-logging-1.2-src.tar.gz +SHA512 (commons-logging-1.2-src.tar.gz) = 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 From 8624c6012dc5a5089ecd751d0212d6bc2ffc3bc5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 02/62] Expand conditionals --- apache-commons-logging.spec | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index ba6d806..923e809 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,4 +1,3 @@ -%bcond_without avalon Name: apache-commons-logging Version: 1.2 @@ -15,11 +14,6 @@ Patch0: 0001-Generate-different-Bundle-SymbolicName-for-different.patch Patch1: 0002-Port-to-maven-jar-plugin-3.0.0.patch BuildRequires: maven-local -%if %{with avalon} -BuildRequires: mvn(avalon-framework:avalon-framework-api) -BuildRequires: mvn(avalon-framework:avalon-framework-impl) -BuildRequires: mvn(logkit:logkit) -%endif BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(junit:junit) BuildRequires: mvn(log4j:log4j:12) @@ -44,20 +38,11 @@ logging implementation. %prep %autosetup -p1 -n commons-logging-%{version}-src -%if %{with avalon} -# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143 -%pom_remove_dep :avalon-framework -%pom_add_dep avalon-framework:avalon-framework-api:4.3:provided -%pom_add_dep avalon-framework:avalon-framework-impl:4.3:test -%pom_xpath_inject "pom:dependency[pom:artifactId='logkit']" 'provided' - -%else %pom_remove_dep -r :avalon-framework %pom_remove_dep -r :logkit rm -r src/test/java/org/apache/commons/logging/{avalon,logkit} rm src/main/java/org/apache/commons/logging/impl/AvalonLogger.java rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java -%endif %pom_remove_plugin :cobertura-maven-plugin %pom_remove_plugin :maven-scm-publish-plugin From 992bb4da73e98343e46ce61ccb72c18444a862f6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:19 +0200 Subject: [PATCH 03/62] Mass rebuild for javapackages-tools 201901 --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 923e809..b69ff59 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,7 +1,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -71,6 +71,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.2-14 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 07 2018 Fedora Release Engineering - 1.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 34484bce138438094253056a66db8eabdcd7f870 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 25 Jun 2019 08:55:04 +0200 Subject: [PATCH 04/62] Declare module package --- apache-commons-logging.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index b69ff59..04d6694 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -33,6 +33,7 @@ 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. +%{?module_package} %{?javadoc_package} %prep @@ -66,7 +67,7 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %install %mvn_install -%files -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %license LICENSE.txt NOTICE.txt %doc PROPOSAL.html RELEASE-NOTES.txt From cbf5506a660c45caa326c752a22d9a1d993a92a8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 25 Jun 2019 09:18:37 +0200 Subject: [PATCH 05/62] Use standard artifact installation location --- apache-commons-logging.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 04d6694..b516083 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -51,7 +51,6 @@ rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt # for compatibility reasons -%mvn_file ":commons-logging{*}" "commons-logging@1" "%{name}@1" %mvn_alias ":commons-logging{*}" "org.apache.commons:commons-logging@1" "apache:commons-logging@1" # Remove log4j12 tests From 62f253f88b3a8a2ccbb9e50f73b151d28b8d2f1c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 27 Jun 2019 14:37:18 +0200 Subject: [PATCH 06/62] Revert "Use standard artifact installation location" This reverts commit cbf5506a660c45caa326c752a22d9a1d993a92a8. --- apache-commons-logging.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index b516083..04d6694 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -51,6 +51,7 @@ rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt # for compatibility reasons +%mvn_file ":commons-logging{*}" "commons-logging@1" "%{name}@1" %mvn_alias ":commons-logging{*}" "org.apache.commons:commons-logging@1" "apache:commons-logging@1" # Remove log4j12 tests From 7a9b0d92d9ebf78b92c3441f45589d4b40813004 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:06:31 +0000 Subject: [PATCH 07/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 1206da5..cbf8d7c 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -86,6 +86,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.2-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 74c60dd2c825d7f760e798d15d44cb8b0cf037f4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Oct 2019 18:58:15 +0200 Subject: [PATCH 08/62] Set compiler source/target to 1.6 --- apache-commons-logging.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 04d6694..965d6f5 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,4 +1,3 @@ - Name: apache-commons-logging Version: 1.2 Release: 14%{?dist} @@ -58,7 +57,7 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %build -%mvn_build +%mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 # The build produces more artifacts from one pom %mvn_artifact %{SOURCE2} target/commons-logging-%{version}-api.jar From c6e4fa7c02abf337b0766f26776877e5cad52f7c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 09/62] Mass rebuild for javapackages-tools 201902 --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 965d6f5..aa774a4 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,6 +1,6 @@ Name: apache-commons-logging Version: 1.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -71,6 +71,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.2-15 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 1.2-14 - Mass rebuild for javapackages-tools 201901 From 1ce7cf922e6e3bf36c7f3bea1656a1d56f494527 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 9 Nov 2019 17:03:43 +0100 Subject: [PATCH 10/62] disable avalon by default --- apache-commons-logging.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index cbf8d7c..ec48f8e 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,8 +1,8 @@ -%bcond_without avalon +%bcond_with avalon Name: apache-commons-logging Version: 1.2 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -86,6 +86,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Sat Nov 09 2019 Fabio Valentini - 1.2-19 +- Disable avalon support by default. + * Wed Jul 24 2019 Fedora Release Engineering - 1.2-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 6ef61a55339d3081a86f601f7fb6ed760065e8f7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 11 Dec 2019 09:38:22 +0100 Subject: [PATCH 11/62] Fix OSGi bundle symbolic name --- 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 aa774a4..75dca52 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -57,7 +57,7 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %build -%mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 +%mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 -Dcommons.osgi.symbolicName=org.apache.commons.logging # The build produces more artifacts from one pom %mvn_artifact %{SOURCE2} target/commons-logging-%{version}-api.jar From d7a9de58523a1bf668e8eb367cd69522dcb3d3b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:46:10 +0000 Subject: [PATCH 12/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index ec48f8e..a498471 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -86,6 +86,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Nov 09 2019 Fabio Valentini - 1.2-19 - Disable avalon support by default. From 56be9d095f55f130e8fdafeb82bfa8fc476f5e30 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 15 May 2020 08:10:14 +0200 Subject: [PATCH 13/62] Disable Log4j bindings --- apache-commons-logging.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 75dca52..8f12ce5 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -15,7 +15,6 @@ Patch1: 0002-Port-to-maven-jar-plugin-3.0.0.patch BuildRequires: maven-local BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(junit:junit) -BuildRequires: mvn(log4j:log4j:12) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) @@ -40,9 +39,13 @@ logging implementation. %pom_remove_dep -r :avalon-framework %pom_remove_dep -r :logkit -rm -r src/test/java/org/apache/commons/logging/{avalon,logkit} +%pom_remove_dep -r :log4j rm src/main/java/org/apache/commons/logging/impl/AvalonLogger.java +rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java +rm -r src/test/java/org/apache/commons/logging/{avalon,log4j,logkit} +rm src/test/java/org/apache/commons/logging/pathable/{Parent,Child}FirstTestCase.java + %pom_remove_plugin :cobertura-maven-plugin %pom_remove_plugin :maven-scm-publish-plugin From bb121e3fb4f3e942980a6d591fa2166b6daa53a3 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 4 Jun 2020 14:01:49 +0200 Subject: [PATCH 14/62] override javac source and target versions to fix builds with Java 11 --- apache-commons-logging.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index a498471..4134b62 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -72,7 +72,7 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %build -%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.logging +%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.logging -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 # The build produces more artifacts from one pom %mvn_artifact %{SOURCE2} target/commons-logging-%{version}-api.jar @@ -86,6 +86,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Thu Jun 04 2020 Fabio Valentini - 1.2-21 +- Override javac source and target versions to fix builds with Java 11. + * Tue Jan 28 2020 Fedora Release Engineering - 1.2-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 1a6da73932a05a8e29a100510fd17294fc3d4220 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 15:41:59 +0200 Subject: [PATCH 15/62] Rebuilt for JDK-11 --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 4134b62..c90fc59 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -86,6 +86,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Fri Jul 10 2020 Jiri Vanek - 1.2-22 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Thu Jun 04 2020 Fabio Valentini - 1.2-21 - Override javac source and target versions to fix builds with Java 11. From b8d64490f5720b008d78a2c764a9c23349618eb3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:11:28 +0000 Subject: [PATCH 16/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index c90fc59..d82ea78 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -86,6 +86,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jiri Vanek - 1.2-22 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 0f441ea6e285a954f0c4f5ac28765580b59544de Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 10 Sep 2020 14:16:23 +0100 Subject: [PATCH 17/62] Build against log4j 2 --- apache-commons-logging.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index d82ea78..040d2c3 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -22,7 +22,7 @@ BuildRequires: mvn(logkit:logkit) %endif BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(junit:junit) -BuildRequires: mvn(log4j:log4j:12) +BuildRequires: mvn(org.apache.logging.log4j:log4j-1.2-api) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) @@ -59,6 +59,12 @@ rm src/main/java/org/apache/commons/logging/impl/AvalonLogger.java rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java %endif +# Switch to log4j 2.x API +%pom_change_dep log4j:log4j org.apache.logging.log4j:log4j-1.2-api + +# 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 @@ -86,6 +92,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Thu Sep 10 2020 Mat Booth - 1.2-24 +- Build against log4j 2 + * Mon Jul 27 2020 Fedora Release Engineering - 1.2-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 3d867f7986116bca8cce3ea58a6fd5a7dbbd3ea1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:15:04 +0000 Subject: [PATCH 18/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 040d2c3..36c355d 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -92,6 +92,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Sep 10 2020 Mat Booth - 1.2-24 - Build against log4j 2 From 83869c8dab391dfb1c0c7fc1d701234d7ea6f5ad Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 19/62] Conditionalize buildrequires in bootstrap mode --- apache-commons-logging.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 8f12ce5..e7e0434 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: apache-commons-logging Version: 1.2 Release: 15%{?dist} @@ -13,12 +15,16 @@ Patch0: 0001-Generate-different-Bundle-SymbolicName-for-different.patch Patch1: 0002-Port-to-maven-jar-plugin-3.0.0.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +%endif %description The commons-logging package provides a simple, component oriented From 039ad0eb84bdab89585d1e22a3c87970babadf32 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 20/62] Turn off bootstrap mode by default --- 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 372c481..d36358c 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-commons-logging Version: 1.2 From e01963f6327a432d3c5317483f6b56de679ddc56 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:49:30 +0200 Subject: [PATCH 21/62] Bootstrap build --- apache-commons-logging.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index d36358c..754ffbf 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,8 +1,8 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: apache-commons-logging Version: 1.2 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -82,6 +82,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Mon May 17 2021 Mikolaj Izdebski - 1.2-26 +- Bootstrap build + * Tue Jan 26 2021 Fedora Release Engineering - 1.2-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 4a6b625a97e74694fa03accf51d9e9956cdbb8d7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:41 +0200 Subject: [PATCH 22/62] Non-bootstrap build --- apache-commons-logging.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 754ffbf..3dc6a6d 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-commons-logging Version: 1.2 @@ -84,6 +84,7 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %changelog * Mon May 17 2021 Mikolaj Izdebski - 1.2-26 - Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 1.2-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From ec04474dd63e64417058482e2bc973dccf9fa80f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:47:25 +0000 Subject: [PATCH 23/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 62a5282d06032ace464cacf0af389dc212e46e1b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:43:24 +0000 Subject: [PATCH 24/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 3dc6a6d..b5ae601 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -82,6 +82,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Mikolaj Izdebski - 1.2-26 - Bootstrap build - Non-bootstrap build From 31319d0025196da9344dd7dba124491b88c2bd6c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Nov 2021 15:58:40 +0100 Subject: [PATCH 25/62] Bump Java compiler source/target levels to 1.7 --- apache-commons-logging.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index b5ae601..e96563b 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -68,7 +68,7 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %build -%mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 -Dcommons.osgi.symbolicName=org.apache.commons.logging +%mvn_build -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 -Dcommons.osgi.symbolicName=org.apache.commons.logging # The build produces more artifacts from one pom %mvn_artifact %{SOURCE2} target/commons-logging-%{version}-api.jar @@ -82,6 +82,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Tue Nov 02 2021 Mikolaj Izdebski - 1.2-28 +- Bump Java compiler source/target levels to 1.7 + * Wed Jul 21 2021 Fedora Release Engineering - 1.2-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From a508f58f39e296e9337d0d4055b8b101b616da56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:25:25 +0000 Subject: [PATCH 26/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index e96563b..8cd732c 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -82,6 +82,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.2-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Nov 02 2021 Mikolaj Izdebski - 1.2-28 - Bump Java compiler source/target levels to 1.7 From e05f2c0c8c1131d2e22b0947e9afc754e08571ae Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 19:28:16 +0100 Subject: [PATCH 27/62] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 8cd732c..b5ed255 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -82,6 +82,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Sat Feb 05 2022 Jiri Vanek - 1.2-30 +- Rebuilt for java-17-openjdk as system jdk + * Wed Jan 19 2022 Fedora Release Engineering - 1.2-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 89b9dbc56c67a5aab13ecc405d76724c6c7b830a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 28/62] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- apache-commons-logging.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index b5ed255..7ba48b8 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -7,6 +7,7 @@ Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: http://www.apache.org/dist/commons/logging/source/commons-logging-%{version}-src.tar.gz Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom From 0ccac27e511e14fdc847ce7796e7a42d04e2f053 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 29/62] Update build-requires in bootstrap mode --- 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 7ba48b8..4b3716c 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -15,10 +15,10 @@ Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/commons-logging/co Patch0: 0001-Generate-different-Bundle-SymbolicName-for-different.patch Patch1: 0002-Port-to-maven-jar-plugin-3.0.0.patch -BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) From 02e0c18db17030d1e8c7e41fc2d5e333592cb66e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:00:17 +0000 Subject: [PATCH 30/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 4b3716c..79b11f1 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -83,6 +83,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.2-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 05 2022 Jiri Vanek - 1.2-30 - Rebuilt for java-17-openjdk as system jdk From 5c06dbf6a4d011d07f9cafb3830f963d55f9cbb2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 31/62] 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 b3577858647e8728ca6a30754af6e539803c62c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:54:55 +0000 Subject: [PATCH 32/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 79b11f1..6db9466 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -83,6 +83,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.2-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1.2-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From f31de6bb82178bf612485ddca1bc72ca551e6932 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:29:33 +0000 Subject: [PATCH 33/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 6db9466..617af71 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/logging @@ -83,6 +83,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 1.2-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 8c2a5b8e5a18c025833b6bcff57c0c832817873e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 19 Jul 2023 15:38:22 -0600 Subject: [PATCH 34/62] Update the project URL --- apache-commons-logging.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 617af71..e1046a2 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,10 +2,10 @@ Name: apache-commons-logging Version: 1.2 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Apache Commons Logging License: ASL 2.0 -URL: http://commons.apache.org/logging +URL: https://commons.apache.org/proper/commons-logging/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -83,6 +83,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Wed Jul 19 2023 Jerry James - 1.2-34 +- Update the project URL + * Wed Jul 19 2023 Fedora Release Engineering - 1.2-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 96ac51e51a36c0377cf4cbb20788652fc98475e0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 19 Jul 2023 15:39:45 -0600 Subject: [PATCH 35/62] Convert the License tag to SPDX --- apache-commons-logging.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index e1046a2..c407f23 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-commons-logging Version: 1.2 Release: 34%{?dist} Summary: Apache Commons Logging -License: ASL 2.0 +License: Apache-2.0 URL: https://commons.apache.org/proper/commons-logging/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -84,6 +84,7 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %changelog * Wed Jul 19 2023 Jerry James - 1.2-34 +- Convert the License tag to SPDX - Update the project URL * Wed Jul 19 2023 Fedora Release Engineering - 1.2-33 From c50c7005665ebbb96eb2784d69f49f14b6563c38 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 19 Jul 2023 15:41:06 -0600 Subject: [PATCH 36/62] Build with log4j support in non-bootstrap mode --- apache-commons-logging.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index c407f23..c075c91 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -21,6 +21,7 @@ BuildRequires: javapackages-bootstrap BuildRequires: maven-local BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(junit:junit) +BuildRequires: mvn(log4j:log4j) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) @@ -45,13 +46,16 @@ logging implementation. %pom_remove_dep -r :avalon-framework %pom_remove_dep -r :logkit -%pom_remove_dep -r :log4j rm src/main/java/org/apache/commons/logging/impl/AvalonLogger.java -rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java -rm -r src/test/java/org/apache/commons/logging/{avalon,log4j,logkit} +rm -r src/test/java/org/apache/commons/logging/{avalon,logkit} rm src/test/java/org/apache/commons/logging/pathable/{Parent,Child}FirstTestCase.java +%if %{with bootstrap} +%pom_remove_dep -r :log4j +rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java +rm -r src/test/java/org/apache/commons/logging/log4j +%endif # Avoid hard-coded versions in OSGi metadata %pom_xpath_set "pom:properties/pom:commons.osgi.import" '*;resolution:=optional' @@ -84,6 +88,7 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %changelog * Wed Jul 19 2023 Jerry James - 1.2-34 +- Build with log4j support in non-bootstrap mode - Convert the License tag to SPDX - Update the project URL From 7c781b9b93668553023838bf9a10a6c1eeec3d5b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 10 Aug 2023 13:21:59 +0200 Subject: [PATCH 37/62] Enable Log4j in bootstrap mode --- apache-commons-logging.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index c075c91..0bd5afd 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -51,12 +51,6 @@ rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java rm -r src/test/java/org/apache/commons/logging/{avalon,logkit} rm src/test/java/org/apache/commons/logging/pathable/{Parent,Child}FirstTestCase.java -%if %{with bootstrap} -%pom_remove_dep -r :log4j -rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java -rm -r src/test/java/org/apache/commons/logging/log4j -%endif - # Avoid hard-coded versions in OSGi metadata %pom_xpath_set "pom:properties/pom:commons.osgi.import" '*;resolution:=optional' From 41df3347fa8de24edadc3b62ae0b26b494285c36 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 15:58:22 +0200 Subject: [PATCH 38/62] Rebuild --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 0bd5afd..7c8a525 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Apache Commons Logging License: Apache-2.0 URL: https://commons.apache.org/proper/commons-logging/ @@ -81,6 +81,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 1.2-35 +- Rebuild + * Wed Jul 19 2023 Jerry James - 1.2-34 - Build with log4j support in non-bootstrap mode - Convert the License tag to SPDX From c427bc3ff7336d32f7b535643728c5b3341e29e7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 4 Dec 2023 20:30:25 +0100 Subject: [PATCH 39/62] Update to upstream version 1.3.0 --- .gitignore | 1 + ...nt-Bundle-SymbolicName-for-different.patch | 99 ----------- 0002-Port-to-maven-jar-plugin-3.0.0.patch | 160 ------------------ apache-commons-logging.spec | 31 ++-- sources | 2 +- 5 files changed, 19 insertions(+), 274 deletions(-) delete mode 100644 0001-Generate-different-Bundle-SymbolicName-for-different.patch delete mode 100644 0002-Port-to-maven-jar-plugin-3.0.0.patch diff --git a/.gitignore b/.gitignore index ac92f7c..2e495bf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ commons-logging-1.1.1-src.tar.gz /commons-logging-1.1.2-src.tar.gz /commons-logging-1.1.3-src.tar.gz /commons-logging-1.2-src.tar.gz +/commons-logging-1.3.0-src.tar.gz diff --git a/0001-Generate-different-Bundle-SymbolicName-for-different.patch b/0001-Generate-different-Bundle-SymbolicName-for-different.patch deleted file mode 100644 index a8c0ddc..0000000 --- a/0001-Generate-different-Bundle-SymbolicName-for-different.patch +++ /dev/null @@ -1,99 +0,0 @@ -From d71aa7acc93b944b159ac63f85d9ba1a566f5a8d Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Tue, 29 Jul 2014 09:00:03 +0200 -Subject: [PATCH 1/2] Generate different Bundle-SymbolicName for different JARs - ---- - pom.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 55 insertions(+) - -diff --git a/pom.xml b/pom.xml -index cdad31c..5707595 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -179,6 +179,52 @@ under the License. - - - -+ -+ org.apache.felix -+ maven-bundle-plugin -+ -+ -+ tests-bundle-manifest -+ process-classes -+ -+ manifest -+ -+ -+ ${project.build.directory}/osgi-tests -+ -+ ${commons.osgi.symbolicName}.tests -+ -+ -+ -+ -+ api-bundle-manifest -+ process-classes -+ -+ manifest -+ -+ -+ ${project.build.directory}/osgi-api -+ -+ ${commons.osgi.symbolicName}.api -+ -+ -+ -+ -+ adapters-bundle-manifest -+ process-classes -+ -+ manifest -+ -+ -+ ${project.build.directory}/osgi-adapters -+ -+ ${commons.osgi.symbolicName}.adapters -+ -+ -+ -+ -+ -+ - -- org.codehaus.mojo -- build-helper-maven-plugin -- 1.0 -- -- -- attach-artifacts -- package -- -- attach-artifact -- -- -- -- -- ${project.build.directory}/${project.artifactId}-adapters-${project.version}.jar -- jar -- adapters -- -- -- ${project.build.directory}/${project.artifactId}-api-${project.version}.jar -- jar -- api -- -- -- -- -- -- -- -- --