Merge "Small fix to xsql dependencies"

diff --combined features/mdsal/pom.xml
index 008484e7c67cc04b9599e2577cad6f7ec1cf4252,056d8ed72817439fd803d618b6422b633e809376..41f1eab488212d58e28e220080f001db932e7880
--- 1/features/mdsal/pom.xml
--- 2/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@@ -60,6 -60,10 +60,10 @@@
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal-dom-xsql</artifactId>
      </dependency>
+     <dependency>
+       <groupId>org.opendaylight.controller</groupId>
+       <artifactId>sal-dom-xsql-config</artifactId>
+     </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal-binding-api</artifactId>
@@@ -184,42 -188,6 +188,42 @@@
        <type>xml</type>
        <classifier>config</classifier>
      </dependency>
 +    <dependency>
 +      <groupId>org.opendaylight.controller</groupId>
 +      <artifactId>sal-rest-docgen</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.fasterxml.jackson.core</groupId>
 +      <artifactId>jackson-annotations</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.fasterxml.jackson.core</groupId>
 +      <artifactId>jackson-core</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.fasterxml.jackson.core</groupId>
 +      <artifactId>jackson-databind</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.fasterxml.jackson.datatype</groupId>
 +      <artifactId>jackson-datatype-json-org</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.fasterxml.jackson.module</groupId>
 +      <artifactId>jackson-module-jaxb-annotations</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.fasterxml.jackson.jaxrs</groupId>
 +      <artifactId>jackson-jaxrs-base</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.fasterxml.jackson.jaxrs</groupId>
 +      <artifactId>jackson-jaxrs-json-provider</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.json</groupId>
 +      <artifactId>json</artifactId>
 +    </dependency>
      <!-- test to validate features.xml -->
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>

diff --combined opendaylight/commons/opendaylight/pom.xml
index 83d79fb8224bbdcb00fc1667637229dd078b740e,db0f9ca57689bbd638a1ef908b85b5808c4edbee..1fc32b37d8a364b5e0536480044bed122172e2f2
--- 1/opendaylight/commons/opendaylight/pom.xml
--- 2/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -39,7 -39,6 +39,7 @@@
      <clustering.test.version>0.4.2-SNAPSHOT</clustering.test.version>
      <commmons.northbound.version>0.4.2-SNAPSHOT</commmons.northbound.version>
      <!-- Third Party Versions -->
 +    <codahale.metrics.version>3.0.1</codahale.metrics.version>
      <commons.catalina>7.0.32.v201211201336</commons.catalina>
      <commons.catalina.ha>7.0.32.v201211201952</commons.catalina.ha>
      <commons.catalina.tribes>7.0.32.v201211201952</commons.catalina.tribes>
@@@ -254,16 -253,6 +254,16 @@@
          <artifactId>logback-core</artifactId>
          <version>${logback.version}</version>
        </dependency>
 +      <dependency>
 +        <groupId>com.codahale.metrics</groupId>
 +        <artifactId>metrics-core</artifactId>
 +        <version>${codahale.metrics.version}</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>com.codahale.metrics</groupId>
 +        <artifactId>metrics-graphite</artifactId>
 +        <version>${codahale.metrics.version}</version>
 +      </dependency>
        <dependency>
          <groupId>com.fasterxml.jackson.core</groupId>
          <artifactId>jackson-annotations</artifactId>
@@@ -1126,16 -1115,6 +1126,16 @@@
          <version>${netconf.version}</version>
          <type>test-jar</type>
        </dependency>
 +        <dependency>
 +            <groupId>org.opendaylight.controller</groupId>
 +            <artifactId>netconf-auth</artifactId>
 +            <version>${netconf.version}</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.opendaylight.controller</groupId>
 +            <artifactId>netconf-usermanager</artifactId>
 +            <version>${netconf.version}</version>
 +        </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>netconf-ssh</artifactId>
@@@ -1303,6 -1282,11 +1303,11 @@@
          <artifactId>sal-dom-xsql</artifactId>
          <version>${mdsal.version}</version>
        </dependency>
+       <dependency>
+         <groupId>org.opendaylight.controller</groupId>
+         <artifactId>sal-dom-xsql-config</artifactId>
+         <version>${mdsal.version}</version>
+       </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>sal-core-api</artifactId>
@@@ -1764,11 -1748,6 +1769,11 @@@
          <groupId>org.opendaylight.yangtools</groupId>
          <artifactId>yang-data-composite-node</artifactId>
          <version>${yangtools.version}</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>org.opendaylight.yangtools</groupId>
 +        <artifactId>yang-data-codec-gson</artifactId>
 +        <version>${yangtools.version}</version>
        </dependency>
  
        <!-- yangtools dependencies -->