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 01/30] 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 02/30] 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 03/30] 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 04/30] 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 05/30] 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 06/30] 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 07/30] 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 08/30] 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 09/30] 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 10/30] 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 11/30] 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 12/30] 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 13/30] 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 14/30] 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 15/30] 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 16/30] 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 17/30] 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 18/30] 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 19/30] 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 20/30] 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 21/30] 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 22/30] 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 23/30] 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 24/30] 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 25/30] 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 26/30] 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 27/30] 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 28/30] 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 29/30] 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 30/30] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild