From a8faeedbd5e3e5b654f2c981beca747b99f58fe1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:20:21 +0000 Subject: [PATCH 01/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 ba6d806..e6b5678 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,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 @@ -86,6 +86,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 9772d437e19a7598b7a18995c8108b51dc9ccc07 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 17 Dec 2018 16:43:11 +0000 Subject: [PATCH 02/57] Rebuild to regenerate requires, fixes rhbz#1660117 --- 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 e6b5678..e3df378 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ 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 @@ -86,6 +86,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Mon Dec 17 2018 Mat Booth - 1.2-15 +- Rebuild to regenerate requires, fixes rhbz#1660117 + * Thu Jul 12 2018 Fedora Release Engineering - 1.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 521734ee1cacb39a421354698960933addba17d0 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 18 Dec 2018 09:56:36 +0000 Subject: [PATCH 03/57] Fix OSGi metadata --- 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 e3df378..8017e91 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 15%{?dist} +Release: 16%{?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 +%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.logging # 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 +* Tue Dec 18 2018 Mat Booth - 1.2-16 +- Fix OSGi metadata + * Mon Dec 17 2018 Mat Booth - 1.2-15 - Rebuild to regenerate requires, fixes rhbz#1660117 From 8e9f1fe663efe44139f6f7e1639d7d5e368189dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:29:35 +0000 Subject: [PATCH 04/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 8017e91..1206da5 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -2,7 +2,7 @@ Name: apache-commons-logging Version: 1.2 -Release: 16%{?dist} +Release: 17%{?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 +* Thu Jan 31 2019 Fedora Release Engineering - 1.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Dec 18 2018 Mat Booth - 1.2-16 - Fix OSGi metadata From 7a9b0d92d9ebf78b92c3441f45589d4b40813004 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:06:31 +0000 Subject: [PATCH 05/57] - 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 1ce7cf922e6e3bf36c7f3bea1656a1d56f494527 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 9 Nov 2019 17:03:43 +0100 Subject: [PATCH 06/57] 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 d7a9de58523a1bf668e8eb367cd69522dcb3d3b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:46:10 +0000 Subject: [PATCH 07/57] - 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 bb121e3fb4f3e942980a6d591fa2166b6daa53a3 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 4 Jun 2020 14:01:49 +0200 Subject: [PATCH 08/57] 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 09/57] 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 10/57] - 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 11/57] 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 12/57] - 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 13/57] 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 14/57] 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 15/57] 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 16/57] 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 17/57] - 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 18/57] - 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 19/57] 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 79cb248405d1f5b08a19278c9ce65ee4c8dbd49b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 7 Jan 2022 09:53:14 +0100 Subject: [PATCH 20/57] Module javapackages-tools stream 202001 was retired --- .gitignore | 4 - ...nt-Bundle-SymbolicName-for-different.patch | 99 ------- 0002-Port-to-maven-jar-plugin-3.0.0.patch | 160 ----------- apache-commons-logging.spec | 256 ------------------ commons-logging-api-1.1.pom | 165 ----------- dead.package | 1 + sources | 1 - 7 files changed, 1 insertion(+), 685 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-Generate-different-Bundle-SymbolicName-for-different.patch delete mode 100644 0002-Port-to-maven-jar-plugin-3.0.0.patch delete mode 100644 apache-commons-logging.spec delete mode 100644 commons-logging-api-1.1.pom create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ac92f7c..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -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 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 -- -- -- -- -- -- -- -- -- -- 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 -- -- -- -- -- -- -- -- --