From e6f0c5a53bfd370dbea15ac3e1ceb97a76c8df26 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Thu, 21 Apr 2011 14:07:33 +0200
Subject: [PATCH 001/104] Build with maven 3

- Fix build for avalon-framework
---
 apache-commons-logging.spec         | 30 ++++++++++++-------
 commons-logging-avalon-update.patch | 29 ++++++++++++++++++
 commons-logging.depmap              | 46 ++++++++++++++---------------
 3 files changed, 70 insertions(+), 35 deletions(-)
 create mode 100644 commons-logging-avalon-update.patch

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index e126282..d9c8baa 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.1
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -12,15 +12,19 @@ URL:            http://commons.apache.org/%{base_name}
 Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 Source1:        %{short_name}.depmap
 Source2:        http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
+# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
+Patch0:         %{short_name}-avalon-update.patch
+
 Patch1:         %{short_name}-eclipse-manifest.patch
-Patch0:         %{short_name}-maven-release-plugin.patch
 BuildArch:      noarch
+BuildRequires:  maven
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  avalon-framework
+BuildRequires:  avalon-framework >= 4.3
 BuildRequires:  avalon-logkit
 BuildRequires:  apache-commons-parent
 BuildRequires:  maven-plugin-build-helper
+BuildRequires:  maven-release-plugin
 BuildRequires:  maven-site-plugin
 BuildRequires:  servlet25
 
@@ -59,7 +63,7 @@ Obsoletes:      jakarta-%{short_name}-javadoc <= 0:1.0.4
 %prep
 %setup -q -n %{short_name}-%{version}-src
 
-%patch0 -p1 -b .rhbug_588142
+%patch0 -p1
 %patch1
 
 sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
@@ -67,16 +71,16 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
 # -----------------------------------------------------------------------------
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
 # fails with recent surefire for some reason
 rm src/test/org/apache/commons/logging/logkit/StandardTestCase.java
 rm src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java
 
