From 352353d99014cd3bacaa146351e070e9d0a0dfb2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 01/11] 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/11] 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/11] 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/11] 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/11] 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/11] 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 74c60dd2c825d7f760e798d15d44cb8b0cf037f4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Oct 2019 18:58:15 +0200 Subject: [PATCH 07/11] 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 08/11] 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 6ef61a55339d3081a86f601f7fb6ed760065e8f7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 11 Dec 2019 09:38:22 +0100 Subject: [PATCH 09/11] 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 56be9d095f55f130e8fdafeb82bfa8fc476f5e30 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 15 May 2020 08:10:14 +0200 Subject: [PATCH 10/11] 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 83869c8dab391dfb1c0c7fc1d701234d7ea6f5ad Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 11/11] 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