Skip to content

Commit eb1710a

Browse files
cekiceki
committed
start work on 2.0.3-SNAPSHOT, fix SLF4J-564
1 parent bb49a5a commit eb1710a

File tree

17 files changed

+31
-30
lines changed

17 files changed

+31
-30
lines changed

‎integration/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.slf4j</groupId>
99
<artifactId>slf4j-parent</artifactId>
10-
<version>2.0.2</version>
10+
<version>2.0.3-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>integration</artifactId>

‎jcl-over-slf4j/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.slf4j</groupId>
77
<artifactId>slf4j-parent</artifactId>
8-
<version>2.0.2</version>
8+
<version>2.0.3-SNAPSHOT</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>

‎jul-to-slf4j/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.slf4j</groupId>
99
<artifactId>slf4j-parent</artifactId>
10-
<version>2.0.2</version>
10+
<version>2.0.3-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>jul-to-slf4j</artifactId>

‎log4j-over-slf4j/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.slf4j</groupId>
99
<artifactId>slf4j-parent</artifactId>
10-
<version>2.0.2</version>
10+
<version>2.0.3-SNAPSHOT</version>
1111
</parent>
1212

1313

‎osgi-over-slf4j/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.slf4j</groupId>
99
<artifactId>slf4j-parent</artifactId>
10-
<version>2.0.2</version>
10+
<version>2.0.3-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>osgi-over-slf4j</artifactId>

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.slf4j</groupId>
88
<artifactId>slf4j-parent</artifactId>
9-
<version>2.0.2</version>
9+
<version>2.0.3-SNAPSHOT</version>
1010

1111
<packaging>pom</packaging>
1212
<name>SLF4J</name>

‎slf4j-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.slf4j</groupId>
99
<artifactId>slf4j-parent</artifactId>
10-
<version>2.0.2</version>
10+
<version>2.0.3-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>slf4j-api</artifactId>

‎slf4j-api/src/main/java/org/slf4j/helpers/AbstractLogger.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -407,17 +407,17 @@ private void handleArgArrayCall(Level level, Marker marker, String msg, Object[]
407407
abstract protected String getFullyQualifiedCallerName();
408408

409409
/**
410-
* Given various arguments passed as parameters perform actual logging.
410+
* Given various arguments passed as parameters, perform actual logging.
411411
*
412412
* <p>This method assumes that the separation of the args array into actual
413413
* objects and a throwable has been already operated.
414414
*
415-
* @param level
416-
* @param marker
417-
* @param msg
418-
* @param arguments
419-
* @param throwable
415+
* @param level the SLF4J level for this event
416+
* @param marker The marker to be used for this event, may be null.
417+
* @param messagePattern The message pattern which will be parsed and formatted
418+
* @param arguments the array of arguments to be formatted, may be null
419+
* @param throwable The exception whose stack trace should be logged, may be null
420420
*/
421-
abstract protected void handleNormalizedLoggingCall(Level level, Marker marker, String msg, Object[] arguments, Throwable throwable);
421+
abstract protected void handleNormalizedLoggingCall(Level level, Marker marker, String messagePattern, Object[] arguments, Throwable throwable);
422422

423423
}

‎slf4j-ext/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.slf4j</groupId>
99
<artifactId>slf4j-parent</artifactId>
10-
<version>2.0.2</version>
10+
<version>2.0.3-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>slf4j-ext</artifactId>

‎slf4j-jdk-platform-logging/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<artifactId>slf4j-parent</artifactId>
1010
<groupId>org.slf4j</groupId>
11-
<version>2.0.2</version>
11+
<version>2.0.3-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>slf4j-jdk-platform-logging</artifactId>

‎slf4j-jdk14/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.slf4j</groupId>
99
<artifactId>slf4j-parent</artifactId>
10-
<version>2.0.2</version>
10+
<version>2.0.3-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>slf4j-jdk14</artifactId>

‎slf4j-log4j12/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.slf4j</groupId>
1010
<artifactId>slf4j-parent</artifactId>
11-
<version>2.0.2</version>
11+
<version>2.0.3-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>slf4j-log4j12</artifactId>

‎slf4j-migrator/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.slf4j</groupId>
99
<artifactId>slf4j-parent</artifactId>
10-
<version>2.0.2</version>
10+
<version>2.0.3-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>slf4j-migrator</artifactId>

‎slf4j-nop/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.slf4j</groupId>
99
<artifactId>slf4j-parent</artifactId>
10-
<version>2.0.2</version>
10+
<version>2.0.3-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>slf4j-nop</artifactId>

‎slf4j-reload4j/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.slf4j</groupId>
99
<artifactId>slf4j-parent</artifactId>
10-
<version>2.0.2</version>
10+
<version>2.0.3-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>slf4j-reload4j</artifactId>

‎slf4j-simple/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.slf4j</groupId>
99
<artifactId>slf4j-parent</artifactId>
10-
<version>2.0.2</version>
10+
<version>2.0.3-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>slf4j-simple</artifactId>

‎slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java

+9-8
Original file line numberDiff line numberDiff line change
@@ -354,17 +354,18 @@ public boolean isErrorEnabled() {
354354
}
355355

356356
/**
357-
* This is our internal implementation for logging regular (non-parameterized)
358-
* log messages.
357+
* SimpleLogger's implementation of
358+
* {@link org.slf4j.helpers.AbstractLogger#handleNormalizedLoggingCall(Level, Marker, String, Object[], Throwable) AbstractLogger#handleNormalizedLoggingCall}
359+
* }
359360
*
360-
* @param level One of the LOG_LEVEL_XXX constants defining the log level
361-
* @param marker The marker to be used for this event, may be null.
361+
* @param level the SLF4J level for this event
362+
* @param marker The marker to be used for this event, may be null.
362363
* @param messagePattern The message pattern which will be parsed and formatted
363-
* @param arguments The array of arguments
364-
* @param t The exception whose stack trace should be logged
364+
* @param arguments the array of arguments to be formatted, may be null
365+
* @param throwable The exception whose stack trace should be logged, may be null
365366
*/
366367
@Override
367-
protected void handleNormalizedLoggingCall(Level level, Marker marker, String messagePattern, Object[] arguments, Throwable t) {
368+
protected void handleNormalizedLoggingCall(Level level, Marker marker, String messagePattern, Object[] arguments, Throwable throwable) {
368369

369370
List<Marker> markers = null;
370371

@@ -373,7 +374,7 @@ protected void handleNormalizedLoggingCall(Level level, Marker marker, String me
373374
markers.add(marker);
374375
}
375376

376-
innerHandleNormalizedLoggingCall(level, markers, messagePattern, arguments, t);
377+
innerHandleNormalizedLoggingCall(level, markers, messagePattern, arguments, throwable);
377378
}
378379

379380
private void innerHandleNormalizedLoggingCall(Level level, List<Marker> markers, String messagePattern, Object[] arguments, Throwable t) {

0 commit comments

Comments
 (0)