Accepting request 645239 from Java:packages

Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/645239 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slf4j?expand=0&rev=17
2018-11-08 08:41:42 +00:00 · 2018-11-08 08:41:42 +00:00 · fac67450b5
commit fac67450b5
parent a9a0394b93 6c8141a807
6 changed files with 46 additions and 36 deletions
--- a/build.xml.tar.bz2
+++ b/build.xml.tar.bz2
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d028e763f0f348c984cee358c16bfea455789f3afe7b31df72a2e963cc44302f
-size 9483
+oid sha256:47fcab9d522d847ae071f634544b08f3067c577873d20968443e9058878100ce
+size 9111
--- a/slf4j-1.7.12.tar.gz
+++ b/slf4j-1.7.12.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee93f7baa5d0e3db5fc130f5216750059992bfa0e5cb618a808428edf2fc28a1
-size 3067708
--- a/slf4j-1.7.25.tar.gz
+++ b/slf4j-1.7.25.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ba21df417eb2ec444d4ffc0060809f9dc787fa16a3e7294cb0dc2fa9f0e458e
+size 3435003
--- a/slf4j-commons-lang3.patch
+++ b/slf4j-commons-lang3.patch
@ -1,5 +1,5 @@
--- 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
+--- slf4j-1.7.25/site/apidocs/org/slf4j/ext/MDCStrLookup.html	2017-03-16 17:20:38.000000000 +0100
+++ slf4j-1.7.25/site/apidocs/org/slf4j/ext/MDCStrLookup.html	2018-10-22 12:34:24.777760087 +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>
@ -12,7 +12,7 @@
@@ -103,7 +103,7 @@
 <hr>
 <br>
- <pre>public class <span class="strong">MDCStrLookup</span>
+ <pre>public class <a href="../../../src-html/org/slf4j/ext/MDCStrLookup.html#line.36">MDCStrLookup</a>
 -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
@ -40,8 +40,8 @@
 <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
+--- slf4j-1.7.25/site/apidocs/org/slf4j/ext/package-tree.html	2017-03-16 17:20:39.000000000 +0100
+++ slf4j-1.7.25/site/apidocs/org/slf4j/ext/package-tree.html	2018-10-22 12:34:02.781643219 +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>
@ -51,9 +51,9 @@
 <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 @@
+--- slf4j-1.7.25/site/apidocs/overview-tree.html	2017-03-16 17:20:42.000000000 +0100
+++ slf4j-1.7.25/site/apidocs/overview-tree.html	2018-10-22 12:34:02.781643219 +0200
+@@ -198,7 +198,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>
@ -62,9 +62,9 @@
 <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 @@
+--- slf4j-1.7.25/site/extensions.html	2017-03-16 17:21:57.000000000 +0100
+++ slf4j-1.7.25/site/extensions.html	2018-10-22 12:34:02.781643219 +0200
+@@ -602,7 +602,7 @@
   where data is a reference to the EventData object.</p>
 
   <pre class="prettyprint source">import org.slf4j.MDC;
@ -73,7 +73,7 @@
 
 import javax.servlet.Filter;
 import javax.servlet.FilterConfig;
-@@ -828,7 +828,7 @@
+@@ -832,7 +832,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:
@ -82,9 +82,9 @@
     </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 @@
+--- slf4j-1.7.25/site/news.html	2017-03-16 17:21:57.000000000 +0100
+++ slf4j-1.7.25/site/news.html	2018-10-22 12:34:02.781643219 +0200
+@@ -966,7 +966,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
@ -93,8 +93,8 @@
   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
+--- slf4j-1.7.25/site/xref/org/slf4j/ext/MDCStrLookup.html	2017-03-16 17:20:31.000000000 +0100
+++ slf4j-1.7.25/site/xref/org/slf4j/ext/MDCStrLookup.html	2018-10-22 12:34:02.781643219 +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;
@ -104,8 +104,8 @@
 <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
+--- slf4j-1.7.25/slf4j-ext/src/main/java/org/slf4j/ext/MDCStrLookup.java	2016-12-22 19:54:22.000000000 +0100
+++ slf4j-1.7.25/slf4j-ext/src/main/java/org/slf4j/ext/MDCStrLookup.java	2018-10-22 12:34:02.781643219 +0200
@@ -24,7 +24,7 @@
  */
 package org.slf4j.ext;
@ -115,9 +115,9 @@
 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 @@
+--- slf4j-1.7.25/slf4j-site/src/site/pages/extensions.html	2016-12-22 19:54:23.000000000 +0100
+++ slf4j-1.7.25/slf4j-site/src/site/pages/extensions.html	2018-10-22 12:34:02.781643219 +0200
+@@ -602,7 +602,7 @@
   where data is a reference to the EventData object.</p>
 
   <pre class="prettyprint source">import org.slf4j.MDC;
@ -126,7 +126,7 @@
 
 import javax.servlet.Filter;
 import javax.servlet.FilterConfig;
-@@ -828,7 +828,7 @@
+@@ -832,7 +832,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:
@ -135,9 +135,9 @@
     </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 @@
+--- slf4j-1.7.25/slf4j-site/src/site/pages/news.html	2017-03-16 17:16:09.000000000 +0100
+++ slf4j-1.7.25/slf4j-site/src/site/pages/news.html	2018-10-22 12:34:02.785643241 +0200
+@@ -966,7 +966,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
--- a/slf4j.changes
+++ b/slf4j.changes
@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Oct 22 10:44:00 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to 1.7.25
+- Modify the build.xml file tarball to correspond to the right
+  version
+- Modify slf4j-commons-lang3.patch to the new context
+
 -------------------------------------------------------------------
 Mon Oct 15 14:52:23 UTC 2018 - Fridrich Strba <fstrba@suse.com>

--- a/slf4j.spec
+++ b/slf4j.spec
@ -18,7 +18,7 @@


 Name:           slf4j
-Version:        1.7.12
+Version:        1.7.25
 Release:        0
 Summary:        Simple Logging Facade for Java
 License:        MIT
@ -138,13 +138,15 @@ install -m 644 slf4j-simple/target/%{name}-simple-%{version}.jar \
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 for i in api ext jcl jdk14 log4j12 migrator nop simple; do
-install -pm 644 slf4j-$i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-$i.pom
-%add_maven_depmap %{name}-$i.pom %{name}/$i.jar
+  install -pm 644 slf4j-$i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-$i.pom
+  %add_maven_depmap %{name}-$i.pom %{name}/$i.jar
 done
 for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
-install -pm 644 $i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-$i.pom
-%add_maven_depmap %{name}-$i.pom %{name}/$i.jar
+  install -pm 644 $i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-$i.pom
+  %add_maven_depmap %{name}-$i.pom %{name}/$i.jar
 done
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom

 # manual
 install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version}