diff --git a/slf4j-commons-lang3.patch b/slf4j-commons-lang3.patch new file mode 100644 index 0000000..fe42bd9 --- /dev/null +++ b/slf4j-commons-lang3.patch @@ -0,0 +1,148 @@ +--- slf4j-1.7.12/site/apidocs/org/slf4j/ext/MDCStrLookup.html 2015-03-26 21:53:53.000000000 +0100 ++++ slf4j-1.7.12/site/apidocs/org/slf4j/ext/MDCStrLookup.html 2017-10-11 11:04:42.023698060 +0200 +@@ -88,7 +88,7 @@ +
public class MDCStrLookup
+-extends org.apache.commons.lang.text.StrLookup
++extends org.apache.commons.lang3.text.StrLookup
+ mapLookup, noneLookup, systemPropertiesLookup
lookup
in class org.apache.commons.lang.text.StrLookup
lookup
in class org.apache.commons.lang3.text.StrLookup
key
- the key to be looked up, may be nullimport org.slf4j.MDC; +-import org.apache.commons.lang.time.DateUtils; ++import org.apache.commons.lang3.time.DateUtils; + + import javax.servlet.Filter; + import javax.servlet.FilterConfig; +@@ -828,7 +828,7 @@ +Some classes may misbehave when being rendered with "object.toString()" so they may be explicitly disabled + in the logback configuration file permanently. For instance the ToStringBuilder in the Apache Jakarta commons lang + package is a prime candidate for this. For logback add this snippet to logback.xml: +-
<logger name="org.apache.commons.lang.builder" level="OFF" />++<logger name="org.apache.commons.lang3.builder" level="OFF" />+ + + +--- slf4j-1.7.12/site/news.html 2015-03-26 21:55:24.000000000 +0100 ++++ slf4j-1.7.12/site/news.html 2017-10-11 11:04:42.023698060 +0200 +@@ -674,7 +674,7 @@ + used with Apache Commons Lang'sStrSubstitutor
class to + inject values in the SLF4J MDC into strings. Information on + StrSubstitutor can be found at StrSubstitutor ++ href="http://commons.apache.org/lang/api-release/org/apache/commons/lang3/text/StrSubstitutor.html">StrSubstitutor + javadoc. + + +--- slf4j-1.7.12/site/xref/org/slf4j/ext/MDCStrLookup.html 2015-03-26 21:53:47.000000000 +0100 ++++ slf4j-1.7.12/site/xref/org/slf4j/ext/MDCStrLookup.html 2017-10-11 11:04:42.023698060 +0200 +@@ -34,7 +34,7 @@ + 24 */ + 25 package org.slf4j.ext; + 26 +-27 import org.apache.commons.lang.text.StrLookup; ++27 import org.apache.commons.lang3.text.StrLookup; + 28 import org.slf4j.MDC; + 29 + 30 /** +--- slf4j-1.7.12/slf4j-ext/src/main/java/org/slf4j/ext/MDCStrLookup.java 2015-03-26 12:50:00.000000000 +0100 ++++ slf4j-1.7.12/slf4j-ext/src/main/java/org/slf4j/ext/MDCStrLookup.java 2017-10-11 11:04:42.023698060 +0200 +@@ -24,7 +24,7 @@ + */ + package org.slf4j.ext; + +-import org.apache.commons.lang.text.StrLookup; ++import org.apache.commons.lang3.text.StrLookup; + import org.slf4j.MDC; + + /** +--- slf4j-1.7.12/slf4j-site/src/site/pages/extensions.html 2014-01-30 21:00:30.000000000 +0100 ++++ slf4j-1.7.12/slf4j-site/src/site/pages/extensions.html 2017-10-11 11:04:42.027698060 +0200 +@@ -598,7 +598,7 @@ + where data is a reference to the EventData object. + +import org.slf4j.MDC; +-import org.apache.commons.lang.time.DateUtils; ++import org.apache.commons.lang3.time.DateUtils; + + import javax.servlet.Filter; + import javax.servlet.FilterConfig; +@@ -828,7 +828,7 @@ +Some classes may misbehave when being rendered with "object.toString()" so they may be explicitly disabled + in the logback configuration file permanently. For instance the ToStringBuilder in the Apache Jakarta commons lang + package is a prime candidate for this. For logback add this snippet to logback.xml: +-
<logger name="org.apache.commons.lang.builder" level="OFF" />++<logger name="org.apache.commons.lang3.builder" level="OFF" />+ + + +--- slf4j-1.7.12/slf4j-site/src/site/pages/news.html 2015-03-26 17:34:45.000000000 +0100 ++++ slf4j-1.7.12/slf4j-site/src/site/pages/news.html 2017-10-11 11:04:42.027698060 +0200 +@@ -674,7 +674,7 @@ + used with Apache Commons Lang'sStrSubstitutor
class to + inject values in the SLF4J MDC into strings. Information on + StrSubstitutor can be found at StrSubstitutor ++ href="http://commons.apache.org/lang/api-release/org/apache/commons/lang3/text/StrSubstitutor.html">StrSubstitutor + javadoc. + + diff --git a/slf4j.changes b/slf4j.changes index bb55566..67c0e53 100644 --- a/slf4j.changes +++ b/slf4j.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 11 09:08:10 UTC 2017 - fstrba@suse.com + +- Adeed patch: + * slf4j-commons-lang3.patch + + Use apache-commons-lang3 instead of apache-commons-lang + ------------------------------------------------------------------- Sun Sep 10 13:38:22 UTC 2017 - fstrba@suse.com diff --git a/slf4j.spec b/slf4j.spec index bee790c..4ec1fac 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -27,9 +27,10 @@ Url: http://www.slf4j.org/ Source0: http://www.slf4j.org/dist/%{name}-%{version}.tar.gz Source1: build.xml.tar.bz2 Patch1: build-remove-slf4j_api-binder.patch +Patch2: slf4j-commons-lang3.patch BuildRequires: ant >= 1.6.5 BuildRequires: ant-junit >= 1.6.5 -BuildRequires: apache-commons-lang +BuildRequires: apache-commons-lang3 BuildRequires: apache-commons-logging BuildRequires: cal10n BuildRequires: java-devel >= 1.5.0 @@ -75,6 +76,7 @@ Manual for %{name}. %setup -q tar xjf %{SOURCE1} %patch1 -p1 +%patch2 -p1 find . -name "*.jar" | xargs rm sed -i -e "s|ant<|org.apache.ant<|g" integration/pom.xml @@ -94,7 +96,7 @@ sed -i "/Import-Package/s/.$/;resolution:=optional&/" slf4j-api/src/main/resourc %build export CLASSPATH=$(build-classpath log4j \ commons-logging \ - commons-lang \ + commons-lang3 \ javassist-3.14.0 \ cal10n) export CLASSPATH=$CLASSPATH:$(pwd)/slf4j-api/target/slf4j-api-%{version}.jar