From 886ce2617017409e9a3d6c2f9b31dce03667c2e2 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Feb 10 2017 12:36:12 +0000 Subject: Use log4j12 --- diff --git a/apache-commons-configuration.spec b/apache-commons-configuration.spec index 4aafa44..9ad8637 100644 --- a/apache-commons-configuration.spec +++ b/apache-commons-configuration.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Commons Configuration Package License: ASL 2.0 @@ -20,12 +20,10 @@ BuildRequires: mvn(commons-jxpath:commons-jxpath) BuildRequires: mvn(commons-lang:commons-lang) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(javax.servlet:servlet-api) -BuildRequires: mvn(log4j:log4j) +BuildRequires: mvn(log4j:log4j:1.2.17) BuildRequires: mvn(org.apache.commons:commons-jexl) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.commons:commons-vfs2) -BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin) BuildRequires: mvn(xml-apis:xml-apis) BuildRequires: mvn(xml-resolver:xml-resolver) @@ -53,7 +51,9 @@ Summary: API documentation for %{name} %prep %setup -q -n %{short_name}-%{version}-src -%{__sed} -i 's/\r//' LICENSE.txt NOTICE.txt +sed -i 's/\r//' LICENSE.txt NOTICE.txt + +%pom_change_dep :log4j ::1.2.17 %build %mvn_file : %{short_name} %{name} @@ -72,6 +72,9 @@ Summary: API documentation for %{name} %changelog +* Fri Feb 10 2017 Michael Simacek - 1.10-8 +- Use log4j12 + * Fri Feb 10 2017 Fedora Release Engineering - 1.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild