diff --git a/integration/pom.xml b/integration/pom.xml index 99a2d5157..19b46b1bd 100755 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.2 + 2.0.3-SNAPSHOT integration diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index 075244619..09613896e 100755 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -5,7 +5,7 @@ org.slf4j slf4j-parent - 2.0.2 + 2.0.3-SNAPSHOT 4.0.0 diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index 90274ef11..56dc25dc1 100755 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.2 + 2.0.3-SNAPSHOT jul-to-slf4j diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index 6d02c0644..5b6e3a495 100755 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.2 + 2.0.3-SNAPSHOT diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index 83487d180..be769fd5a 100755 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.2 + 2.0.3-SNAPSHOT osgi-over-slf4j diff --git a/pom.xml b/pom.xml index ec5c41aae..1aa17edc7 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.slf4j slf4j-parent - 2.0.2 + 2.0.3-SNAPSHOT pom SLF4J diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 9d73ae0e1..724c308b1 100755 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.2 + 2.0.3-SNAPSHOT slf4j-api diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/AbstractLogger.java b/slf4j-api/src/main/java/org/slf4j/helpers/AbstractLogger.java index ee4afc49e..0caaf8103 100644 --- 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. * *

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 index 1dc9cbdc8..f1d8b74a9 100755 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.2 + 2.0.3-SNAPSHOT slf4j-ext diff --git a/slf4j-jdk-platform-logging/pom.xml b/slf4j-jdk-platform-logging/pom.xml index 7ebda6e19..31a64c223 100644 --- a/slf4j-jdk-platform-logging/pom.xml +++ b/slf4j-jdk-platform-logging/pom.xml @@ -8,7 +8,7 @@ slf4j-parent org.slf4j - 2.0.2 + 2.0.3-SNAPSHOT slf4j-jdk-platform-logging diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index f736f0aa3..bb6241743 100755 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.2 + 2.0.3-SNAPSHOT slf4j-jdk14 diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index 19ce2e40d..885cb36c2 100755 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -8,7 +8,7 @@ org.slf4j slf4j-parent - 2.0.2 + 2.0.3-SNAPSHOT slf4j-log4j12 diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index 0f66864f5..c43a7b9e2 100755 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.2 + 2.0.3-SNAPSHOT slf4j-migrator diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 120c87eae..a5cba7336 100755 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.2 + 2.0.3-SNAPSHOT slf4j-nop diff --git a/slf4j-reload4j/pom.xml b/slf4j-reload4j/pom.xml index 8d8a809a4..a15e6fa1b 100644 --- a/slf4j-reload4j/pom.xml +++ b/slf4j-reload4j/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.2 + 2.0.3-SNAPSHOT slf4j-reload4j diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index b99cc7994..7d85dd5f4 100755 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -7,7 +7,7 @@ org.slf4j slf4j-parent - 2.0.2 + 2.0.3-SNAPSHOT slf4j-simple diff --git a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleLogger.java index 2046c542c..93638ee82 100644 --- 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 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 markers, String messagePattern, Object[] arguments, Throwable t) {