-mvn-jpp -e -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
-    -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-    install javadoc:javadoc
+# These files have names suggesting they are test cases but they are not.
+# They should probably be renamed/excluded from surefire run properly
+rm src/test/org/apache/commons/logging/log4j/log4j12/*StandardTestCase.java
+
+mvn-rpmbuild -X -Dmaven.local.depmap.file="%{SOURCE1}" \
+    install javadoc:aggregate
 
 # -----------------------------------------------------------------------------
 
@@ -91,7 +95,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}
 for jar in %{name}*; do
     ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
 done
-popd 
+popd
 
 # pom
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
@@ -145,6 +149,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Apr 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-16
+- Build with maven 3
+- Fix build for avalon-framework
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/commons-logging-avalon-update.patch b/commons-logging-avalon-update.patch
new file mode 100644
index 0000000..aadaaa7
--- /dev/null
+++ b/commons-logging-avalon-update.patch
@@ -0,0 +1,29 @@
+diff --git a/pom.xml b/pom.xml
+index 8efaf6d..24dc9fb 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -472,8 +472,15 @@ under the License.
+     </dependency>
+     <dependency>
+       <groupId>avalon-framework</groupId>
+-      <artifactId>avalon-framework</artifactId>
+-      <version>4.1.3</version>
++      <artifactId>avalon-framework-api</artifactId>
++      <version>4.3</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>avalon-framework</groupId>
++      <artifactId>avalon-framework-impl</artifactId>
++      <version>4.3</version>
++      <scope>test</scope>
+       <optional>true</optional>
+     </dependency>
+     <dependency>
+@@ -520,4 +527,4 @@ under the License.
+     <maven.compile.source>1.2</maven.compile.source>
+     <maven.compile.target>1.1</maven.compile.target>
+   </properties>
+-</project>
+\ No newline at end of file
++</project>
diff --git a/commons-logging.depmap b/commons-logging.depmap
index 24c689a..1059072 100644
--- a/commons-logging.depmap
+++ b/commons-logging.depmap
@@ -1,28 +1,4 @@
 <dependencies>
-    <dependency>
-      <maven>
-        <groupId>logkit</groupId>
-        <artifactId>logkit</artifactId>
-        <version>1.0.1</version>
-      </maven>
-      <jpp>
-        <groupId>JPP</groupId>
-        <artifactId>avalon-logkit</artifactId>
-        <version>1.0.8</version>
-      </jpp>
-    </dependency>
-    <dependency>
-      <maven>
-        <groupId>avalon-framework</groupId>
-        <artifactId>avalon-framework</artifactId>
-        <version>4.1.3</version>
-      </maven>
-      <jpp>
-        <groupId>JPP</groupId>
-        <artifactId>avalon-framework</artifactId>
-        <version>4.1.4</version>
-      </jpp>
-    </dependency>
     <dependency>
       <maven>
         <groupId>javax.servlet</groupId>
@@ -33,4 +9,26 @@
         <artifactId>tomcat6-servlet-2.5-api</artifactId>
       </jpp>
     </dependency>
+    <dependency>
+      <maven>
+        <groupId>servletapi</groupId>
+        <artifactId>servletapi</artifactId>
+      </maven>
+      <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>tomcat6-servlet-2.5-api</artifactId>
+      </jpp>
+    </dependency>
+    <dependency>
+      <maven>
+        <groupId>geronimo-spec</groupId>
+        <artifactId>geronimo-spec-javamail</artifactId>
+      </maven>
+    </dependency>
+    <dependency>
+      <maven>
+        <groupId>geronimo-spec</groupId>
+        <artifactId>geronimo-spec-jms</artifactId>
+      </maven>
+    </dependency>
 </dependencies>

From 8474551cd6ddcb2117f94293b9cf7a819fe3ed9f Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 12 Jan 2012 15:36:11 -0600
Subject: [PATCH 002/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_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 d9c8baa..4e8b467 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.1
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -149,6 +149,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Thu Apr 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-16
 - Build with maven 3
 - Fix build for avalon-framework

From 7e7d17b790b3fff02248061592cad66c278dd9b8 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 30 Apr 2012 17:30:00 +0300
Subject: [PATCH 003/104]  Fix build with latest libs.

- Adapt to current guidelines.
---
 apache-commons-logging.spec                | 33 +++++-----------------
 commons-logging-maven-release-plugin.patch | 33 ----------------------
 commons-logging.depmap                     | 28 ++----------------
 3 files changed, 10 insertions(+), 84 deletions(-)
 delete mode 100644 commons-logging-maven-release-plugin.patch

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 4e8b467..4300cd6 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.1
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -26,16 +26,10 @@ BuildRequires:  apache-commons-parent
 BuildRequires:  maven-plugin-build-helper
 BuildRequires:  maven-release-plugin
 BuildRequires:  maven-site-plugin
-BuildRequires:  servlet25
+BuildRequires:  servlet
 
 Requires:       java >= 1:1.6.0
 Requires:       jpackage-utils >= 0:1.6
-Requires(post): jpackage-utils
-Requires(postun):jpackage-utils
-
-# This should go away with F-17
-Provides:       jakarta-%{short_name} = 0:%{version}-%{release}
-Obsoletes:      jakarta-%{short_name} <= 0:1.0.4
 
 %description
 The commons-logging package provides a simple, component oriented
@@ -79,7 +73,7 @@ rm src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java
 # They should probably be renamed/excluded from surefire run properly
 rm src/test/org/apache/commons/logging/log4j/log4j12/*StandardTestCase.java
 
-mvn-rpmbuild -X -Dmaven.local.depmap.file="%{SOURCE1}" \
+mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" \
     install javadoc:aggregate
 
 # -----------------------------------------------------------------------------
@@ -117,23 +111,7 @@ install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}-api
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-# -----------------------------------------------------------------------------
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-
-# -----------------------------------------------------------------------------
-
 %files
-%defattr(-,root,root,-)
 %doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt
 %{_javadir}/*
 %{_mavenpomdir}/JPP-%{short_name}.pom
@@ -142,13 +120,16 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_javadocdir}/%{name}
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Apr 30 2012 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-18
+- Fix build with latest libs.
+- Adapt to current guidelines.
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/commons-logging-maven-release-plugin.patch b/commons-logging-maven-release-plugin.patch
deleted file mode 100644
index 835db1f..0000000
--- a/commons-logging-maven-release-plugin.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index 8efaf6d..4b3e8f9 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -308,21 +308,6 @@ under the License.
-       </plugin>
- 
-       <plugin>
--        <groupId>org.apache.maven.plugins</groupId>
--        <artifactId>maven-release-plugin</artifactId>
--        <version>2.0-beta-6</version>
--        <configuration>
--          <!--
--            - The site needs to be built prior to deploy,
--            - because it is included in the assembly.
--            -->
--          <goals>site deploy</goals>
--          <!-- Pass these arguments to the deploy plugin. -->
--          <arguments>-Prelease</arguments>
--        </configuration>
--      </plugin>
--
--      <plugin>
-         <!--
-           - Many of JCL's tests use tricky techniques to place the generated
-           - JCL jarfiles on the classpath in various configurations. This means
-@@ -520,4 +505,4 @@ under the License.
-     <maven.compile.source>1.2</maven.compile.source>
-     <maven.compile.target>1.1</maven.compile.target>
-   </properties>
--</project>
-\ No newline at end of file
-+</project>
diff --git a/commons-logging.depmap b/commons-logging.depmap
index 1059072..922cda5 100644
--- a/commons-logging.depmap
+++ b/commons-logging.depmap
@@ -1,34 +1,12 @@
 <dependencies>
     <dependency>
       <maven>
-        <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
+        <groupId>xerces</groupId>
+        <artifactId>xerces</artifactId>
       </maven>
       <jpp>
         <groupId>JPP</groupId>
-        <artifactId>tomcat6-servlet-2.5-api</artifactId>
+        <artifactId>xerces-j2</artifactId>
       </jpp>
     </dependency>
-    <dependency>
-      <maven>
-        <groupId>servletapi</groupId>
-        <artifactId>servletapi</artifactId>
-      </maven>
-      <jpp>
-        <groupId>JPP</groupId>
-        <artifactId>tomcat6-servlet-2.5-api</artifactId>
-      </jpp>
-    </dependency>
-    <dependency>
-      <maven>
-        <groupId>geronimo-spec</groupId>
-        <artifactId>geronimo-spec-javamail</artifactId>
-      </maven>
-    </dependency>
-    <dependency>
-      <maven>
-        <groupId>geronimo-spec</groupId>
-        <artifactId>geronimo-spec-jms</artifactId>
-      </maven>
-    </dependency>
 </dependencies>

From bd922d7396735f03bd9e3044c3516a904a8da8d7 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Tue, 1 May 2012 00:19:10 +0300
Subject: [PATCH 004/104] Bring back jakarta-commons-logging provides/obsoletes
 - the comment was misleading.

---
 apache-commons-logging.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 4300cd6..c09355a 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.1
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -31,6 +31,10 @@ BuildRequires:  servlet
 Requires:       java >= 1:1.6.0
 Requires:       jpackage-utils >= 0:1.6
 
+# This should go away with F-17
+Provides:       jakarta-%{short_name} = 0:%{version}-%{release}
+Obsoletes:      jakarta-%{short_name} <= 0:1.0.4
+
 %description
 The commons-logging package provides a simple, component oriented
 interface (org.apache.commons.logging.Log) together with wrappers for
@@ -126,6 +130,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue May 1 2012 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-19
+- Bring back jakarta-commons-logging provides/obsoletes - the comment was misleading.
+
 * Mon Apr 30 2012 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-18
 - Fix build with latest libs.
 - Adapt to current guidelines.

From 532a09b05f185c3a3825bdd0de53726bd5b1838a Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 18 Jul 2012 11:17:03 -0500
Subject: [PATCH 005/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_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 c09355a..955de34 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.1
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -130,6 +130,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Tue May 1 2012 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-19
 - Bring back jakarta-commons-logging provides/obsoletes - the comment was misleading.
 

From 016af291365afe3b2f308a3550839758b2613339 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 22 Nov 2012 21:31:35 +0100
Subject: [PATCH 006/104] Install NOTICE file

- Resolves: rhbz#879581
---
 apache-commons-logging.spec | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 955de34..f788396 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.1
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -64,7 +64,7 @@ Obsoletes:      jakarta-%{short_name}-javadoc <= 0:1.0.4
 %patch0 -p1
 %patch1
 
-sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
+sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
 
 # -----------------------------------------------------------------------------
 
@@ -116,7 +116,8 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
-%doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt
+%doc LICENSE.txt NOTICE.txt
+%doc PROPOSAL.html STATUS.html RELEASE-NOTES.txt
 %{_javadir}/*
 %{_mavenpomdir}/JPP-%{short_name}.pom
 %{_mavenpomdir}/JPP-%{short_name}-api.pom
@@ -124,12 +125,16 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %files javadoc
-%doc LICENSE.txt
+%doc LICENSE.txt NOTICE.txt
 %{_javadocdir}/%{name}
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Nov 22 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.1-21
+- Install NOTICE file
+- Resolves: rhbz#879581
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From 618917fc5e01085293528b9a1f28abe7c8e0028d Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Wed, 6 Feb 2013 19:32:04 +0100
Subject: [PATCH 007/104] - Update for
 https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild - Replace maven
 BuildRequires with maven-local

---
 apache-commons-logging.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index f788396..c45059b 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.1
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -17,7 +17,7 @@ Patch0:         %{short_name}-avalon-update.patch
 
 Patch1:         %{short_name}-eclipse-manifest.patch
 BuildArch:      noarch
-BuildRequires:  maven
+BuildRequires:  maven-local
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  avalon-framework >= 4.3
@@ -131,6 +131,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.1.1-22
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
 * Thu Nov 22 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.1-21
 - Install NOTICE file
 - Resolves: rhbz#879581

From a4b1e1e6d9b84a536af5221dd66e797cd1de6405 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 13 Feb 2013 10:46:35 -0600
Subject: [PATCH 008/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_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 c45059b..ef4dff5 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.1
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -131,6 +131,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.1.1-22
 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
 - Replace maven BuildRequires with maven-local

From be4c09ab802e220162c7e6f04d7b72d61b1a514b Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 8 Apr 2013 05:57:58 +0200
Subject: [PATCH 009/104] Update to upstream version 1.1.2

- Convert POM to POM macros
- Remove OSGi manifest patch; fixed upstream
---
 .gitignore                             |  1 +
 apache-commons-logging.spec            | 39 ++++++++++++--------------
 commons-logging-avalon-update.patch    | 29 -------------------
 commons-logging-eclipse-manifest.patch | 15 ----------
 commons-logging.depmap                 | 12 --------
 sources                                |  2 +-
 6 files changed, 20 insertions(+), 78 deletions(-)
 delete mode 100644 commons-logging-avalon-update.patch
 delete mode 100644 commons-logging-eclipse-manifest.patch
 delete mode 100644 commons-logging.depmap

diff --git a/.gitignore b/.gitignore
index 1fa6e5f..8ea02b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 commons-logging-1.1.1-src.tar.gz
+/commons-logging-1.1.2-src.tar.gz
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index ef4dff5..70577f1 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -3,19 +3,15 @@
 %global short_name commons-%{base_name}
 
 Name:           apache-%{short_name}
-Version:        1.1.1
-Release:        23%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
 URL:            http://commons.apache.org/%{base_name}
 Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-Source1:        %{short_name}.depmap
 Source2:        http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
-# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
-Patch0:         %{short_name}-avalon-update.patch
 
-Patch1:         %{short_name}-eclipse-manifest.patch
 BuildArch:      noarch
 BuildRequires:  maven-local
 BuildRequires:  java-devel >= 1:1.6.0
@@ -23,6 +19,8 @@ BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  avalon-framework >= 4.3
 BuildRequires:  avalon-logkit
 BuildRequires:  apache-commons-parent
+BuildRequires:  maven-dependency-plugin
+BuildRequires:  maven-failsafe-plugin
 BuildRequires:  maven-plugin-build-helper
 BuildRequires:  maven-release-plugin
 BuildRequires:  maven-site-plugin
@@ -61,24 +59,18 @@ Obsoletes:      jakarta-%{short_name}-javadoc <= 0:1.0.4
 %prep
 %setup -q -n %{short_name}-%{version}-src
 
-%patch0 -p1
-%patch1
+# 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
+%pom_add_dep avalon-framework:avalon-framework-impl:4.3:test
+
+%pom_remove_plugin :cobertura-maven-plugin
+%pom_remove_plugin :maven-scm-publish-plugin
 
 sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
 
-# -----------------------------------------------------------------------------
-
 %build
-# fails with recent surefire for some reason
-rm src/test/org/apache/commons/logging/logkit/StandardTestCase.java
-rm src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java
-
-# These files have names suggesting they are test cases but they are not.
-# They should probably be renamed/excluded from surefire run properly
-rm src/test/org/apache/commons/logging/log4j/log4j12/*StandardTestCase.java
-
-mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" \
-    install javadoc:aggregate
+mvn-rpmbuild install javadoc:aggregate
 
 # -----------------------------------------------------------------------------
 
@@ -117,7 +109,7 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
 %doc LICENSE.txt NOTICE.txt
-%doc PROPOSAL.html STATUS.html RELEASE-NOTES.txt
+%doc PROPOSAL.html RELEASE-NOTES.txt
 %{_javadir}/*
 %{_mavenpomdir}/JPP-%{short_name}.pom
 %{_mavenpomdir}/JPP-%{short_name}-api.pom
@@ -131,6 +123,11 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Apr  8 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-1
+- Update to upstream version 1.1.2
+- Convert POM to POM macros
+- Remove OSGi manifest patch; fixed upstream
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/commons-logging-avalon-update.patch b/commons-logging-avalon-update.patch
deleted file mode 100644
index aadaaa7..0000000
--- a/commons-logging-avalon-update.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index 8efaf6d..24dc9fb 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -472,8 +472,15 @@ under the License.
-     </dependency>
-     <dependency>
-       <groupId>avalon-framework</groupId>
--      <artifactId>avalon-framework</artifactId>
--      <version>4.1.3</version>
-+      <artifactId>avalon-framework-api</artifactId>
-+      <version>4.3</version>
-+      <optional>true</optional>
-+    </dependency>
-+    <dependency>
-+      <groupId>avalon-framework</groupId>
-+      <artifactId>avalon-framework-impl</artifactId>
-+      <version>4.3</version>
-+      <scope>test</scope>
-       <optional>true</optional>
-     </dependency>
-     <dependency>
-@@ -520,4 +527,4 @@ under the License.
-     <maven.compile.source>1.2</maven.compile.source>
-     <maven.compile.target>1.1</maven.compile.target>
-   </properties>
--</project>
-\ No newline at end of file
-+</project>
diff --git a/commons-logging-eclipse-manifest.patch b/commons-logging-eclipse-manifest.patch
deleted file mode 100644
index 38a39d2..0000000
--- a/commons-logging-eclipse-manifest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/conf/MANIFEST.MF.orig	2007-11-22 01:27:52.000000000 +0200
-+++ src/conf/MANIFEST.MF	2010-06-09 21:04:06.532857757 +0300
-@@ -6,3 +6,12 @@ Implementation-Title: Commons Logging
- Implementation-Vendor-Id: org.apache
- Implementation-Vendor: Apache Software Foundation
- Implementation-Version: 1.1.1
-+Bundle-ManifestVersion: 2
-+Export-Package: org.apache.commons.logging;version="1.1.1",org.apache.
-+ commons.logging.impl;version="1.1.1"
-+Bundle-Version: 1.1.1.v20080605-1930
-+Bundle-SymbolicName: org.apache.commons.logging
-+Bundle-Name: Apache Commons Logging Plug-in
-+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
-+Bundle-Localization: plugin
-+Bundle-Vendor: Apache Software Foundation
diff --git a/commons-logging.depmap b/commons-logging.depmap
deleted file mode 100644
index 922cda5..0000000
--- a/commons-logging.depmap
+++ /dev/null
@@ -1,12 +0,0 @@
-<dependencies>
-    <dependency>
-      <maven>
-        <groupId>xerces</groupId>
-        <artifactId>xerces</artifactId>
-      </maven>
-      <jpp>
-        <groupId>JPP</groupId>
-        <artifactId>xerces-j2</artifactId>
-      </jpp>
-    </dependency>
-</dependencies>
diff --git a/sources b/sources
index 315c692..513fce3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5cfa8cca13152d7545fde6b1783c60a  commons-logging-1.1.1-src.tar.gz
+8928a44ded8fb362974fa303900773d6  commons-logging-1.1.2-src.tar.gz

From e09d03d47666909d0bdc999be68e140ad658d20f Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 9 Apr 2013 12:36:44 +0200
Subject: [PATCH 010/104] Set OSGi Bundle-SymbolicName to
 org.apache.commons.logging

---
 apache-commons-logging.spec | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 70577f1..8d46c54 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -67,6 +67,17 @@ Obsoletes:      jakarta-%{short_name}-javadoc <= 0:1.0.4
 %pom_remove_plugin :cobertura-maven-plugin
 %pom_remove_plugin :maven-scm-publish-plugin
 
+# Upstream is changing Maven groupID and OSGi Bundle-SymbolicName back
+# and forth, even between minor releases (such as 1.1.1 and 1.1.2).
+# In case of Maven we can provide an alias, so that's not a big
+# problem.  But there is no alias mechanism for OSGi bundle names.
+#
+# I'll use Bundle-SymbolicName equal to "org.apache.commons.logging"
+# because that's what upstream decided to use in future and because
+# that's what most of Eclipse plugin are already using.  See also
+# rhbz#949842 and LOGGING-151.  mizdebsk, 9 Apr 2013
+%pom_xpath_set pom:commons.osgi.symbolicName org.apache.commons.logging
+
 sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
 
 %build
@@ -123,6 +134,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Apr  9 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-2
+- Set OSGi Bundle-SymbolicName to org.apache.commons.logging
+- Resolves: rhbz#949842
+
 * Mon Apr  8 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-1
 - Update to upstream version 1.1.2
 - Convert POM to POM macros

From 421d88bcc3b8c7ce59b4bd1081990f4fd453d04f Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 21 May 2013 07:24:33 +0200
Subject: [PATCH 011/104] Update to upstream version 1.1.3

- Remove OSGi Bundle-SymbolicName patch (accepted upstream)
---
 .gitignore                  |  1 +
 apache-commons-logging.spec | 19 ++++++-------------
 sources                     |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8ea02b0..fa99b2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 commons-logging-1.1.1-src.tar.gz
 /commons-logging-1.1.2-src.tar.gz
+/commons-logging-1.1.3-src.tar.gz
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 8d46c54..4af0900 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -3,8 +3,8 @@
 %global short_name commons-%{base_name}
 
 Name:           apache-%{short_name}
-Version:        1.1.2
-Release:        2%{?dist}
+Version:        1.1.3
+Release:        1%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -67,17 +67,6 @@ Obsoletes:      jakarta-%{short_name}-javadoc <= 0:1.0.4
 %pom_remove_plugin :cobertura-maven-plugin
 %pom_remove_plugin :maven-scm-publish-plugin
 
-# Upstream is changing Maven groupID and OSGi Bundle-SymbolicName back
-# and forth, even between minor releases (such as 1.1.1 and 1.1.2).
-# In case of Maven we can provide an alias, so that's not a big
-# problem.  But there is no alias mechanism for OSGi bundle names.
-#
-# I'll use Bundle-SymbolicName equal to "org.apache.commons.logging"
-# because that's what upstream decided to use in future and because
-# that's what most of Eclipse plugin are already using.  See also
-# rhbz#949842 and LOGGING-151.  mizdebsk, 9 Apr 2013
-%pom_xpath_set pom:commons.osgi.symbolicName org.apache.commons.logging
-
 sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
 
 %build
@@ -134,6 +123,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue May 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-1
+- Update to upstream version 1.1.3
+- Remove OSGi Bundle-SymbolicName patch (accepted upstream)
+
 * Tue Apr  9 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-2
 - Set OSGi Bundle-SymbolicName to org.apache.commons.logging
 - Resolves: rhbz#949842
diff --git a/sources b/sources
index 513fce3..95751b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8928a44ded8fb362974fa303900773d6  commons-logging-1.1.2-src.tar.gz
+e8e197d628436490886d17cffa108fe3  commons-logging-1.1.3-src.tar.gz

From 018f71eceae892af90846ab6b018f55057541e4a Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 2 Aug 2013 20:20:19 -0500
Subject: [PATCH 012/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_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 4af0900..d4054cc 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -123,6 +123,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Tue May 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-1
 - Update to upstream version 1.1.3
 - Remove OSGi Bundle-SymbolicName patch (accepted upstream)

From 789b784c3d963696eb492cd8347a8ebec0e43913 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Mon, 5 Aug 2013 18:27:49 +0200
Subject: [PATCH 013/104] Adapt to current guidelines

---
 apache-commons-logging.spec | 87 +++++++++++++------------------------
 1 file changed, 29 insertions(+), 58 deletions(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index d4054cc..89943f9 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,34 +4,22 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
-Group:          Development/Libraries
 URL:            http://commons.apache.org/%{base_name}
 Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 Source2:        http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
 
-BuildArch:      noarch
 BuildRequires:  maven-local
-BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  avalon-framework >= 4.3
-BuildRequires:  avalon-logkit
-BuildRequires:  apache-commons-parent
-BuildRequires:  maven-dependency-plugin
-BuildRequires:  maven-failsafe-plugin
-BuildRequires:  maven-plugin-build-helper
-BuildRequires:  maven-release-plugin
-BuildRequires:  maven-site-plugin
-BuildRequires:  servlet
+BuildRequires:  mvn(avalon-framework:avalon-framework-api)
+BuildRequires:  mvn(avalon-framework:avalon-framework-impl)
+BuildRequires:  mvn(javax.servlet:servlet-api)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(log4j:log4j)
+BuildRequires:  mvn(logkit:logkit)
+BuildRequires:  mvn(org.apache.commons:commons-parent)
 
-Requires:       java >= 1:1.6.0
-Requires:       jpackage-utils >= 0:1.6
-
-# This should go away with F-17
-Provides:       jakarta-%{short_name} = 0:%{version}-%{release}
-Obsoletes:      jakarta-%{short_name} <= 0:1.0.4
 
 %description
 The commons-logging package provides a simple, component oriented
@@ -46,10 +34,6 @@ logging implementation.
 
 %package        javadoc
 Summary:        API documentation for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
-
-Obsoletes:      jakarta-%{short_name}-javadoc <= 0:1.0.4
 
 %description    javadoc
 %{summary}.
@@ -69,60 +53,47 @@ Obsoletes:      jakarta-%{short_name}-javadoc <= 0:1.0.4
 
 sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
 
+# for compatibility reasons
+%mvn_file ":%{short_name}{*}" "%{short_name}@1" "%{name}@1"
+%mvn_alias ":%{short_name}{*}" "org.apache.commons:%{short_name}@1"
+
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 # -----------------------------------------------------------------------------
 
 %install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -p -m 644 target/%{short_name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar
-install -p -m 644 target/%{short_name}-adapters-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-adapters.jar
+%mvn_install
 
-pushd $RPM_BUILD_ROOT%{_javadir}
-for jar in %{name}*; do
-    ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
+install -p -m 644 target/%{short_name}-api-%{version}.jar %{buildroot}/%{_javadir}/%{name}-api.jar
+install -p -m 644 target/%{short_name}-adapters-%{version}.jar %{buildroot}/%{_javadir}/%{name}-adapters.jar
+
+pushd %{buildroot}/%{_javadir}
+for jar in %{name}-*; do
+    ln -sf ${jar} `echo ${jar}| sed "s|apache-||g"`
 done
 popd
 
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
-install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}-api.pom
+install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.pom
 
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
-%add_to_maven_depmap org.apache.commons %{short_name}-api %{version} JPP %{short_name}-api
-%add_to_maven_depmap org.apache.commons %{short_name}-adapters %{version} JPP %{short_name}-adapters
+%add_maven_depmap JPP-%{short_name}-api.pom %{short_name}-api.jar -a "org.apache.commons:commons-logging-api"
 
-# following lines are only for backwards compatibility. New packages
-# should use proper groupid org.apache.commons and also artifactid
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
-%add_to_maven_depmap %{short_name} %{short_name}-api %{version} JPP %{short_name}-api
-%add_to_maven_depmap %{short_name} %{short_name}-adapters %{version} JPP %{short_name}-adapters
-
-
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
 %doc LICENSE.txt NOTICE.txt
 %doc PROPOSAL.html RELEASE-NOTES.txt
-%{_javadir}/*
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavenpomdir}/JPP-%{short_name}-api.pom
-%{_mavendepmapfragdir}/*
+%{_javadir}/*%{short_name}-api.jar
+%{_javadir}/*%{short_name}-adapters.jar
 
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
-%{_javadocdir}/%{name}
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-3
+- Adapt to current guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From b083637924d66af16d3868689cb5898c193a998f Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Mon, 5 Aug 2013 18:54:02 +0200
Subject: [PATCH 014/104] Add missing BR: maven-failsafe-plugin

---
 apache-commons-logging.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 89943f9..3ddf184 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -19,6 +19,7 @@ BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(log4j:log4j)
 BuildRequires:  mvn(logkit:logkit)
 BuildRequires:  mvn(org.apache.commons:commons-parent)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-failsafe-plugin)
 
 
 %description
@@ -91,6 +92,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-4
+- Add missing BR: maven-failsafe-plugin
+
 * Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-3
 - Adapt to current guidelines
 

From b7edd16b1172e3d5a57896306bf9cd4e3a61d289 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Mon, 5 Aug 2013 19:11:21 +0200
Subject: [PATCH 015/104] Add missing BR: maven-dependency-plugin,
 build-helper-maven-plugin

---
 apache-commons-logging.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 3ddf184..7a3ca70 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -20,6 +20,8 @@ BuildRequires:  mvn(log4j:log4j)
 BuildRequires:  mvn(logkit:logkit)
 BuildRequires:  mvn(org.apache.commons:commons-parent)
 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)
 
 
 %description
@@ -92,6 +94,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-5
+- Add missing BR: maven-dependency-plugin, build-helper-maven-plugin
+
 * Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-4
 - Add missing BR: maven-failsafe-plugin
 

From 394f50da90a1b54826dd209ac4d713703fc0955b Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Tue, 6 Aug 2013 08:46:27 +0200
Subject: [PATCH 016/104] Temporarily remove test which fails in koji

---
 apache-commons-logging.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 7a3ca70..f99de49 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -60,6 +60,10 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
 %mvn_file ":%{short_name}{*}" "%{short_name}@1" "%{name}@1"
 %mvn_alias ":%{short_name}{*}" "org.apache.commons:%{short_name}@1"
 
+# this test fails in koji from some reason, but it works locally in mock.
+# TODO: probably worth investigating
+rm src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
+
 %build
 %mvn_build
 
@@ -94,6 +98,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Aug 06 2013 Michal Srb <msrb@redhat.com> - 1.1.3-6
+- Temporarily remove test which fails in koji
+
 * Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-5
 - Add missing BR: maven-dependency-plugin, build-helper-maven-plugin
 

From 12063d2aea624247a0021322d96f8cc3cdb4bab9 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Sun, 11 Aug 2013 10:32:21 +0200
Subject: [PATCH 017/104] Make this package noarch again (Resolves:
 rhbz#995756)

---
 apache-commons-logging.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index f99de49..cdb0b5c 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -23,6 +23,8 @@ 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)
 
+BuildArch:      noarch
+
 
 %description
 The commons-logging package provides a simple, component oriented
@@ -98,6 +100,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sun Aug 11 2013 Michal Srb <msrb@redhat.com> - 1.1.3-7
+- Make this package noarch again (Resolves: rhbz#995756)
+
 * Tue Aug 06 2013 Michal Srb <msrb@redhat.com> - 1.1.3-6
 - Temporarily remove test which fails in koji
 

From 8a4bc2c084ebba606987401814b62895a2284910 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Wed, 22 Jan 2014 11:11:22 +0100
Subject: [PATCH 018/104] Run all the tests agains

---
 apache-commons-logging.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index cdb0b5c..41c0b90 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -62,9 +62,6 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
 %mvn_file ":%{short_name}{*}" "%{short_name}@1" "%{name}@1"
 %mvn_alias ":%{short_name}{*}" "org.apache.commons:%{short_name}@1"
 
-# this test fails in koji from some reason, but it works locally in mock.
-# TODO: probably worth investigating
-rm src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
 
 %build
 %mvn_build
@@ -100,6 +97,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jan 22 2014 Michal Srb <msrb@redhat.com> - 1.1.3-8
+- Run all the tests agains
+
 * Sun Aug 11 2013 Michal Srb <msrb@redhat.com> - 1.1.3-7
 - Make this package noarch again (Resolves: rhbz#995756)
 

From 8cf430a53849fea260a9fd37a626794a9edcdd70 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Thu, 20 Feb 2014 14:54:44 +0100
Subject: [PATCH 019/104] Set avalon dependency scope to provided

Signed-off-by: Michael Simacek <msimacek@redhat.com>
Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
---
 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 41c0b90..43d5aec 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -50,7 +50,7 @@ Summary:        API documentation for %{name}
 
 # 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
+%pom_add_dep avalon-framework:avalon-framework-api:4.3:provided
 %pom_add_dep avalon-framework:avalon-framework-impl:4.3:test
 
 %pom_remove_plugin :cobertura-maven-plugin
@@ -97,6 +97,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-9
+- Set avalon dependency scope to provided
+
 * Wed Jan 22 2014 Michal Srb <msrb@redhat.com> - 1.1.3-8
 - Run all the tests agains
 

From 6acd3c658ef92b290b7d549e6dfb98b351e81266 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Thu, 20 Feb 2014 16:24:15 +0100
Subject: [PATCH 020/104] Set logkit dependency scope to provided

Signed-off-by: Michael Simacek <msimacek@redhat.com>
Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
---
 apache-commons-logging.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 43d5aec..3e62512 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -53,6 +53,8 @@ Summary:        API documentation for %{name}
 %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']" '<scope>provided</scope>'
+
 %pom_remove_plugin :cobertura-maven-plugin
 %pom_remove_plugin :maven-scm-publish-plugin
 
@@ -97,6 +99,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-10
+- Set logkit dependency scope to provided
+
 * Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-9
 - Set avalon dependency scope to provided
 

From 377a51cb76f883be7c22a10475277302b98a3a65 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Tue, 4 Mar 2014 09:04:58 +0100
Subject: [PATCH 021/104] Use Requires: java-headless rebuild (#1067528)

---
 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 3e62512..230c986 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -99,6 +99,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.3-11
+- Use Requires: java-headless rebuild (#1067528)
+
 * Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-10
 - Set logkit dependency scope to provided
 

From 75a3f45bbb02f32c85808265cc274254a9b81d16 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 13 May 2014 14:21:36 +0200
Subject: [PATCH 022/104] Disable tests that use log4j12

---
 apache-commons-logging.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 230c986..c7da0a7 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.3
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -64,6 +64,9 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
 %mvn_file ":%{short_name}{*}" "%{short_name}@1" "%{name}@1"
 %mvn_alias ":%{short_name}{*}" "org.apache.commons:%{short_name}@1"
 
+# Remove log4j12 tests
+rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
+
 
 %build
 %mvn_build
@@ -99,6 +102,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue May 13 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-12
+- Disable tests that use log4j12
+
 * Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.3-11
 - Use Requires: java-headless rebuild (#1067528)
 

From 5272664803858e509d7149a45cf4ccc3b6d4e4a6 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 6 Jun 2014 19:58:41 -0500
Subject: [PATCH 023/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_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 c7da0a7..6d08b54 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.3
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -102,6 +102,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Tue May 13 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-12
 - Disable tests that use log4j12
 

From 71bb0865a6d2730a39dfb379f97fc757dbe98fa1 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sun, 20 Jul 2014 11:30:22 +0200
Subject: [PATCH 024/104] Update to upstream version 1.2

---
 .gitignore                  | 1 +
 apache-commons-logging.spec | 7 +++++--
 sources                     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index fa99b2a..ac92f7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,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
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 6d08b54..1452c0d 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -3,8 +3,8 @@
 %global short_name commons-%{base_name}
 
 Name:           apache-%{short_name}
-Version:        1.1.3
-Release:        13%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -102,6 +102,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sun Jul 20 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-1
+- Update to upstream version 1.2
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 95751b9..87aa2f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e8e197d628436490886d17cffa108fe3  commons-logging-1.1.3-src.tar.gz
+ce977548f1cbf46918e93cd38ac35163  commons-logging-1.2-src.tar.gz

From 8994abf010eb56058e70f40499e9bfabea4485cb Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sun, 20 Jul 2014 12:52:14 +0200
Subject: [PATCH 025/104] Fix BR on commons-parent

---
 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 1452c0d..eb2fd2a 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -18,7 +18,7 @@ BuildRequires:  mvn(javax.servlet:servlet-api)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(log4j:log4j)
 BuildRequires:  mvn(logkit:logkit)
-BuildRequires:  mvn(org.apache.commons:commons-parent)
+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)

From 0ccbd402b937c33543d937a9aa54e4394b9286e3 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 30 Jul 2014 12:50:24 +0200
Subject: [PATCH 026/104] Generate different Bundle-SymbolicName for different
 JARs

- Resolves: rhbz#1123055
---
 ...nt-Bundle-SymbolicName-for-different.patch | 99 +++++++++++++++++++
 apache-commons-logging.spec                   |  9 +-
 2 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 0001-Generate-different-Bundle-SymbolicName-for-different.patch

diff --git a/0001-Generate-different-Bundle-SymbolicName-for-different.patch b/0001-Generate-different-Bundle-SymbolicName-for-different.patch
new file mode 100644
index 0000000..52943b1
--- /dev/null
+++ b/0001-Generate-different-Bundle-SymbolicName-for-different.patch
@@ -0,0 +1,99 @@
+From 00823b8008bffc5dd65c9e8de604994040a3190d Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Tue, 29 Jul 2014 09:00:03 +0200
+Subject: [PATCH] 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.
+   <build>
+     <plugins>
+ 
++      <plugin>
++        <groupId>org.apache.felix</groupId>
++        <artifactId>maven-bundle-plugin</artifactId>
++        <executions>
++          <execution>
++            <id>tests-bundle-manifest</id>
++            <phase>process-classes</phase>
++            <goals>
++              <goal>manifest</goal>
++            </goals>
++            <configuration>
++              <manifestLocation>${project.build.directory}/osgi-tests</manifestLocation>
++              <instructions>
++                <Bundle-SymbolicName>${commons.osgi.symbolicName}.tests</Bundle-SymbolicName>
++              </instructions>
++            </configuration>
++          </execution>
++          <execution>
++            <id>api-bundle-manifest</id>
++            <phase>process-classes</phase>
++            <goals>
++              <goal>manifest</goal>
++            </goals>
++            <configuration>
++              <manifestLocation>${project.build.directory}/osgi-api</manifestLocation>
++              <instructions>
++                <Bundle-SymbolicName>${commons.osgi.symbolicName}.api</Bundle-SymbolicName>
++              </instructions>
++            </configuration>
++          </execution>
++          <execution>
++            <id>adapters-bundle-manifest</id>
++            <phase>process-classes</phase>
++            <goals>
++              <goal>manifest</goal>
++            </goals>
++            <configuration>
++              <manifestLocation>${project.build.directory}/osgi-adapters</manifestLocation>
++              <instructions>
++                <Bundle-SymbolicName>${commons.osgi.symbolicName}.adapters</Bundle-SymbolicName>
++              </instructions>
++            </configuration>
++          </execution>
++        </executions>
++      </plugin>
++
+       <!--
+         - We want to create four jarfiles from this project: normal, tests, api
+         - and adapters. The first two are handled by the normal jar:jar and
+@@ -202,6 +248,9 @@ under the License.
+             </goals>
+             <configuration>
+               <jarName>commons-logging</jarName>
++              <archive>
++                <manifestFile>${project.build.directory}/osgi-tests/MANIFEST.MF</manifestFile>
++              </archive>
+             </configuration>
+           </execution>
+ 
+@@ -213,6 +262,9 @@ under the License.
+             </goals>
+             <configuration>
+               <jarName>${project.artifactId}-api-${project.version}</jarName>
++              <archive>
++                <manifestFile>${project.build.directory}/osgi-api/MANIFEST.MF</manifestFile>
++              </archive>
+               <includes>
+                 <include>org/apache/commons/logging/*.class</include>
+                 <include>org/apache/commons/logging/impl/LogFactoryImpl*.class</include>
+@@ -237,6 +289,9 @@ under the License.
+             </goals>
+             <configuration>
+               <jarName>${project.artifactId}-adapters-${project.version}</jarName>
++              <archive>
++                <manifestFile>${project.build.directory}/osgi-adapters/MANIFEST.MF</manifestFile>
++              </archive>
+               <includes>
+                 <include>org/apache/commons/logging/impl/**.class</include>
+                 <include>META-INF/LICENSE.txt</include>
+-- 
+1.9.3
+
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index eb2fd2a..4d7dac3 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,13 +4,15 @@
 
 Name:           apache-%{short_name}
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
 Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 Source2:        http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
 
+Patch0:         0001-Generate-different-Bundle-SymbolicName-for-different.patch
+
 BuildRequires:  maven-local
 BuildRequires:  mvn(avalon-framework:avalon-framework-api)
 BuildRequires:  mvn(avalon-framework:avalon-framework-impl)
@@ -47,6 +49,7 @@ Summary:        API documentation for %{name}
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
+%patch0 -p1
 
 # Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
 %pom_remove_dep :avalon-framework
@@ -102,6 +105,10 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Jul 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-2
+- Generate different Bundle-SymbolicName for different JARs
+- Resolves: rhbz#1123055
+
 * Sun Jul 20 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-1
 - Update to upstream version 1.2
 

From b731d25946f8ca12a55a1e564d2430230fba6bfa Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 25 Feb 2015 18:05:48 +0100
Subject: [PATCH 027/104] Add note about updating eclipse-ecf

---
 apache-commons-logging.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 4d7dac3..19207d4 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -1,3 +1,6 @@
+# READ BEFORE UPDATING: After updating this package to new upstream
+# version eclipse-ecf should be rebuilt.  For more info, see:
+# https://fedoraproject.org/wiki/SIGs/Java#Package_Update.2FRebuild_Notes
 
 %global base_name  logging
 %global short_name commons-%{base_name}

From a89f5fb69af05db6d973e6d6c77eef5b96886be4 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 9 Mar 2015 14:13:02 +0100
Subject: [PATCH 028/104] Add aliases for apache groupId

---
 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 19207d4..df3eb86 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -7,7 +7,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -68,7 +68,7 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
 
 # for compatibility reasons
 %mvn_file ":%{short_name}{*}" "%{short_name}@1" "%{name}@1"
-%mvn_alias ":%{short_name}{*}" "org.apache.commons:%{short_name}@1"
+%mvn_alias ":%{short_name}{*}" "org.apache.commons:%{short_name}@1" "apache:%{short_name}@1"
 
 # Remove log4j12 tests
 rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
@@ -108,6 +108,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Mar  9 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-3
+- Add aliases for apache groupId
+
 * Tue Jul 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-2
 - Generate different Bundle-SymbolicName for different JARs
 - Resolves: rhbz#1123055

From a7376759633a6a07dee89d6bbf025ea458326b66 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 17 Jun 2015 00:04:05 +0000
Subject: [PATCH 029/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_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 df3eb86..22d4e8b 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -7,7 +7,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -108,6 +108,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Mon Mar  9 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-3
 - Add aliases for apache groupId
 

From f259b041dab30efd29f8ea2325d74212c8cca31a Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 3 Feb 2016 16:18:23 +0000
Subject: [PATCH 030/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_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 22d4e8b..1746836 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -7,7 +7,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -108,6 +108,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From 1531352d0ff2d1050f9556c24e647b81405c6cff Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 31 May 2016 10:52:52 +0200
Subject: [PATCH 031/104] Port to maven-jar-plugin 3.0.0

---
 ...nt-Bundle-SymbolicName-for-different.patch |   6 +-
 0002-Port-to-maven-jar-plugin-3.0.0.patch     | 160 ++++++++++++++++++
 apache-commons-logging.spec                   |  11 +-
 3 files changed, 171 insertions(+), 6 deletions(-)
 create mode 100644 0002-Port-to-maven-jar-plugin-3.0.0.patch

diff --git a/0001-Generate-different-Bundle-SymbolicName-for-different.patch b/0001-Generate-different-Bundle-SymbolicName-for-different.patch
index 52943b1..a8c0ddc 100644
--- a/0001-Generate-different-Bundle-SymbolicName-for-different.patch
+++ b/0001-Generate-different-Bundle-SymbolicName-for-different.patch
@@ -1,7 +1,7 @@
-From 00823b8008bffc5dd65c9e8de604994040a3190d Mon Sep 17 00:00:00 2001
+From d71aa7acc93b944b159ac63f85d9ba1a566f5a8d Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Tue, 29 Jul 2014 09:00:03 +0200
-Subject: [PATCH] Generate different Bundle-SymbolicName for different JARs
+Subject: [PATCH 1/2] Generate different Bundle-SymbolicName for different JARs
 
 ---
  pom.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -95,5 +95,5 @@ index cdad31c..5707595 100644
                  <include>org/apache/commons/logging/impl/**.class</include>
                  <include>META-INF/LICENSE.txt</include>
 -- 
-1.9.3
+2.5.5
 
diff --git a/0002-Port-to-maven-jar-plugin-3.0.0.patch b/0002-Port-to-maven-jar-plugin-3.0.0.patch
new file mode 100644
index 0000000..e1dcfe7
--- /dev/null
+++ b/0002-Port-to-maven-jar-plugin-3.0.0.patch
@@ -0,0 +1,160 @@
+From d8356a58efde0808cabede14b4f1b2473fa73170 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Tue, 31 May 2016 10:52:12 +0200
+Subject: [PATCH 2/2] Port to maven-jar-plugin 3.0.0
+
+---
+ pom.xml                                            | 47 +++++-----------------
+ .../logging/pathable/ChildFirstTestCase.java       |  8 ++--
+ .../logging/pathable/ParentFirstTestCase.java      |  8 ++--
+ 3 files changed, 17 insertions(+), 46 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 5707595..c5d8d37 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -237,6 +237,10 @@ under the License.
+         <artifactId>maven-jar-plugin</artifactId>
+         <executions>
+           <execution>
++	    <id>default-jar</id>
++	    <phase>skip</phase>
++	  </execution>
++	  <execution>
+             <!--
+               - The custom test framework requires the unit test code to be
+               - in a jarfile so it can control its place in the classpath.
+@@ -261,7 +265,7 @@ under the License.
+               <goal>jar</goal>
+             </goals>
+             <configuration>
+-              <jarName>${project.artifactId}-api-${project.version}</jarName>
++              <classifier>api</classifier>
+               <archive>
+                 <manifestFile>${project.build.directory}/osgi-api/MANIFEST.MF</manifestFile>
+               </archive>
+@@ -288,7 +292,7 @@ under the License.
+               <goal>jar</goal>
+             </goals>
+             <configuration>
+-              <jarName>${project.artifactId}-adapters-${project.version}</jarName>
++              <classifier>adapters</classifier>
+               <archive>
+                 <manifestFile>${project.build.directory}/osgi-adapters/MANIFEST.MF</manifestFile>
+               </archive>
+@@ -346,39 +350,6 @@ under the License.
+ 
+       <plugin>
+         <!--
+-          - Attach the adapters and api jars to the normal artifact. This way
+-          - they will be deployed when the normal artifact is deployed.
+-          -->
+-        <groupId>org.codehaus.mojo</groupId>
+-        <artifactId>build-helper-maven-plugin</artifactId>
+-        <version>1.0</version>
+-        <executions>
+-          <execution>
+-            <id>attach-artifacts</id>
+-            <phase>package</phase>
+-            <goals>
+-              <goal>attach-artifact</goal>
+-            </goals>
+-            <configuration>
+-              <artifacts>
+-                <artifact>
+-                  <file>${project.build.directory}/${project.artifactId}-adapters-${project.version}.jar</file>
+-                  <type>jar</type>
+-                  <classifier>adapters</classifier>
+-                </artifact>
+-                <artifact>
+-                  <file>${project.build.directory}/${project.artifactId}-api-${project.version}.jar</file>
+-                  <type>jar</type>
+-                  <classifier>api</classifier>
+-                </artifact>
+-              </artifacts>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-
+-      <plugin>
+-        <!--
+           - Many of JCL's tests use tricky techniques to place the generated
+           - JCL jarfiles on the classpath in various configurations. This means
+           - that those tests must be run *after* the "package" build phase.
+@@ -442,9 +413,9 @@ under the License.
+                   <logkit>${logkit:logkit:jar}</logkit>
+                   <servlet-api>${javax.servlet:servlet-api:jar}</servlet-api>
+                   <commons-logging>target/${project.build.finalName}.jar</commons-logging>
+-                  <commons-logging-api>target/${project.artifactId}-api-${project.version}.jar</commons-logging-api>
+-                  <commons-logging-adapters>target/${project.artifactId}-adapters-${project.version}.jar</commons-logging-adapters>
+-                  <testclasses>target/commons-logging-tests.jar</testclasses>
++                  <commons-logging-api>target/${project.artifactId}-${project.version}-api.jar</commons-logging-api>
++                  <commons-logging-adapters>target/${project.artifactId}-${project.version}-adapters.jar</commons-logging-adapters>
++                  <testclasses>target/commons-logging-${project.version}-tests.jar</testclasses>
+               </systemPropertyVariables>
+             </configuration>
+           </execution>
+diff --git a/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java b/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
+index 1aeb12d..eb67ec1 100644
+--- a/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
++++ b/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
+@@ -213,11 +213,11 @@ public class ChildFirstTestCase extends TestCase {
+         // getResource where it is accessable to both classloaders. The one visible
+         // to the child should be returned. The URL returned will be of form
+         //  jar:file:/x/y.jar!path/to/resource. The filename part should include the jarname
+-        // of form commons-logging-adapters-nnnn.jar, not commons-logging-nnnn.jar
++        // of form commons-logging-nnnn-adapters.jar, not commons-logging-nnnn.jar
+         resource = childLoader.getResource("org/apache/commons/logging/impl/Log4JLogger.class");
+         assertNotNull("Unable to locate Log4JLogger.class resource", resource);
+         assertTrue("Incorrect source for Log4JLogger class",
+-                resource.toString().indexOf("/commons-logging-adapters-1.") > 0);
++                resource.toString().indexOf("/commons-logging-1.2-adapters.jar!") > 0);
+     }
+ 
+     /**
+@@ -269,9 +269,9 @@ public class ChildFirstTestCase extends TestCase {
+         urlsToStrings[1] = urls[1].toString();
+         Arrays.sort(urlsToStrings);
+         assertTrue("Incorrect source for Log4JLogger class",
+-                urlsToStrings[0].indexOf("/commons-logging-1.") > 0);
++                urlsToStrings[0].indexOf("/commons-logging-1.2-adapters.jar!") > 0);
+         assertTrue("Incorrect source for Log4JLogger class",
+-                urlsToStrings[1].indexOf("/commons-logging-adapters-1.") > 0);
++                urlsToStrings[1].indexOf("/commons-logging-1.2.jar!") > 0);
+     }
+ 
+     /**
+diff --git a/src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java b/src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java
+index f9bf452..fc10c8e 100644
+--- a/src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java
++++ b/src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java
+@@ -210,11 +210,11 @@ public class ParentFirstTestCase extends TestCase {
+         // getResource where it is accessable to both classloaders. The one visible
+         // to the parent should be returned. The URL returned will be of form
+         //  jar:file:/x/y.jar!path/to/resource. The filename part should include the jarname
+-        // of form commons-logging-nnnn.jar, not commons-logging-adapters-nnnn.jar
++        // of form commons-logging-nnnn.jar, not commons-logging-nnnn-adapters.jar
+         resource = childLoader.getResource("org/apache/commons/logging/impl/Log4JLogger.class");
+         assertNotNull("Unable to locate Log4JLogger.class resource", resource);
+         assertTrue("Incorrect source for Log4JLogger class",
+-                resource.toString().indexOf("/commons-logging-1.") > 0);
++                resource.toString().indexOf("/commons-logging-1.2.jar!") > 0);
+     }
+     
+     /**
+@@ -259,9 +259,9 @@ public class ParentFirstTestCase extends TestCase {
+         urlsToStrings[1] = urls[1].toString();
+         Arrays.sort(urlsToStrings);
+         assertTrue("Incorrect source for Log4JLogger class",
+-                urlsToStrings[0].indexOf("/commons-logging-1.") > 0);
++                urlsToStrings[0].indexOf("/commons-logging-1.2-adapters.jar!") > 0);
+         assertTrue("Incorrect source for Log4JLogger class",
+-                urlsToStrings[1].indexOf("/commons-logging-adapters-1.") > 0);
++                urlsToStrings[1].indexOf("/commons-logging-1.2.jar!") > 0);
+         
+     }
+ 
+-- 
+2.5.5
+
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 1746836..f4aa825 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -7,7 +7,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -15,6 +15,7 @@ Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_n
 Source2:        http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
 
 Patch0:         0001-Generate-different-Bundle-SymbolicName-for-different.patch
+Patch1:         0002-Port-to-maven-jar-plugin-3.0.0.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(avalon-framework:avalon-framework-api)
@@ -53,6 +54,7 @@ Summary:        API documentation for %{name}
 %prep
 %setup -q -n %{short_name}-%{version}-src
 %patch0 -p1
+%patch1 -p1
 
 # Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
 %pom_remove_dep :avalon-framework
@@ -82,8 +84,8 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
 %install
 %mvn_install
 
-install -p -m 644 target/%{short_name}-api-%{version}.jar %{buildroot}/%{_javadir}/%{name}-api.jar
-install -p -m 644 target/%{short_name}-adapters-%{version}.jar %{buildroot}/%{_javadir}/%{name}-adapters.jar
+install -p -m 644 target/%{short_name}-%{version}-api.jar %{buildroot}/%{_javadir}/%{name}-api.jar
+install -p -m 644 target/%{short_name}-%{version}-adapters.jar %{buildroot}/%{_javadir}/%{name}-adapters.jar
 
 pushd %{buildroot}/%{_javadir}
 for jar in %{name}-*; do
@@ -108,6 +110,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue May 31 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-6
+- Port to maven-jar-plugin 3.0.0
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 44d3220af263335fbbf50ed2ff1b8f2ba291dc42 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 10 Feb 2017 06:05:04 +0000
Subject: [PATCH 032/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_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 f4aa825..af61ee8 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -7,7 +7,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -110,6 +110,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Tue May 31 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-6
 - Port to maven-jar-plugin 3.0.0
 

From cfe1c2b0704d4f5b4774b69dd4883733bba5095e Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Fri, 10 Feb 2017 13:56:57 +0100
Subject: [PATCH 033/104] Use log4j12

- Add avalon conditional
---
 apache-commons-logging.spec | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index af61ee8..176b5a5 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -1,13 +1,11 @@
-# READ BEFORE UPDATING: After updating this package to new upstream
-# version eclipse-ecf should be rebuilt.  For more info, see:
-# https://fedoraproject.org/wiki/SIGs/Java#Package_Update.2FRebuild_Notes
+%bcond_without  avalon
 
 %global base_name  logging
 %global short_name commons-%{base_name}
 
 Name:           apache-%{short_name}
 Version:        1.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -18,12 +16,14 @@ 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)
-BuildRequires:  mvn(logkit:logkit)
+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)
@@ -56,10 +56,17 @@ Summary:        API documentation for %{name}
 %patch0 -p1
 %patch1 -p1
 
+%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
+%else
+%pom_remove_dep :avalon-framework
+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_xpath_inject "pom:dependency[pom:artifactId='logkit']" '<scope>provided</scope>'
 
@@ -110,6 +117,10 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Feb 10 2017 Michael Simacek <msimacek@redhat.com> - 1.2-8
+- Use log4j12
+- Add avalon conditional
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From 28f0ca738b4b6f1f32f4168f99071372718cec07 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 13 Feb 2017 11:01:59 +0100
Subject: [PATCH 034/104] Fix conditional

---
 apache-commons-logging.spec | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 176b5a5..3e1c01f 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -5,7 +5,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -61,15 +61,16 @@ Summary:        API documentation for %{name}
 %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']" '<scope>provided</scope>'
+
 %else
-%pom_remove_dep :avalon-framework
+%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_xpath_inject "pom:dependency[pom:artifactId='logkit']" '<scope>provided</scope>'
-
 %pom_remove_plugin :cobertura-maven-plugin
 %pom_remove_plugin :maven-scm-publish-plugin
 
@@ -117,6 +118,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Feb 13 2017 Michael Simacek <msimacek@redhat.com> - 1.2-9
+- Fix conditional
+
 * Fri Feb 10 2017 Michael Simacek <msimacek@redhat.com> - 1.2-8
 - Use log4j12
 - Add avalon conditional

From 67aa7b54a85ee929dafffcf1389ab59d707f83e4 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Wed, 22 Mar 2017 14:20:58 +0100
Subject: [PATCH 035/104] Avoid %add_maven_depmap

---
 apache-commons-logging.spec | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 3e1c01f..6cdee19 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -1,15 +1,14 @@
 %bcond_without  avalon
 
-%global base_name  logging
-%global short_name commons-%{base_name}
+%global short_name commons-logging
 
 Name:           apache-%{short_name}
 Version:        1.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
-URL:            http://commons.apache.org/%{base_name}
-Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+URL:            http://commons.apache.org/logging
+Source0:        http://www.apache.org/dist/commons/logging/source/%{short_name}-%{version}-src.tar.gz
 Source2:        http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
 
 Patch0:         0001-Generate-different-Bundle-SymbolicName-for-different.patch
@@ -87,37 +86,28 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
 %build
 %mvn_build
 
+# The build produces more artifacts from one pom
+%mvn_artifact %{SOURCE2} target/%{short_name}-%{version}-api.jar
+%mvn_artifact commons-logging:commons-logging-adapters:%{version} target/%{short_name}-%{version}-adapters.jar
+
 # -----------------------------------------------------------------------------
 
 %install
 %mvn_install
 
-install -p -m 644 target/%{short_name}-%{version}-api.jar %{buildroot}/%{_javadir}/%{name}-api.jar
-install -p -m 644 target/%{short_name}-%{version}-adapters.jar %{buildroot}/%{_javadir}/%{name}-adapters.jar
-
-pushd %{buildroot}/%{_javadir}
-for jar in %{name}-*; do
-    ln -sf ${jar} `echo ${jar}| sed "s|apache-||g"`
-done
-popd
-
-install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.pom
-
-%add_maven_depmap JPP-%{short_name}-api.pom %{short_name}-api.jar -a "org.apache.commons:commons-logging-api"
-
 %files -f .mfiles
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 %doc PROPOSAL.html RELEASE-NOTES.txt
-%{_javadir}/*%{short_name}-api.jar
-%{_javadir}/*%{short_name}-adapters.jar
-
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Mar 22 2017 Michael Simacek <msimacek@redhat.com> - 1.2-10
+- Avoid %%add_maven_depmap
+
 * Mon Feb 13 2017 Michael Simacek <msimacek@redhat.com> - 1.2-9
 - Fix conditional
 

From c25d2cd7e641aaca30d0a1c7d74eb898e4ed7b28 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 26 Jul 2017 03:00:35 +0000
Subject: [PATCH 036/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_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 6cdee19..5e1164d 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/logging
@@ -105,6 +105,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Wed Mar 22 2017 Michael Simacek <msimacek@redhat.com> - 1.2-10
 - Avoid %%add_maven_depmap
 

From 8f5bc0c6566e776cb3b5645519b372b8456de85a Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 29 Jan 2018 09:24:35 +0100
Subject: [PATCH 037/104] Cleanup spec file

---
 apache-commons-logging.spec | 46 ++++++++++++-------------------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 5e1164d..6f7bdb7 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -1,15 +1,15 @@
 %bcond_without  avalon
 
-%global short_name commons-logging
-
-Name:           apache-%{short_name}
+Name:           apache-commons-logging
 Version:        1.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/logging
-Source0:        http://www.apache.org/dist/commons/logging/source/%{short_name}-%{version}-src.tar.gz
-Source2:        http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
+BuildArch:      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
 
 Patch0:         0001-Generate-different-Bundle-SymbolicName-for-different.patch
 Patch1:         0002-Port-to-maven-jar-plugin-3.0.0.patch
@@ -28,9 +28,6 @@ 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)
 
-BuildArch:      noarch
-
-
 %description
 The commons-logging package provides a simple, component oriented
 interface (org.apache.commons.logging.Log) together with wrappers for
@@ -42,18 +39,10 @@ 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
-%{summary}.
-
-# -----------------------------------------------------------------------------
+%{?javadoc_package}
 
 %prep
-%setup -q -n %{short_name}-%{version}-src
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1 -n commons-logging-%{version}-src
 
 %if %{with avalon}
 # Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
@@ -76,21 +65,18 @@ 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 ":%{short_name}{*}" "%{short_name}@1" "%{name}@1"
-%mvn_alias ":%{short_name}{*}" "org.apache.commons:%{short_name}@1" "apache:%{short_name}@1"
+%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
 rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
 
-
 %build
 %mvn_build
 
 # The build produces more artifacts from one pom
-%mvn_artifact %{SOURCE2} target/%{short_name}-%{version}-api.jar
-%mvn_artifact commons-logging:commons-logging-adapters:%{version} target/%{short_name}-%{version}-adapters.jar
-
-# -----------------------------------------------------------------------------
+%mvn_artifact %{SOURCE2} target/commons-logging-%{version}-api.jar
+%mvn_artifact commons-logging:commons-logging-adapters:%{version} target/commons-logging-%{version}-adapters.jar
 
 %install
 %mvn_install
@@ -99,12 +85,10 @@ 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
-%license LICENSE.txt NOTICE.txt
-
-# -----------------------------------------------------------------------------
-
 %changelog
+* Mon Jan 29 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-12
+- Cleanup spec file
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 4d8596c64b6c0951b0e8f511d5c067f81b393e5d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 7 Feb 2018 02:29:52 +0000
Subject: [PATCH 038/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 6f7bdb7..ba6d806 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -2,7 +2,7 @@
 
 Name:           apache-commons-logging
 Version:        1.2
-Release:        12%{?dist}
+Release:        13%{?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 Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Mon Jan 29 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-12
 - Cleanup spec file
 

From a8faeedbd5e3e5b654f2c981beca747b99f58fe1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 12 Jul 2018 20:20:21 +0000
Subject: [PATCH 039/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <releng@fedoraproject.org> - 1.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 352353d99014cd3bacaa146351e070e9d0a0dfb2 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 29 Nov 2018 12:06:43 +0000
Subject: [PATCH 040/104] 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 <mizdebsk@redhat.com>
Date: Thu, 29 Nov 2018 12:42:46 +0000
Subject: [PATCH 041/104] 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']" '<scope>provided</scope>'
-
-%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 9772d437e19a7598b7a18995c8108b51dc9ccc07 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Mon, 17 Dec 2018 16:43:11 +0000
Subject: [PATCH 042/104] 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 <mat.booth@redhat.com> - 1.2-15
+- Rebuild to regenerate requires, fixes rhbz#1660117
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 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 <mat.booth@redhat.com>
Date: Tue, 18 Dec 2018 09:56:36 +0000
Subject: [PATCH 043/104] 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 <mat.booth@redhat.com> - 1.2-16
+- Fix OSGi metadata
+
 * Mon Dec 17 2018 Mat Booth <mat.booth@redhat.com> - 1.2-15
 - Rebuild to regenerate requires, fixes rhbz#1660117
 

From 8e9f1fe663efe44139f6f7e1639d7d5e368189dc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 31 Jan 2019 13:29:35 +0000
Subject: [PATCH 044/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <releng@fedoraproject.org> - 1.2-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Tue Dec 18 2018 Mat Booth <mat.booth@redhat.com> - 1.2-16
 - Fix OSGi metadata
 

From 992bb4da73e98343e46ce61ccb72c18444a862f6 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 24 May 2019 17:00:19 +0200
Subject: [PATCH 045/104] 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 <mizdebsk@redhat.com> - 1.2-14
+- Mass rebuild for javapackages-tools 201901
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 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 <mizdebsk@redhat.com>
Date: Tue, 25 Jun 2019 08:55:04 +0200
Subject: [PATCH 046/104] 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 <mizdebsk@redhat.com>
Date: Tue, 25 Jun 2019 09:18:37 +0200
Subject: [PATCH 047/104] 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 <mizdebsk@redhat.com>
Date: Thu, 27 Jun 2019 14:37:18 +0200
Subject: [PATCH 048/104] 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 <releng@fedoraproject.org>
Date: Wed, 24 Jul 2019 18:06:31 +0000
Subject: [PATCH 049/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <releng@fedoraproject.org> - 1.2-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 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 <mizdebsk@redhat.com>
Date: Fri, 25 Oct 2019 18:58:15 +0200
Subject: [PATCH 050/104] 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 <mizdebsk@redhat.com>
Date: Tue, 5 Nov 2019 17:29:27 +0100
Subject: [PATCH 051/104] 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 <mizdebsk@redhat.com> - 1.2-15
+- Mass rebuild for javapackages-tools 201902
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-14
 - Mass rebuild for javapackages-tools 201901
 

From 1ce7cf922e6e3bf36c7f3bea1656a1d56f494527 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Sat, 9 Nov 2019 17:03:43 +0100
Subject: [PATCH 052/104] 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 <decathorpe@gmail.com> - 1.2-19
+- Disable avalon support by default.
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 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 <mizdebsk@redhat.com>
Date: Wed, 11 Dec 2019 09:38:22 +0100
Subject: [PATCH 053/104] 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 <releng@fedoraproject.org>
Date: Tue, 28 Jan 2020 11:46:10 +0000
Subject: [PATCH 054/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <releng@fedoraproject.org> - 1.2-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Sat Nov 09 2019 Fabio Valentini <decathorpe@gmail.com> - 1.2-19
 - Disable avalon support by default.
 

From 56be9d095f55f130e8fdafeb82bfa8fc476f5e30 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 15 May 2020 08:10:14 +0200
Subject: [PATCH 055/104] 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 <decathorpe@gmail.com>
Date: Thu, 4 Jun 2020 14:01:49 +0200
Subject: [PATCH 056/104] 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 <decathorpe@gmail.com> - 1.2-21
+- Override javac source and target versions to fix builds with Java 11.
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 1a6da73932a05a8e29a100510fd17294fc3d4220 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Fri, 10 Jul 2020 15:41:59 +0200
Subject: [PATCH 057/104] 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 <jvanek@redhat.com> - 1.2-22
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
 * Thu Jun 04 2020 Fabio Valentini <decathorpe@gmail.com> - 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 <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 12:11:28 +0000
Subject: [PATCH 058/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <releng@fedoraproject.org> - 1.2-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 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 <mat.booth@redhat.com>
Date: Thu, 10 Sep 2020 14:16:23 +0100
Subject: [PATCH 059/104] 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 <mat.booth@redhat.com> - 1.2-24
+- Build against log4j 2
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 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 <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 00:15:04 +0000
Subject: [PATCH 060/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <releng@fedoraproject.org> - 1.2-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Thu Sep 10 2020 Mat Booth <mat.booth@redhat.com> - 1.2-24
 - Build against log4j 2
 

From 83869c8dab391dfb1c0c7fc1d701234d7ea6f5ad Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 16 Apr 2021 15:33:12 +0200
Subject: [PATCH 061/104] 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 <mizdebsk@redhat.com>
Date: Thu, 13 May 2021 19:08:42 +0200
Subject: [PATCH 062/104] 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 <mizdebsk@redhat.com>
Date: Mon, 17 May 2021 15:49:30 +0200
Subject: [PATCH 063/104] 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 <mizdebsk@redhat.com> - 1.2-26
+- Bootstrap build
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 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 <mizdebsk@redhat.com>
Date: Mon, 17 May 2021 18:01:41 +0200
Subject: [PATCH 064/104] 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 <mizdebsk@redhat.com> - 1.2-26
 - Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 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 <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 12:47:25 +0000
Subject: [PATCH 065/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From 62a5282d06032ace464cacf0af389dc212e46e1b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 17:43:24 +0000
Subject: [PATCH 066/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <releng@fedoraproject.org> - 1.2-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-26
 - Bootstrap build
 - Non-bootstrap build

From 31319d0025196da9344dd7dba124491b88c2bd6c Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 2 Nov 2021 15:58:40 +0100
Subject: [PATCH 067/104] 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 <mizdebsk@redhat.com> - 1.2-28
+- Bump Java compiler source/target levels to 1.7
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 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 <releng@fedoraproject.org>
Date: Wed, 19 Jan 2022 21:25:25 +0000
Subject: [PATCH 068/104] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <releng@fedoraproject.org> - 1.2-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-28
 - Bump Java compiler source/target levels to 1.7
 

From e05f2c0c8c1131d2e22b0947e9afc754e08571ae Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Sat, 5 Feb 2022 19:28:16 +0100
Subject: [PATCH 069/104] 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 <jvanek@redhat.com> - 1.2-30
+- Rebuilt for java-17-openjdk as system jdk
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 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 <mizdebsk@redhat.com>
Date: Thu, 12 May 2022 22:33:24 +0200
Subject: [PATCH 070/104] 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 <mizdebsk@redhat.com>
Date: Tue, 14 Jun 2022 08:03:17 +0200
Subject: [PATCH 071/104] 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 <releng@fedoraproject.org>
Date: Wed, 20 Jul 2022 21:00:17 +0000
Subject: [PATCH 072/104] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <releng@fedoraproject.org> - 1.2-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.2-30
 - Rebuilt for java-17-openjdk as system jdk
 

From 5c06dbf6a4d011d07f9cafb3830f963d55f9cbb2 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 31 Aug 2022 08:36:51 +0200
Subject: [PATCH 073/104] 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 <releng@fedoraproject.org>
Date: Wed, 18 Jan 2023 21:54:55 +0000
Subject: [PATCH 074/104] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <releng@fedoraproject.org> - 1.2-32
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 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 <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 13:29:33 +0000
Subject: [PATCH 075/104] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 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 <releng@fedoraproject.org> - 1.2-33
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 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 <loganjerry@gmail.com>
Date: Wed, 19 Jul 2023 15:38:22 -0600
Subject: [PATCH 076/104] 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 <loganjerry@gmail.com> - 1.2-34
+- Update the project URL
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 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 <loganjerry@gmail.com>
Date: Wed, 19 Jul 2023 15:39:45 -0600
Subject: [PATCH 077/104] 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 <loganjerry@gmail.com> - 1.2-34
+- Convert the License tag to SPDX
 - Update the project URL
 
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-33

From c50c7005665ebbb96eb2784d69f49f14b6563c38 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Wed, 19 Jul 2023 15:41:06 -0600
Subject: [PATCH 078/104] 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 <loganjerry@gmail.com> - 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 <mizdebsk@redhat.com>
Date: Thu, 10 Aug 2023 13:21:59 +0200
Subject: [PATCH 079/104] 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 <mizdebsk@redhat.com>
Date: Fri, 1 Sep 2023 15:58:22 +0200
Subject: [PATCH 080/104] 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 <mizdebsk@redhat.com> - 1.2-35
+- Rebuild
+
 * Wed Jul 19 2023 Jerry James <loganjerry@gmail.com> - 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 <mizdebsk@redhat.com>
Date: Mon, 4 Dec 2023 20:30:25 +0100
Subject: [PATCH 081/104] 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 <mizdebsk@redhat.com>
-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.
-   <build>
-     <plugins>
- 
-+      <plugin>
-+        <groupId>org.apache.felix</groupId>
-+        <artifactId>maven-bundle-plugin</artifactId>
-+        <executions>
-+          <execution>
-+            <id>tests-bundle-manifest</id>
-+            <phase>process-classes</phase>
-+            <goals>
-+              <goal>manifest</goal>
-+            </goals>
-+            <configuration>
-+              <manifestLocation>${project.build.directory}/osgi-tests</manifestLocation>
-+              <instructions>
-+                <Bundle-SymbolicName>${commons.osgi.symbolicName}.tests</Bundle-SymbolicName>
-+              </instructions>
-+            </configuration>
-+          </execution>
-+          <execution>
-+            <id>api-bundle-manifest</id>
-+            <phase>process-classes</phase>
-+            <goals>
-+              <goal>manifest</goal>
-+            </goals>
-+            <configuration>
-+              <manifestLocation>${project.build.directory}/osgi-api</manifestLocation>
-+              <instructions>
-+                <Bundle-SymbolicName>${commons.osgi.symbolicName}.api</Bundle-SymbolicName>
-+              </instructions>
-+            </configuration>
-+          </execution>
-+          <execution>
-+            <id>adapters-bundle-manifest</id>
-+            <phase>process-classes</phase>
-+            <goals>
-+              <goal>manifest</goal>
-+            </goals>
-+            <configuration>
-+              <manifestLocation>${project.build.directory}/osgi-adapters</manifestLocation>
-+              <instructions>
-+                <Bundle-SymbolicName>${commons.osgi.symbolicName}.adapters</Bundle-SymbolicName>
-+              </instructions>
-+            </configuration>
-+          </execution>
-+        </executions>
-+      </plugin>
-+
-       <!--
-         - We want to create four jarfiles from this project: normal, tests, api
-         - and adapters. The first two are handled by the normal jar:jar and
-@@ -202,6 +248,9 @@ under the License.
-             </goals>
-             <configuration>
-               <jarName>commons-logging</jarName>
-+              <archive>
-+                <manifestFile>${project.build.directory}/osgi-tests/MANIFEST.MF</manifestFile>
-+              </archive>
-             </configuration>
-           </execution>
- 
-@@ -213,6 +262,9 @@ under the License.
-             </goals>
-             <configuration>
-               <jarName>${project.artifactId}-api-${project.version}</jarName>
-+              <archive>
-+                <manifestFile>${project.build.directory}/osgi-api/MANIFEST.MF</manifestFile>
-+              </archive>
-               <includes>
-                 <include>org/apache/commons/logging/*.class</include>
-                 <include>org/apache/commons/logging/impl/LogFactoryImpl*.class</include>
-@@ -237,6 +289,9 @@ under the License.
-             </goals>
-             <configuration>
-               <jarName>${project.artifactId}-adapters-${project.version}</jarName>
-+              <archive>
-+                <manifestFile>${project.build.directory}/osgi-adapters/MANIFEST.MF</manifestFile>
-+              </archive>
-               <includes>
-                 <include>org/apache/commons/logging/impl/**.class</include>
-                 <include>META-INF/LICENSE.txt</include>
--- 
-2.5.5
-
diff --git a/0002-Port-to-maven-jar-plugin-3.0.0.patch b/0002-Port-to-maven-jar-plugin-3.0.0.patch
deleted file mode 100644
index e1dcfe7..0000000
--- a/0002-Port-to-maven-jar-plugin-3.0.0.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From d8356a58efde0808cabede14b4f1b2473fa73170 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Tue, 31 May 2016 10:52:12 +0200
-Subject: [PATCH 2/2] Port to maven-jar-plugin 3.0.0
-
----
- pom.xml                                            | 47 +++++-----------------
- .../logging/pathable/ChildFirstTestCase.java       |  8 ++--
- .../logging/pathable/ParentFirstTestCase.java      |  8 ++--
- 3 files changed, 17 insertions(+), 46 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 5707595..c5d8d37 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -237,6 +237,10 @@ under the License.
-         <artifactId>maven-jar-plugin</artifactId>
-         <executions>
-           <execution>
-+	    <id>default-jar</id>
-+	    <phase>skip</phase>
-+	  </execution>
-+	  <execution>
-             <!--
-               - The custom test framework requires the unit test code to be
-               - in a jarfile so it can control its place in the classpath.
-@@ -261,7 +265,7 @@ under the License.
-               <goal>jar</goal>
-             </goals>
-             <configuration>
--              <jarName>${project.artifactId}-api-${project.version}</jarName>
-+              <classifier>api</classifier>
-               <archive>
-                 <manifestFile>${project.build.directory}/osgi-api/MANIFEST.MF</manifestFile>
-               </archive>
-@@ -288,7 +292,7 @@ under the License.
-               <goal>jar</goal>
-             </goals>
-             <configuration>
--              <jarName>${project.artifactId}-adapters-${project.version}</jarName>
-+              <classifier>adapters</classifier>
-               <archive>
-                 <manifestFile>${project.build.directory}/osgi-adapters/MANIFEST.MF</manifestFile>
-               </archive>
-@@ -346,39 +350,6 @@ under the License.
- 
-       <plugin>
-         <!--
--          - Attach the adapters and api jars to the normal artifact. This way
--          - they will be deployed when the normal artifact is deployed.
--          -->
--        <groupId>org.codehaus.mojo</groupId>
--        <artifactId>build-helper-maven-plugin</artifactId>
--        <version>1.0</version>
--        <executions>
--          <execution>
--            <id>attach-artifacts</id>
--            <phase>package</phase>
--            <goals>
--              <goal>attach-artifact</goal>
--            </goals>
--            <configuration>
--              <artifacts>
--                <artifact>
--                  <file>${project.build.directory}/${project.artifactId}-adapters-${project.version}.jar</file>
--                  <type>jar</type>
--                  <classifier>adapters</classifier>
--                </artifact>
--                <artifact>
--                  <file>${project.build.directory}/${project.artifactId}-api-${project.version}.jar</file>
--                  <type>jar</type>
--                  <classifier>api</classifier>
--                </artifact>
--              </artifacts>
--            </configuration>
--          </execution>
--        </executions>
--      </plugin>
--
--      <plugin>
--        <!--
-           - Many of JCL's tests use tricky techniques to place the generated
-           - JCL jarfiles on the classpath in various configurations. This means
-           - that those tests must be run *after* the "package" build phase.
-@@ -442,9 +413,9 @@ under the License.
-                   <logkit>${logkit:logkit:jar}</logkit>
-                   <servlet-api>${javax.servlet:servlet-api:jar}</servlet-api>
-                   <commons-logging>target/${project.build.finalName}.jar</commons-logging>
--                  <commons-logging-api>target/${project.artifactId}-api-${project.version}.jar</commons-logging-api>
--                  <commons-logging-adapters>target/${project.artifactId}-adapters-${project.version}.jar</commons-logging-adapters>
--                  <testclasses>target/commons-logging-tests.jar</testclasses>
-+                  <commons-logging-api>target/${project.artifactId}-${project.version}-api.jar</commons-logging-api>
-+                  <commons-logging-adapters>target/${project.artifactId}-${project.version}-adapters.jar</commons-logging-adapters>
-+                  <testclasses>target/commons-logging-${project.version}-tests.jar</testclasses>
-               </systemPropertyVariables>
-             </configuration>
-           </execution>
-diff --git a/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java b/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
-index 1aeb12d..eb67ec1 100644
---- a/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
-+++ b/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
-@@ -213,11 +213,11 @@ public class ChildFirstTestCase extends TestCase {
-         // getResource where it is accessable to both classloaders. The one visible
-         // to the child should be returned. The URL returned will be of form
-         //  jar:file:/x/y.jar!path/to/resource. The filename part should include the jarname
--        // of form commons-logging-adapters-nnnn.jar, not commons-logging-nnnn.jar
-+        // of form commons-logging-nnnn-adapters.jar, not commons-logging-nnnn.jar
-         resource = childLoader.getResource("org/apache/commons/logging/impl/Log4JLogger.class");
-         assertNotNull("Unable to locate Log4JLogger.class resource", resource);
-         assertTrue("Incorrect source for Log4JLogger class",
--                resource.toString().indexOf("/commons-logging-adapters-1.") > 0);
-+                resource.toString().indexOf("/commons-logging-1.2-adapters.jar!") > 0);
-     }
- 
-     /**
-@@ -269,9 +269,9 @@ public class ChildFirstTestCase extends TestCase {
-         urlsToStrings[1] = urls[1].toString();
-         Arrays.sort(urlsToStrings);
-         assertTrue("Incorrect source for Log4JLogger class",
--                urlsToStrings[0].indexOf("/commons-logging-1.") > 0);
-+                urlsToStrings[0].indexOf("/commons-logging-1.2-adapters.jar!") > 0);
-         assertTrue("Incorrect source for Log4JLogger class",
--                urlsToStrings[1].indexOf("/commons-logging-adapters-1.") > 0);
-+                urlsToStrings[1].indexOf("/commons-logging-1.2.jar!") > 0);
-     }
- 
-     /**
-diff --git a/src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java b/src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java
-index f9bf452..fc10c8e 100644
---- a/src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java
-+++ b/src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java
-@@ -210,11 +210,11 @@ public class ParentFirstTestCase extends TestCase {
-         // getResource where it is accessable to both classloaders. The one visible
-         // to the parent should be returned. The URL returned will be of form
-         //  jar:file:/x/y.jar!path/to/resource. The filename part should include the jarname
--        // of form commons-logging-nnnn.jar, not commons-logging-adapters-nnnn.jar
-+        // of form commons-logging-nnnn.jar, not commons-logging-nnnn-adapters.jar
-         resource = childLoader.getResource("org/apache/commons/logging/impl/Log4JLogger.class");
-         assertNotNull("Unable to locate Log4JLogger.class resource", resource);
-         assertTrue("Incorrect source for Log4JLogger class",
--                resource.toString().indexOf("/commons-logging-1.") > 0);
-+                resource.toString().indexOf("/commons-logging-1.2.jar!") > 0);
-     }
-     
-     /**
-@@ -259,9 +259,9 @@ public class ParentFirstTestCase extends TestCase {
-         urlsToStrings[1] = urls[1].toString();
-         Arrays.sort(urlsToStrings);
-         assertTrue("Incorrect source for Log4JLogger class",
--                urlsToStrings[0].indexOf("/commons-logging-1.") > 0);
-+                urlsToStrings[0].indexOf("/commons-logging-1.2-adapters.jar!") > 0);
-         assertTrue("Incorrect source for Log4JLogger class",
--                urlsToStrings[1].indexOf("/commons-logging-adapters-1.") > 0);
-+                urlsToStrings[1].indexOf("/commons-logging-1.2.jar!") > 0);
-         
-     }
- 
--- 
-2.5.5
-
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 7c8a525..f3d64ea 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -1,19 +1,15 @@
 %bcond_with bootstrap
 
 Name:           apache-commons-logging
-Version:        1.2
-Release:        35%{?dist}
+Version:        1.3.0
+Release:        1%{?dist}
 Summary:        Apache Commons Logging
 License:        Apache-2.0
 URL:            https://commons.apache.org/proper/commons-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
-
-Patch0:         0001-Generate-different-Bundle-SymbolicName-for-different.patch
-Patch1:         0002-Port-to-maven-jar-plugin-3.0.0.patch
+Source0:        https://www.apache.org/dist/commons/logging/source/commons-logging-%{version}-src.tar.gz
 
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
@@ -44,13 +40,18 @@ logging implementation.
 %prep
 %autosetup -p1 -n commons-logging-%{version}-src
 
-%pom_remove_dep -r :avalon-framework
-%pom_remove_dep -r :logkit
+%pom_remove_dep :avalon-framework
+%pom_remove_dep :logkit
 rm src/main/java/org/apache/commons/logging/impl/AvalonLogger.java
 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 :log4j
+%pom_remove_dep :log4j-core
+%endif
+
 # Avoid hard-coded versions in OSGi metadata
 %pom_xpath_set "pom:properties/pom:commons.osgi.import" '*;resolution:=optional'
 
@@ -63,15 +64,14 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
 %mvn_file ":commons-logging{*}" "commons-logging@1" "%{name}@1"
 %mvn_alias ":commons-logging{*}" "org.apache.commons:commons-logging@1" "apache:commons-logging@1"
 
+%mvn_package ":::{*}:"
+
 # Remove log4j12 tests
 rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
 
 %build
-%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
-%mvn_artifact commons-logging:commons-logging-adapters:%{version} target/commons-logging-%{version}-adapters.jar
+# missing test dependencies
+%mvn_build -f
 
 %install
 %mvn_install
@@ -81,6 +81,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
 %doc PROPOSAL.html RELEASE-NOTES.txt
 
 %changelog
+* Mon Dec 04 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.0-1
+- Update to upstream version 1.3.0
+
 * Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-35
 - Rebuild
 
diff --git a/sources b/sources
index bff5513..5831927 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (commons-logging-1.2-src.tar.gz) = 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
+SHA512 (commons-logging-1.3.0-src.tar.gz) = 20cc40c7d7848da618801a86333f3984151d3089f806e5d7a1e92c83c1f90d330f1c7ded5d0ae70e48dd9de684f2e5da32de24fa2c406f6b419f77704c0e74f8

From 32daaca6960528b00e8c66475e084890a2c8b1a3 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 26 Oct 2023 07:33:07 +0200
Subject: [PATCH 082/104] Update javapackages test plan to f40

---
 plans/javapackages.fmf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index 8f6c9cb..a2cdaba 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -2,6 +2,6 @@ summary: Run javapackages-specific tests
 discover:
   how: fmf
   url: https://src.fedoraproject.org/tests/javapackages
-  ref: f37
+  ref: f40
 execute:
   how: tmt

From 0ca7b84178bba8e32a2f68b6ae47f52f96a3024c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 13:14:58 +0000
Subject: [PATCH 083/104] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_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 f3d64ea..34f422e 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -2,7 +2,7 @@
 
 Name:           apache-commons-logging
 Version:        1.3.0
-Release:        1%{?dist}
+Release:        2%{?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 Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Mon Dec 04 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.0-1
 - Update to upstream version 1.3.0
 

From 0b8572ef1b0f14ab56ff55010ef749fcc00b77f2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 23:14:24 +0000
Subject: [PATCH 084/104] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_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 34f422e..c3dbef4 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -2,7 +2,7 @@
 
 Name:           apache-commons-logging
 Version:        1.3.0
-Release:        2%{?dist}
+Release:        3%{?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
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 8a4b6c45bc5bfe1c188422543ff60582943ffef0 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Fri, 23 Feb 2024 14:15:18 +0100
Subject: [PATCH 085/104] bump of release for for java-21-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java21
We are sorry, we messed a bit, and we have to bump release in this package
---
 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 c3dbef4..fb7452b 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -2,7 +2,7 @@
 
 Name:           apache-commons-logging
 Version:        1.3.0
-Release:        3%{?dist}
+Release:        4%{?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 Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 1.3.0-4
+- bump of release for for java-21-openjdk as system jdk
+
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 48fadbee1bbd2c507570bd09107906fb9893ff8d Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 27 Feb 2024 14:45:49 +0100
Subject: [PATCH 086/104] Rebuilt for java-21-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java21
---
 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 fb7452b..88b9243 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -2,7 +2,7 @@
 
 Name:           apache-commons-logging
 Version:        1.3.0
-Release:        4%{?dist}
+Release:        5%{?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
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.3.0-5
+- Rebuilt for java-21-openjdk as system jdk
+
 * Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 1.3.0-4
 - bump of release for for java-21-openjdk as system jdk
 

From 165aa46105024438a78178498cfa259a999b3484 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 17:11:50 +0000
Subject: [PATCH 087/104] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_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 88b9243..08f69bf 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -2,7 +2,7 @@
 
 Name:           apache-commons-logging
 Version:        1.3.0
-Release:        5%{?dist}
+Release:        6%{?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
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.3.0-5
 - Rebuilt for java-21-openjdk as system jdk
 

From 85e254f7cc5906a5db78bfa69b2f55935e7d9f11 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 31 Jul 2024 20:53:29 +0200
Subject: [PATCH 088/104] Switch javapackages tests to f41 branch

---
 plans/javapackages.fmf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index a2cdaba..17c6113 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -2,6 +2,6 @@ summary: Run javapackages-specific tests
 discover:
   how: fmf
   url: https://src.fedoraproject.org/tests/javapackages
-  ref: f40
+  ref: f41
 execute:
   how: tmt

From 7e5869fb5922f6674d2f1b070c4430bcecd6d036 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 23 Aug 2024 00:45:01 +0200
Subject: [PATCH 089/104] Convert to %autorelease and %autochangelog

---
 apache-commons-logging.spec | 270 +-----------------------------------
 changelog                   | 267 +++++++++++++++++++++++++++++++++++
 2 files changed, 269 insertions(+), 268 deletions(-)
 create mode 100644 changelog

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 08f69bf..950a102 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -2,7 +2,7 @@
 
 Name:           apache-commons-logging
 Version:        1.3.0
-Release:        6%{?dist}
+Release:        %autorelease
 Summary:        Apache Commons Logging
 License:        Apache-2.0
 URL:            https://commons.apache.org/proper/commons-logging/
@@ -81,270 +81,4 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
 %doc PROPOSAL.html RELEASE-NOTES.txt
 
 %changelog
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.3.0-5
-- Rebuilt for java-21-openjdk as system jdk
-
-* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 1.3.0-4
-- bump of release for for java-21-openjdk as system jdk
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Dec 04 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.0-1
-- Update to upstream version 1.3.0
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-35
-- Rebuild
-
-* Wed Jul 19 2023 Jerry James <loganjerry@gmail.com> - 1.2-34
-- Build with log4j support in non-bootstrap mode
-- Convert the License tag to SPDX
-- Update the project URL
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.2-30
-- Rebuilt for java-17-openjdk as system jdk
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-28
-- Bump Java compiler source/target levels to 1.7
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-26
-- Bootstrap build
-- Non-bootstrap build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Sep 10 2020 Mat Booth <mat.booth@redhat.com> - 1.2-24
-- Build against log4j 2
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.2-22
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu Jun 04 2020 Fabio Valentini <decathorpe@gmail.com> - 1.2-21
-- Override javac source and target versions to fix builds with Java 11.
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Nov 09 2019 Fabio Valentini <decathorpe@gmail.com> - 1.2-19
-- Disable avalon support by default.
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-15
-- Mass rebuild for javapackages-tools 201902
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-14
-- Mass rebuild for javapackages-tools 201901
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Dec 18 2018 Mat Booth <mat.booth@redhat.com> - 1.2-16
-- Fix OSGi metadata
-
-* Mon Dec 17 2018 Mat Booth <mat.booth@redhat.com> - 1.2-15
-- Rebuild to regenerate requires, fixes rhbz#1660117
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Jan 29 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-12
-- Cleanup spec file
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed Mar 22 2017 Michael Simacek <msimacek@redhat.com> - 1.2-10
-- Avoid %%add_maven_depmap
-
-* Mon Feb 13 2017 Michael Simacek <msimacek@redhat.com> - 1.2-9
-- Fix conditional
-
-* Fri Feb 10 2017 Michael Simacek <msimacek@redhat.com> - 1.2-8
-- Use log4j12
-- Add avalon conditional
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue May 31 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-6
-- Port to maven-jar-plugin 3.0.0
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Mar  9 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-3
-- Add aliases for apache groupId
-
-* Tue Jul 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-2
-- Generate different Bundle-SymbolicName for different JARs
-- Resolves: rhbz#1123055
-
-* Sun Jul 20 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-1
-- Update to upstream version 1.2
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue May 13 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-12
-- Disable tests that use log4j12
-
-* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.3-11
-- Use Requires: java-headless rebuild (#1067528)
-
-* Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-10
-- Set logkit dependency scope to provided
-
-* Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-9
-- Set avalon dependency scope to provided
-
-* Wed Jan 22 2014 Michal Srb <msrb@redhat.com> - 1.1.3-8
-- Run all the tests agains
-
-* Sun Aug 11 2013 Michal Srb <msrb@redhat.com> - 1.1.3-7
-- Make this package noarch again (Resolves: rhbz#995756)
-
-* Tue Aug 06 2013 Michal Srb <msrb@redhat.com> - 1.1.3-6
-- Temporarily remove test which fails in koji
-
-* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-5
-- Add missing BR: maven-dependency-plugin, build-helper-maven-plugin
-
-* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-4
-- Add missing BR: maven-failsafe-plugin
-
-* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-3
-- Adapt to current guidelines
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Tue May 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-1
-- Update to upstream version 1.1.3
-- Remove OSGi Bundle-SymbolicName patch (accepted upstream)
-
-* Tue Apr  9 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-2
-- Set OSGi Bundle-SymbolicName to org.apache.commons.logging
-- Resolves: rhbz#949842
-
-* Mon Apr  8 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-1
-- Update to upstream version 1.1.2
-- Convert POM to POM macros
-- Remove OSGi manifest patch; fixed upstream
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.1.1-22
-- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
-- Replace maven BuildRequires with maven-local
-
-* Thu Nov 22 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.1-21
-- Install NOTICE file
-- Resolves: rhbz#879581
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue May 1 2012 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-19
-- Bring back jakarta-commons-logging provides/obsoletes - the comment was misleading.
-
-* Mon Apr 30 2012 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-18
-- Fix build with latest libs.
-- Adapt to current guidelines.
-
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Apr 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-16
-- Build with maven 3
-- Fix build for avalon-framework
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Dec 16 2010 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-14
-- Bring back commons-logging* symlinks.
-
-* Thu Dec 16 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-13
-- Replace tomcat6 BR with servlet25 only
-- Cleanups according to new packaging guidelines
-- Install maven metadata for -api jar
-- Versionless jars/javadocs
-
-* Tue Nov  9 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-12
-- Add depmaps for api and adapters subpackages
-- Use apache-commons-parent BR instead of maven-*
-- Replace tomcat5 BR with tomcat6
-- Reenable tests
-
-* Thu Jul  8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-11
-- Add license to javadoc subpackage
-
-* Wed Jun 9 2010 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-10
-- Add osgi manifest entries.
-
-* Fri May 21 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-9
-- Correct depmap filename for backward compatibility
-
-* Mon May 17 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-8
-- Fix wrong depmap JPP name to short_name
-- Add obsoletes to javadoc subpackage
-
-* Wed May 12 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-7
-- Fix symlink problems introduced previously in r5
-
-* Tue May 11 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-6
-- Add one more add_to_maven_depmap for backward compatibility
-
-* Mon May 10 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-5
-- Fix up add_to_maven_depmap
-- Add jpackage-utils Requires for javadoc
-- Cleanup install a bit
-
-* Fri May  7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-4
-- Fix provides
-
-* Thu May  6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-3
-- Revert to using default permissions
-- Drop "Package" from summary, improve javadoc summary text
-
-* Thu May  6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-2
-- Fix EOLs on docs
-- Create javadoc symlinks during install
-- Use version macro in Source0 URL, use _mavenpomdir macro
-
-* Thu May  6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-1
-- Rename and rebase from jakarta-commons-logging
+%autochangelog
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..f55f8c8
--- /dev/null
+++ b/changelog
@@ -0,0 +1,267 @@
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.3.0-5
+- Rebuilt for java-21-openjdk as system jdk
+
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 1.3.0-4
+- bump of release for for java-21-openjdk as system jdk
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 04 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.0-1
+- Update to upstream version 1.3.0
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-35
+- Rebuild
+
+* Wed Jul 19 2023 Jerry James <loganjerry@gmail.com> - 1.2-34
+- Build with log4j support in non-bootstrap mode
+- Convert the License tag to SPDX
+- Update the project URL
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-33
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-32
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.2-30
+- Rebuilt for java-17-openjdk as system jdk
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-28
+- Bump Java compiler source/target levels to 1.7
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-26
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Sep 10 2020 Mat Booth <mat.booth@redhat.com> - 1.2-24
+- Build against log4j 2
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.2-22
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Thu Jun 04 2020 Fabio Valentini <decathorpe@gmail.com> - 1.2-21
+- Override javac source and target versions to fix builds with Java 11.
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Nov 09 2019 Fabio Valentini <decathorpe@gmail.com> - 1.2-19
+- Disable avalon support by default.
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-15
+- Mass rebuild for javapackages-tools 201902
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-14
+- Mass rebuild for javapackages-tools 201901
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Dec 18 2018 Mat Booth <mat.booth@redhat.com> - 1.2-16
+- Fix OSGi metadata
+
+* Mon Dec 17 2018 Mat Booth <mat.booth@redhat.com> - 1.2-15
+- Rebuild to regenerate requires, fixes rhbz#1660117
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Jan 29 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-12
+- Cleanup spec file
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Mar 22 2017 Michael Simacek <msimacek@redhat.com> - 1.2-10
+- Avoid %%add_maven_depmap
+
+* Mon Feb 13 2017 Michael Simacek <msimacek@redhat.com> - 1.2-9
+- Fix conditional
+
+* Fri Feb 10 2017 Michael Simacek <msimacek@redhat.com> - 1.2-8
+- Use log4j12
+- Add avalon conditional
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue May 31 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-6
+- Port to maven-jar-plugin 3.0.0
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Mar  9 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-3
+- Add aliases for apache groupId
+
+* Tue Jul 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-2
+- Generate different Bundle-SymbolicName for different JARs
+- Resolves: rhbz#1123055
+
+* Sun Jul 20 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-1
+- Update to upstream version 1.2
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue May 13 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-12
+- Disable tests that use log4j12
+
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.3-11
+- Use Requires: java-headless rebuild (#1067528)
+
+* Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-10
+- Set logkit dependency scope to provided
+
+* Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-9
+- Set avalon dependency scope to provided
+
+* Wed Jan 22 2014 Michal Srb <msrb@redhat.com> - 1.1.3-8
+- Run all the tests agains
+
+* Sun Aug 11 2013 Michal Srb <msrb@redhat.com> - 1.1.3-7
+- Make this package noarch again (Resolves: rhbz#995756)
+
+* Tue Aug 06 2013 Michal Srb <msrb@redhat.com> - 1.1.3-6
+- Temporarily remove test which fails in koji
+
+* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-5
+- Add missing BR: maven-dependency-plugin, build-helper-maven-plugin
+
+* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-4
+- Add missing BR: maven-failsafe-plugin
+
+* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-3
+- Adapt to current guidelines
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue May 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-1
+- Update to upstream version 1.1.3
+- Remove OSGi Bundle-SymbolicName patch (accepted upstream)
+
+* Tue Apr  9 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-2
+- Set OSGi Bundle-SymbolicName to org.apache.commons.logging
+- Resolves: rhbz#949842
+
+* Mon Apr  8 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-1
+- Update to upstream version 1.1.2
+- Convert POM to POM macros
+- Remove OSGi manifest patch; fixed upstream
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.1.1-22
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Thu Nov 22 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.1-21
+- Install NOTICE file
+- Resolves: rhbz#879581
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue May 1 2012 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-19
+- Bring back jakarta-commons-logging provides/obsoletes - the comment was misleading.
+
+* Mon Apr 30 2012 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-18
+- Fix build with latest libs.
+- Adapt to current guidelines.
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Apr 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-16
+- Build with maven 3
+- Fix build for avalon-framework
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Dec 16 2010 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-14
+- Bring back commons-logging* symlinks.
+
+* Thu Dec 16 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-13
+- Replace tomcat6 BR with servlet25 only
+- Cleanups according to new packaging guidelines
+- Install maven metadata for -api jar
+- Versionless jars/javadocs
+
+* Tue Nov  9 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-12
+- Add depmaps for api and adapters subpackages
+- Use apache-commons-parent BR instead of maven-*
+- Replace tomcat5 BR with tomcat6
+- Reenable tests
+
+* Thu Jul  8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-11
+- Add license to javadoc subpackage
+
+* Wed Jun 9 2010 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-10
+- Add osgi manifest entries.
+
+* Fri May 21 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-9
+- Correct depmap filename for backward compatibility
+
+* Mon May 17 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-8
+- Fix wrong depmap JPP name to short_name
+- Add obsoletes to javadoc subpackage
+
+* Wed May 12 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-7
+- Fix symlink problems introduced previously in r5
+
+* Tue May 11 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-6
+- Add one more add_to_maven_depmap for backward compatibility
+
+* Mon May 10 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-5
+- Fix up add_to_maven_depmap
+- Add jpackage-utils Requires for javadoc
+- Cleanup install a bit
+
+* Fri May  7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-4
+- Fix provides
+
+* Thu May  6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-3
+- Revert to using default permissions
+- Drop "Package" from summary, improve javadoc summary text
+
+* Thu May  6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-2
+- Fix EOLs on docs
+- Create javadoc symlinks during install
+- Use version macro in Source0 URL, use _mavenpomdir macro
+
+* Thu May  6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-1
+- Rename and rebase from jakarta-commons-logging

From 49d73adaf579a88b44bf07520386da03982caee7 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 23 Aug 2024 13:26:22 +0200
Subject: [PATCH 090/104] Update to upstream version 1.3.4

- Resolves: rhbz#2271286
---
 .gitignore                  |  1 +
 apache-commons-logging.spec | 15 +++++++++------
 sources                     |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2e495bf..21564a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ commons-logging-1.1.1-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
+/commons-logging-1.3.4-src.tar.gz
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 950a102..d77c121 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.0
+Version:        1.3.4
 Release:        %autorelease
 Summary:        Apache Commons Logging
 License:        Apache-2.0
@@ -15,13 +15,16 @@ Source0:        https://www.apache.org/dist/commons/logging/source/commons-loggi
 BuildRequires:  javapackages-bootstrap
 %else
 BuildRequires:  maven-local
-BuildRequires:  mvn(javax.servlet:servlet-api)
-BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(log4j:log4j)
+BuildRequires:  mvn(javax.servlet:javax.servlet-api)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-failsafe-plugin)
+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.codehaus.mojo:build-helper-maven-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)
 %endif
 
 %description
diff --git a/sources b/sources
index 5831927..2bb5c0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (commons-logging-1.3.0-src.tar.gz) = 20cc40c7d7848da618801a86333f3984151d3089f806e5d7a1e92c83c1f90d330f1c7ded5d0ae70e48dd9de684f2e5da32de24fa2c406f6b419f77704c0e74f8
+SHA512 (commons-logging-1.3.4-src.tar.gz) = a4049d8d7ea0d97f337e169fa5f572e32be1882e07102ab004d8b2de74170cb075a251ee9603590d6e10bee5933651e8e33e108a734fc100e8b2d5acd669cb44

From fdfddeb5cfb91dfae7f16706c13241c7f56eaeb4 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 23 Aug 2024 19:32:26 +0200
Subject: [PATCH 091/104] In bootstrap mode build with log4j

---
 apache-commons-logging.spec | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index d77c121..fc203f7 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -50,11 +50,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 :log4j
-%pom_remove_dep :log4j-core
-%endif
-
 # Avoid hard-coded versions in OSGi metadata
 %pom_xpath_set "pom:properties/pom:commons.osgi.import" '*;resolution:=optional'
 

From 42a00541324110806eeba4d9cca79821d8b231ba Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 20 Aug 2024 16:32:53 +0200
Subject: [PATCH 092/104] Use %autosetup -C

---
 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 fc203f7..e64c7d7 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -41,7 +41,7 @@ logging implementation.
 %{?javadoc_package}
 
 %prep
-%autosetup -p1 -n commons-logging-%{version}-src
+%autosetup -p1 -C
 
 %pom_remove_dep :avalon-framework
 %pom_remove_dep :logkit

From ebb441dd2acb2ee8ce1fbdde7ed0e228860fa408 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 29 Nov 2024 08:28:38 +0100
Subject: [PATCH 093/104] Update javapackages test plan to f42

---
 plans/javapackages.fmf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index 17c6113..86bfcea 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -2,6 +2,6 @@ summary: Run javapackages-specific tests
 discover:
   how: fmf
   url: https://src.fedoraproject.org/tests/javapackages
-  ref: f41
+  ref: f42
 execute:
   how: tmt

From 2f6ef55324822456d7b0a7384bcd6408a452becd Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 30 Dec 2024 18:06:35 +0100
Subject: [PATCH 094/104] Explicitly declare javadoc subpackage [skip
 changelog]

---
 apache-commons-logging.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index e64c7d7..81df12e 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -38,7 +38,11 @@ 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.
 
-%{?javadoc_package}
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
 
 %prep
 %autosetup -p1 -C
@@ -78,5 +82,7 @@ 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 fca21b8acb3625892b953125f994e9190a1bf5c7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 11:16:39 +0000
Subject: [PATCH 095/104] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From 75daf2b40712e2c73894fccfd16e9dc25c285e8c Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 3 Mar 2025 11:57:13 +0100
Subject: [PATCH 096/104] 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 <mizdebsk@redhat.com>
Date: Wed, 26 Mar 2025 08:43:18 +0100
Subject: [PATCH 097/104] 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 <mizdebsk@redhat.com>
Date: Thu, 22 May 2025 13:35:31 +0200
Subject: [PATCH 098/104] 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 <mizdebsk@redhat.com>
Date: Sun, 13 Jul 2025 09:22:51 +0200
Subject: [PATCH 099/104] 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 <mizdebsk@redhat.com>
Date: Wed, 16 Jul 2025 21:00:17 +0200
Subject: [PATCH 100/104] 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 <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 17:06:10 +0000
Subject: [PATCH 101/104] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 757a901f64387ec0cce95ed6e9c51789850a7ad2 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 29 Jul 2025 19:06:34 +0200
Subject: [PATCH 102/104] 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 <mizdebsk@redhat.com>
Date: Tue, 9 Sep 2025 12:18:13 +0200
Subject: [PATCH 103/104] 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 <releng@fedoraproject.org>
Date: Fri, 16 Jan 2026 03:47:24 +0000
Subject: [PATCH 104/104] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild