Candidate fix for dependency issue in odl-restconf feature

Change-Id: Icc44a09b83e17f5bbd96f29eb7133b8a006a8733
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index 41f1eab488212d58e28e220080f001db932e7880..c6856c89fb4776718a7ea13cc1074cf71f403e12 100644 (file)
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -63,6 +63,8 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-dom-xsql-config</artifactId>
+      <classifier>config</classifier>
+      <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/features/mdsal/src/main/resources/features.xml b/features/mdsal/src/main/resources/features.xml
index 0176a0388c76f46e57489a6d439446d632ced7e8..408be621f514b279a681bc7cdf6d53158f69fbc7 100644 (file)
--- a/features/mdsal/src/main/resources/features.xml
+++ b/features/mdsal/src/main/resources/features.xml
@@ -45,6 +45,7 @@
         <feature>war</feature>
         <bundle>mvn:org.opendaylight.controller/sal-rest-connector/${project.version}</bundle>
         <bundle>mvn:com.google.code.gson/gson/${gson.version}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-data-codec-gson/${yangtools.version}</bundle>
         <bundle>mvn:com.sun.jersey/jersey-core/${jersey.version}</bundle>
         <bundle>mvn:com.sun.jersey/jersey-server/${jersey.version}</bundle>
         <bundle>mvn:com.sun.jersey/jersey-servlet/${jersey.version}</bundle>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 1fc32b37d8a364b5e0536480044bed122172e2f2..2e953072681704e6d4b9b3d1251658d59da4f7f7 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -1307,6 +1307,8 @@
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-dom-xsql-config</artifactId>
         <version>${mdsal.version}</version>
+        <classifier>config</classifier>
+        <type>xml</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>