Changeset 252:03151475cb03

Timestamp:

08/23/11 13:11:40 (9 months ago)

Author:

xeraph

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2686

Message:

• 1.8.0 version
• upgraded felix 2.0.5 to 3.2.2

Location:

kraken-core

Files:

• pom.xml (modified) (2 diffs)
• src/main/java/org/slf4j/impl/KrakenLogger.java (modified) (2 diffs)

kraken-core/pom.xml

@@ -9 +9 @@
         </parent>
         <artifactId>kraken-core</artifactId>
-        <version>1.7.8</version>
+        <version>1.8.0</version>
         <name>Kraken Core</name>
         <packaging>jar</packaging>
@@ -42 +42 @@
                         <groupId>org.apache.felix</groupId>
                         <artifactId>org.apache.felix.framework</artifactId>
-                        <version>2.0.5</version>
+                        <version>3.2.2</version>
                 </dependency>
                 <dependency>
                         <groupId>org.apache.felix</groupId>
                         <artifactId>org.apache.felix.configadmin</artifactId>
-                        <version>1.2.4</version>
+                        <version>1.2.8</version>
                 </dependency>
                 <dependency>

kraken-core/src/main/java/org/slf4j/impl/KrakenLogger.java

@@ -24 +24 @@
 import org.apache.log4j.Logger;
 import org.apache.log4j.Priority;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;
 import org.slf4j.Marker;
@@ -466 +467 @@
          * for felix logger.
          */
-
-        @Override
-        protected void doLog(ServiceReference sr, int level, String msg, Throwable throwable) {
+        @Override
+        protected void doLog(Bundle bundle, ServiceReference sr, int level, String msg, Throwable throwable) {
                 internalLog(level, msg, throwable);
         }