Candidate fix for dependency issue in odl-restconf feature 11/10711/1
authorEd Warnicke <eaw@cisco.com>
Wed, 3 Sep 2014 17:06:10 +0000 (12:06 -0500)
committerEd Warnicke <eaw@cisco.com>
Wed, 3 Sep 2014 17:06:10 +0000 (12:06 -0500)
Change-Id: Icc44a09b83e17f5bbd96f29eb7133b8a006a8733
Signed-off-by: Ed Warnicke <eaw@cisco.com>
features/mdsal/pom.xml
features/mdsal/src/main/resources/features.xml
opendaylight/commons/opendaylight/pom.xml

index 41f1eab..c6856c8 100644 (file)
@@ -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>
index 0176a03..408be62 100644 (file)
@@ -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>
index 1fc32b3..2e95307 100644 (file)
         <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>