You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/01/20 09:40:55 UTC
svn commit: r1061160 - in /karaf/trunk:
client/src/main/java/org/slf4j/impl/SimpleLogger.java pom.xml
Author: jbonofre
Date: Thu Jan 20 08:40:54 2011
New Revision: 1061160
URL: http://svn.apache.org/viewvc?rev=1061160&view=rev
Log:
[KARAF-396] Upgrade to SLF4J 1.6.1.
Modified:
karaf/trunk/client/src/main/java/org/slf4j/impl/SimpleLogger.java
karaf/trunk/pom.xml
Modified: karaf/trunk/client/src/main/java/org/slf4j/impl/SimpleLogger.java
URL: http://svn.apache.org/viewvc/karaf/trunk/client/src/main/java/org/slf4j/impl/SimpleLogger.java?rev=1061160&r1=1061159&r2=1061160&view=diff
==============================================================================
--- karaf/trunk/client/src/main/java/org/slf4j/impl/SimpleLogger.java (original)
+++ karaf/trunk/client/src/main/java/org/slf4j/impl/SimpleLogger.java Thu Jan 20 08:40:54 2011
@@ -184,21 +184,21 @@ public class SimpleLogger extends Marker
protected void log(int level, String format, Object arg) {
if (isLogEnabled(level)) {
- String msg = MessageFormatter.format(format, arg);
+ String msg = MessageFormatter.format(format, arg).getMessage();
doLog(level, msg, null);
}
}
protected void log(int level, String format, Object arg1, Object arg2) {
if (isLogEnabled(level)) {
- String msg = MessageFormatter.format(format, arg1, arg2);
+ String msg = MessageFormatter.format(format, arg1, arg2).getMessage();
doLog(level, msg, null);
}
}
protected void log(int level, String format, Object[] args) {
if (isLogEnabled(level)) {
- String msg = MessageFormatter.format(format, args);
+ String msg = MessageFormatter.format(format, args).getMessage();
doLog(level, msg, null);
}
}
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1061160&r1=1061159&r2=1061160&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Thu Jan 20 08:40:54 2011
@@ -152,7 +152,7 @@
<pax.web.version>0.8.2-SNAPSHOT</pax.web.version>
<pax.tinybundles.version>1.3.0</pax.tinybundles.version>
<servlet.api.version>2.5</servlet.api.version>
- <slf4j.version>1.5.8</slf4j.version>
+ <slf4j.version>1.6.1</slf4j.version>
<spring.osgi.version>1.2.0</spring.osgi.version>
<spring2.version>2.5.6.SEC02</spring2.version>
<spring.version>3.0.5.RELEASE</spring.version>