rpms/apache-commons-logging
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Build against log4j 2

Browse Source
This commit is contained in:
Mat Booth 2020-09-10 14:16:23 +01:00
parent b8d64490f5
commit 0f441ea6e2
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apache-commons-logging.spec
View File

@ -2,7 +2,7 @@
Name: apache-commons-logging Name: apache-commons-logging
Version: 1.2 Version: 1.2
Release: 23%{?dist} Release: 24%{?dist}
Summary: Apache Commons Logging Summary: Apache Commons Logging
License: ASL 2.0 License: ASL 2.0
URL: http://commons.apache.org/logging URL: http://commons.apache.org/logging
@ -22,7 +22,7 @@ BuildRequires: mvn(logkit:logkit)
%endif %endif
BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(javax.servlet:servlet-api)
BuildRequires: mvn(junit:junit) 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.commons:commons-parent:pom:)
BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-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 rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java
%endif %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 :cobertura-maven-plugin
%pom_remove_plugin :maven-scm-publish-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 %doc PROPOSAL.html RELEASE-NOTES.txt
%changelog %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 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild