Merge "Update JMX generator"

diff --combined opendaylight/commons/opendaylight/pom.xml
index 43ac4ae91c4a446cea6128fab4c14d1e0593a44f,2721e9651b8ce3dfae3c3ce71152a20a6621a38d..cf4aa3140e0d828e9a85f9f0aa6440f7a8e71a94
--- 1/opendaylight/commons/opendaylight/pom.xml
--- 2/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -15,7 -15,7 +15,7 @@@
  
    <properties>
  
 -    <akka.version>2.3.4</akka.version>
 +    <akka.version>2.3.9</akka.version>
      <appauth.version>0.5.0-SNAPSHOT</appauth.version>
      <archetype-app-northbound>0.1.0-SNAPSHOT</archetype-app-northbound>
      <arphandler.version>0.6.0-SNAPSHOT</arphandler.version>
@@@ -104,6 -104,7 +104,6 @@@
      <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
      <jolokia-bridge.version>0.1.0-SNAPSHOT</jolokia-bridge.version>
      <jolokia.version>1.1.4</jolokia.version>
 -    <jsr305.api.version>2.0.1</jsr305.api.version>
      <jsr311.api.version>1.1.1</jsr311.api.version>
      <jsr311.v2.api.version>2.0</jsr311.v2.api.version>
      <karaf.branding.version>1.1.0-SNAPSHOT</karaf.branding.version>
@@@ -286,6 -287,11 +286,6 @@@
          <artifactId>java-concurrent-hash-trie-map</artifactId>
          <version>${ctrie.version}</version>
        </dependency>
 -      <dependency>
 -        <groupId>com.google.code.findbugs</groupId>
 -        <artifactId>jsr305</artifactId>
 -        <version>${jsr305.api.version}</version>
 -      </dependency>
        <dependency>
          <groupId>com.google.code.gson</groupId>
          <artifactId>gson</artifactId>
@@@ -304,9 -310,10 +304,10 @@@
  
        <!-- 3rd party dependencies needed by config-->
        <dependency>
-         <groupId>com.jcabi</groupId>
-         <artifactId>jcabi-maven-slf4j</artifactId>
-         <version>0.8</version>
+         <groupId>org.apache.maven</groupId>
+         <artifactId>maven-core</artifactId>
+         <version>3.1.1</version>
+         <scope>provided</scope>
        </dependency>
  
        <dependency>