.apache-commons-logging.metadata

@@ -1 +0,0 @@
-0a134d01e9aeb09b33f4c7450fb41abb7bed9db6 SOURCES/commons-logging-1.2-src.tar.gz

.gitignore

@@ -1 +1,4 @@
-SOURCES/commons-logging-1.2-src.tar.gz
+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

apache-commons-logging.spec

@@ -1,6 +1,8 @@
+%bcond_without  avalon
+
 Name:           apache-commons-logging
 Version:        1.2
-Release:        15%{?dist}
+Release:        13%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/logging
@@ -13,6 +15,11 @@ 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)
@@ -32,17 +39,25 @@ 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
 %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
@@ -57,8 +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
-# Test failures, need to investigate and fix them
+%mvn_build
-%mvn_build -f -- -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
@@ -67,17 +81,11 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
 %install
 %mvn_install
 
-%files -n %{?module_prefix}%{name} -f .mfiles
+%files -f .mfiles
 %license LICENSE.txt NOTICE.txt
 %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
-
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

sources

@@ -0,0 +1 @@
+SHA512 (commons-logging-1.2-src.tar.gz) = 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9