From af7716cb25630b0bd14ccd29827990a9589738094e4b8c000413a092fdcc88a0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 22 Oct 2018 10:45:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/slf4j?expand=0&rev=34 --- build.xml.tar.bz2 | 4 +-- slf4j-1.7.12.tar.gz | 3 --- slf4j-1.7.25.tar.gz | 3 +++ slf4j-commons-lang3.patch | 52 +++++++++++++++++++-------------------- slf4j.changes | 8 ++++++ slf4j.spec | 2 +- 6 files changed, 40 insertions(+), 32 deletions(-) delete mode 100644 slf4j-1.7.12.tar.gz create mode 100644 slf4j-1.7.25.tar.gz diff --git a/build.xml.tar.bz2 b/build.xml.tar.bz2 index b98ffaa..8b8bd96 100644 --- 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 diff --git a/slf4j-1.7.12.tar.gz b/slf4j-1.7.12.tar.gz deleted file mode 100644 index f237458..0000000 --- a/slf4j-1.7.12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee93f7baa5d0e3db5fc130f5216750059992bfa0e5cb618a808428edf2fc28a1 -size 3067708 diff --git a/slf4j-1.7.25.tar.gz b/slf4j-1.7.25.tar.gz new file mode 100644 index 0000000..c4e481d --- /dev/null +++ b/slf4j-1.7.25.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ba21df417eb2ec444d4ffc0060809f9dc787fa16a3e7294cb0dc2fa9f0e458e +size 3435003 diff --git a/slf4j-commons-lang3.patch b/slf4j-commons-lang3.patch index fe42bd9..dce662b 100644 --- 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 @@
  • java.lang.Object
  • @@ -12,7 +12,7 @@ @@ -103,7 +103,7 @@

    - 
    public class MDCStrLookup
+ 
    public class MDCStrLookup
 -extends org.apache.commons.lang.text.StrLookup
    
 +extends org.apache.commons.lang3.text.StrLookup
    This class can be used with the Commons Lang StrSubstitutor to replace @@ -40,8 +40,8 @@
    Parameters:
    key - the key to be looked up, may be null
    Returns:
    the matching value, null if no match
    • ---- 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 @@
  • org.slf4j.ext.XLogger (implements org.slf4j.Logger)
    • @@ -51,9 +51,9 @@ ---- 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 @@
  • org.slf4j.impl.StaticMarkerBinder (implements org.slf4j.spi.MarkerFactoryBinder)
  • org.slf4j.impl.StaticMDCBinder
  • org.slf4j.profiler.StopWatch (implements org.slf4j.profiler.TimeInstrument)
    • @@ -62,9 +62,9 @@ ---- 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.

    import org.slf4j.MDC;
@@ -73,7 +73,7 @@
  
  import javax.servlet.Filter;
  import javax.servlet.FilterConfig;
-@@ -828,7 +828,7 @@
+@@ -832,7 +832,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:
@@ -82,9 +82,9 @@
      
    
      
  
---- 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 StrSubstitutor class to
    inject values in the SLF4J MDC into strings. Information on
    StrSubstitutor can be found at .
    
    
  
---- 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 @@
      24   */
  25  package org.slf4j.ext;
@@ -104,8 +104,8 @@
  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
+--- 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.
    
  
    
    import org.slf4j.MDC;
@@ -126,7 +126,7 @@
  
  import javax.servlet.Filter;
  import javax.servlet.FilterConfig;
-@@ -828,7 +828,7 @@
+@@ -832,7 +832,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:
@@ -135,9 +135,9 @@
      
    
      
  
---- 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 StrSubstitutor class to
    inject values in the SLF4J MDC into strings. Information on
    StrSubstitutor can be found at 
+
+- 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 
 
diff --git a/slf4j.spec b/slf4j.spec
index a5c8a30..41d3439 100644
--- 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