Merge "Turned down some logs in StatisticsProvider from INFO to DEBUG"

diff --git a/opendaylight/config/yang-jmx-generator-plugin/pom.xml b/opendaylight/config/yang-jmx-generator-plugin/pom.xml
index 21e728c41f4fbd4f16eb7af3b5145fecfa2d9c5e..aa8a302e8397e80702e167965f924bcd8eadcbb0 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-plugin/pom.xml
+++ b/opendaylight/config/yang-jmx-generator-plugin/pom.xml
@@ -71,9 +71,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.googlecode.slf4j-maven-plugin-log</groupId>
-            <artifactId>slf4j-maven-plugin-log</artifactId>
-            <version>1.0.0</version>
+            <groupId>com.jcabi</groupId>
+            <artifactId>jcabi-maven-slf4j</artifactId>
+            <version>0.8</version>
         </dependency>
 
         <dependency>

diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGenerator.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGenerator.java
index 7075865573bdb17a6cb2d717b8a03437c825fd69..e41ac66952f889e60387b9c8adab0704432988b7 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGenerator.java
+++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGenerator.java
@@ -203,7 +203,7 @@ public class JMXGenerator implements CodeGenerator {
 
     @Override
     public void setLog(Log log) {
-        StaticLoggerBinder.getSingleton().setLog(log);
+        StaticLoggerBinder.getSingleton().setMavenLog(log);
     }
 
     private static Map<String, String> extractNamespaceMapping(

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index d3be9160f11c949d02d2ea9b807135bce1b9995b..6733100ac2eb225cc32e297d249a3c01569cd3ae 100644 (file)
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -176,13 +176,6 @@
           <version>${yangtools.version}</version>
         </dependency>
 
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>clustered-datastore-implementation</artifactId>
-          <version>0.4.1-SNAPSHOT</version>
-        </dependency>
-
-
         <!-- config-->
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
@@ -467,18 +460,6 @@
          <groupId>org.opendaylight.controller.thirdparty</groupId>
          <artifactId>ganymed</artifactId>
         </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-remoterpc-connector</artifactId>
-          <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-              <groupId>org.opendaylight.controller</groupId>
-              <artifactId>
-                  remoterpc-routingtable.implementation
-              </artifactId>
-              <version>0.4.1-SNAPSHOT</version>
-        </dependency>
         <dependency>
               <groupId>org.zeromq</groupId>
           <artifactId>jeromq</artifactId>