From: Robert Varga <rovarga@cisco.com>
Date: Sat, 25 Jan 2014 23:14:05 +0000 (+0100)
Subject: Fix JMX plugin mismatch with yangtools
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-10~9^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=68f7262176df316ca503cc58bb05fa0df47f19e4

Fix JMX plugin mismatch with yangtools

https://git.opendaylight.org/gerrit/#/c/4775/ introduced an incompatible
StaticLoggerBinder to the classpath, so make the same change here.

Change-Id: I6255c0ea46768af9fba1196842253ea78b745f8e
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

diff --git a/opendaylight/config/yang-jmx-generator-plugin/pom.xml b/opendaylight/config/yang-jmx-generator-plugin/pom.xml
index 21e728c41f..aa8a302e83 100644
--- 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 7075865573..e41ac66952 100644
--- 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(