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/65] - 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/65] 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/65] 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/65] - 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 992bb4da73e98343e46ce61ccb72c18444a862f6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:19 +0200 Subject: [PATCH 05/65] 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 06/65] 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 07/65] 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 08/65] 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 602f0ca71aea41d71e43d9f07b54e12979175e18 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 1 Jul 2019 16:16:18 +0200 Subject: [PATCH 09/65] Retire stream-maven-3.6 branch --- .gitignore | 4 - ...nt-Bundle-SymbolicName-for-different.patch | 99 ------- 0002-Port-to-maven-jar-plugin-3.0.0.patch | 160 ------------ apache-commons-logging.spec | 247 ------------------ commons-logging-api-1.1.pom | 165 ------------ dead.package | 1 + sources | 1 - 7 files changed, 1 insertion(+), 676 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 -- -- -- -- -- -- -- -- --