yang-data-json is in the feature file, but not built

- Remove reference to a no-longer existent artifacts and add new dependencies

Change-Id: Ib9fe2e388f658114e0deadfa4dbab0f403a1fed7
Signed-off-by: Giovanni Meo <gmeo@cisco.com>

diff --git a/common/features/pom.xml b/common/features/pom.xml
index 00c1cf4e880e8a7799bd549fd2a14cb317354ce9..3f22b3afb1e29ce78ccb2b4f3fdfae8f9aa4c5f4 100644 (file)
--- a/common/features/pom.xml
+++ b/common/features/pom.xml
@@ -89,21 +89,17 @@
        <groupId>org.opendaylight.yangtools.model</groupId>
        <artifactId>ietf-inet-types</artifactId>
      </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools.model</groupId>
-       <artifactId>ietf-topology</artifactId>
-     </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools.model</groupId>
        <artifactId>ietf-yang-types</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools.model</groupId>
-       <artifactId>opendaylight-l2-types</artifactId>
+       <artifactId>yang-ext</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools.model</groupId>
-       <artifactId>yang-ext</artifactId>
+       <artifactId>opendaylight-l2-types</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools.thirdparty</groupId>
@@ -111,43 +107,51 @@
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>binding-generator-api</artifactId>
+       <artifactId>yang-data-api</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>binding-generator-impl</artifactId>
+       <artifactId>yang-data-impl</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>binding-generator-spi</artifactId>
+       <artifactId>yang-data-operations</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>binding-generator-util</artifactId>
+       <artifactId>yang-data-util</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>binding-model-api</artifactId>
+       <artifactId>yang-model-api</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>binding-type-provider</artifactId>
+       <artifactId>yang-model-util</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>concepts</artifactId>
+       <artifactId>yang-parser-impl</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>object-cache-api</artifactId>
+       <artifactId>yang-parser-api</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>object-cache-guava</artifactId>
+       <artifactId>yang-binding</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>object-cache-noop</artifactId>
+       <artifactId>util</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>org.opendaylight.yangtools</groupId>
+       <artifactId>concepts</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>org.opendaylight.yangtools</groupId>
+       <artifactId>yang-common</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
@@ -155,31 +159,39 @@
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-binding</artifactId>
+       <artifactId>object-cache-api</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-common</artifactId>
+       <artifactId>object-cache-guava</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-data-api</artifactId>
+       <artifactId>object-cache-noop</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-data-impl</artifactId>
+       <artifactId>binding-generator-api</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-data-composite-node</artifactId>
+       <artifactId>binding-generator-impl</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-data-operations</artifactId>
+       <artifactId>binding-generator-spi</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-data-util</artifactId>
+       <artifactId>binding-generator-util</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>org.opendaylight.yangtools</groupId>
+       <artifactId>binding-model-api</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>org.opendaylight.yangtools</groupId>
+       <artifactId>binding-type-provider</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
@@ -195,7 +207,15 @@
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-parser-impl</artifactId>
+       <artifactId>restconf-client-api</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>org.opendaylight.yangtools</groupId>
+       <artifactId>restconf-client-impl</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>org.opendaylight.yangtools</groupId>
+       <artifactId>restconf-common</artifactId>
      </dependency>
    </dependencies>
 </project>

diff --git a/common/features/src/main/resources/features.xml b/common/features/src/main/resources/features.xml
index ee51ec6ef4ea9031f5c757b4b98aca739a977ee7..8d68bbe4fa72ca0cf86afded198f386f48e415b2 100644 (file)
--- a/common/features/src/main/resources/features.xml
+++ b/common/features/src/main/resources/features.xml
@@ -33,7 +33,6 @@
         <bundle>mvn:commons-io/commons-io/${commons.io.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-api/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-impl/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.yangtools/yang-data-json/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-operations/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-util/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-model-api/${project.version}</bundle>