Use apache-commons-lang3 instead of apache-commons-lang3

OBS-URL: https://build.opensuse.org/package/show/Java:packages/slf4j?expand=0&rev=27

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 @@
+ <li><a href="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+ <li>
+ <ul class="inheritance">
+-<li>org.apache.commons.lang.text.StrLookup</li>
++<li>org.apache.commons.lang3.text.StrLookup</li>
+ <li>
+ <ul class="inheritance">
+ <li>org.slf4j.ext.MDCStrLookup</li>
+@@ -103,7 +103,7 @@
+ <hr>
+ <br>
+ <pre>public class <span class="strong">MDCStrLookup</span>
+-extends org.apache.commons.lang.text.StrLookup</pre>
++extends org.apache.commons.lang3.text.StrLookup</pre>
+ <div class="block">This class can be used with the Commons Lang StrSubstitutor to replace
+  tokens that occur in Strings with their values in the MDC.</div>
+ <dl><dt><span class="strong">Author:</span></dt>
+@@ -151,10 +151,10 @@
+ </tr>
+ </table>
+ <ul class="blockList">
+-<li class="blockList"><a name="methods_inherited_from_class_org.apache.commons.lang.text.StrLookup">
++<li class="blockList"><a name="methods_inherited_from_class_org.apache.commons.lang3.text.StrLookup">
+ <!--   -->
+ </a>
+-<h3>Methods inherited from class&nbsp;org.apache.commons.lang.text.StrLookup</h3>
++<h3>Methods inherited from class&nbsp;org.apache.commons.lang3.text.StrLookup</h3>
+ <code>mapLookup, noneLookup, systemPropertiesLookup</code></li>
+ </ul>
+ <ul class="blockList">
+@@ -205,7 +205,7 @@
+ <div class="block">Looks up up a value in the MDC.</div>
+ <dl>
+ <dt><strong>Specified by:</strong></dt>
+-<dd><code>lookup</code>&nbsp;in class&nbsp;<code>org.apache.commons.lang.text.StrLookup</code></dd>
++<dd><code>lookup</code>&nbsp;in class&nbsp;<code>org.apache.commons.lang3.text.StrLookup</code></dd>
+ <dt><span class="strong">Parameters:</span></dt><dd><code>key</code> - the key to be looked up, may be null</dd>
+ <dt><span class="strong">Returns:</span></dt><dd>the matching value, null if no match</dd></dl>
+ </li>
+--- slf4j-1.7.12/site/apidocs/org/slf4j/ext/package-tree.html	2015-03-26 21:53:53.000000000 +0100
++++ slf4j-1.7.12/site/apidocs/org/slf4j/ext/package-tree.html	2017-10-11 11:04:42.023698060 +0200
+@@ -82,7 +82,7 @@
+ <li type="circle">org.slf4j.ext.<a href="../../../org/slf4j/ext/XLogger.html" title="class in org.slf4j.ext"><span class="strong">XLogger</span></a> (implements org.slf4j.<a href="../../../org/slf4j/Logger.html" title="interface in org.slf4j">Logger</a>)</li>
+ </ul>
+ </li>
+-<li type="circle">org.apache.commons.lang.text.StrLookup
++<li type="circle">org.apache.commons.lang3.text.StrLookup
+ <ul>
+ <li type="circle">org.slf4j.ext.<a href="../../../org/slf4j/ext/MDCStrLookup.html" title="class in org.slf4j.ext"><span class="strong">MDCStrLookup</span></a></li>
+ </ul>
+--- slf4j-1.7.12/site/apidocs/overview-tree.html	2015-03-26 21:53:54.000000000 +0100
++++ slf4j-1.7.12/site/apidocs/overview-tree.html	2017-10-11 11:04:42.023698060 +0200
+@@ -194,7 +194,7 @@
+ <li type="circle">org.slf4j.impl.<a href="org/slf4j/impl/StaticMarkerBinder.html" title="class in org.slf4j.impl"><span class="strong">StaticMarkerBinder</span></a> (implements org.slf4j.spi.<a href="org/slf4j/spi/MarkerFactoryBinder.html" title="interface in org.slf4j.spi">MarkerFactoryBinder</a>)</li>
+ <li type="circle">org.slf4j.impl.<a href="org/slf4j/impl/StaticMDCBinder.html" title="class in org.slf4j.impl"><span class="strong">StaticMDCBinder</span></a></li>
+ <li type="circle">org.slf4j.profiler.<a href="org/slf4j/profiler/StopWatch.html" title="class in org.slf4j.profiler"><span class="strong">StopWatch</span></a> (implements org.slf4j.profiler.<a href="org/slf4j/profiler/TimeInstrument.html" title="interface in org.slf4j.profiler">TimeInstrument</a>)</li>
+-<li type="circle">org.apache.commons.lang.text.StrLookup
++<li type="circle">org.apache.commons.lang3.text.StrLookup
+ <ul>
+ <li type="circle">org.slf4j.ext.<a href="org/slf4j/ext/MDCStrLookup.html" title="class in org.slf4j.ext"><span class="strong">MDCStrLookup</span></a></li>
+ </ul>
+--- slf4j-1.7.12/site/extensions.html	2015-03-26 21:55:24.000000000 +0100
++++ slf4j-1.7.12/site/extensions.html	2017-10-11 11:04:42.023698060 +0200
+@@ -598,7 +598,7 @@
+   where data is a reference to the EventData object.</p>
+ 
+   <pre class="prettyprint source">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 @@
+     <p>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:
+-    <pre>&lt;logger name="org.apache.commons.lang.builder" level="OFF" /&gt;</pre>
++    <pre>&lt;logger name="org.apache.commons.lang3.builder" level="OFF" /&gt;</pre>
+     </p>
+     
+ 
+--- 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's <code>StrSubstitutor</code> class to
+   inject values in the SLF4J MDC into strings. Information on
+   StrSubstitutor can be found at <a
+-  href="http://commons.apache.org/lang/api-release/org/apache/commons/lang/text/StrSubstitutor.html">StrSubstitutor
++  href="http://commons.apache.org/lang/api-release/org/apache/commons/lang3/text/StrSubstitutor.html">StrSubstitutor
+   javadoc</a>.
+   </p>
+ 
+--- 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 @@
+ <a class="jxr_linenumber" name="24" href="#24">24</a>  <em class="jxr_javadoccomment"> */</em>
+ <a class="jxr_linenumber" name="25" href="#25">25</a>  <strong class="jxr_keyword">package</strong> org.slf4j.ext;
+ <a class="jxr_linenumber" name="26" href="#26">26</a>  
+-<a class="jxr_linenumber" name="27" href="#27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang.text.StrLookup;
++<a class="jxr_linenumber" name="27" href="#27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.lang3.text.StrLookup;
+ <a class="jxr_linenumber" name="28" href="#28">28</a>  <strong class="jxr_keyword">import</strong> org.slf4j.MDC;
+ <a class="jxr_linenumber" name="29" href="#29">29</a>  
+ <a class="jxr_linenumber" name="30" href="#30">30</a>  <em class="jxr_javadoccomment">/**</em>
+--- 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.</p>
+ 
+   <pre class="prettyprint source">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 @@
+     <p>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:
+-    <pre>&lt;logger name="org.apache.commons.lang.builder" level="OFF" /&gt;</pre>
++    <pre>&lt;logger name="org.apache.commons.lang3.builder" level="OFF" /&gt;</pre>
+     </p>
+     
+ 
+--- 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's <code>StrSubstitutor</code> class to
+   inject values in the SLF4J MDC into strings. Information on
+   StrSubstitutor can be found at <a
+-  href="http://commons.apache.org/lang/api-release/org/apache/commons/lang/text/StrSubstitutor.html">StrSubstitutor
++  href="http://commons.apache.org/lang/api-release/org/apache/commons/lang3/text/StrSubstitutor.html">StrSubstitutor
+   javadoc</a>.
+   </p>
+ 

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
 

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