start work on 2.0.3-SNAPSHOT, fix SLF4J-564

qos-ch · Sep 21, 2022 · eb1710a · eb1710a
1 parent bb49a5a
commit eb1710a
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 30 deletions.
diff --git a/integration/pom.xml b/integration/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>integration</artifactId>

diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>jul-to-slf4j</artifactId>

diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
 

diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>osgi-over-slf4j</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>org.slf4j</groupId>
   <artifactId>slf4j-parent</artifactId>
-  <version>2.0.2</version>
+  <version>2.0.3-SNAPSHOT</version>
 
   <packaging>pom</packaging>
   <name>SLF4J</name>

diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>slf4j-api</artifactId>

diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/AbstractLogger.java b/slf4j-api/src/main/java/org/slf4j/helpers/AbstractLogger.java
@@ -407,17 +407,17 @@ private void handleArgArrayCall(Level level, Marker marker, String msg, Object[]
     abstract protected String getFullyQualifiedCallerName();
 
     /**
-     * Given various arguments passed as parameters perform actual logging. 
+     * Given various arguments passed as parameters, perform actual logging.
      * 
      * <p>This method assumes that the separation of the args array into actual
      * objects and a throwable has been already operated.
      * 
-     * @param level
-     * @param marker
-     * @param msg
-     * @param arguments
-     * @param throwable
+     * @param level the SLF4J level for this event
+     * @param marker  The marker to be used for this event, may be null.
+     * @param messagePattern The message pattern which will be parsed and formatted
+     * @param arguments  the array of arguments to be formatted, may be null
+     * @param throwable  The exception whose stack trace should be logged, may be null
      */
-    abstract protected void handleNormalizedLoggingCall(Level level, Marker marker, String msg, Object[] arguments, Throwable throwable);
+    abstract protected void handleNormalizedLoggingCall(Level level, Marker marker, String messagePattern, Object[] arguments, Throwable throwable);
 
 }
diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>slf4j-ext</artifactId>

diff --git a/slf4j-jdk-platform-logging/pom.xml b/slf4j-jdk-platform-logging/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>slf4j-parent</artifactId>
     <groupId>org.slf4j</groupId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>slf4j-jdk-platform-logging</artifactId>

diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>slf4j-jdk14</artifactId>

diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>slf4j-log4j12</artifactId>

diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>slf4j-migrator</artifactId>

diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>slf4j-nop</artifactId>

diff --git a/slf4j-reload4j/pom.xml b/slf4j-reload4j/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>slf4j-reload4j</artifactId>

diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>slf4j-simple</artifactId>

diff --git a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java
@@ -354,17 +354,18 @@ public boolean isErrorEnabled() {
     }
 
     /**
-     * This is our internal implementation for logging regular (non-parameterized)
-     * log messages.
+     * SimpleLogger's implementation of
+     * {@link org.slf4j.helpers.AbstractLogger#handleNormalizedLoggingCall(Level, Marker, String, Object[], Throwable) AbstractLogger#handleNormalizedLoggingCall}
+     * }
      *
-     * @param level          One of the LOG_LEVEL_XXX constants defining the log level
-     * @param marker         The marker to be used for this event, may be null.
+     * @param level the SLF4J level for this event
+     * @param marker  The marker to be used for this event, may be null.
      * @param messagePattern The message pattern which will be parsed and formatted
-     * @param arguments      The array of arguments
-     * @param t              The exception whose stack trace should be logged
+     * @param arguments  the array of arguments to be formatted, may be null
+     * @param throwable  The exception whose stack trace should be logged, may be null
      */
     @Override
-    protected void handleNormalizedLoggingCall(Level level, Marker marker, String messagePattern, Object[] arguments, Throwable t) {
+    protected void handleNormalizedLoggingCall(Level level, Marker marker, String messagePattern, Object[] arguments, Throwable throwable) {
 
         List<Marker> markers = null;
 
@@ -373,7 +374,7 @@ protected void handleNormalizedLoggingCall(Level level, Marker marker, String me
             markers.add(marker);
         }
 
-        innerHandleNormalizedLoggingCall(level, markers, messagePattern, arguments, t);
+        innerHandleNormalizedLoggingCall(level, markers, messagePattern, arguments, throwable);
     }
 
     private void innerHandleNormalizedLoggingCall(Level level, List<Marker> markers, String messagePattern, Object[] arguments, Throwable t) {