odl-restconf-nb-rfc8040-noauth depends on odl-yangtools-export

Rather than pulling in dependency bundle, make sure we reference
the correct feature in which it is packaged.

Change-Id: I1b61b12655217cbee44ea82a8401b90523c63206
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml b/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml
index 0cb5872df2a5f8d187ae03851495f196ac596bf1..f6f2c00112cc13cd7323c3d4b948e549eb57970f 100644 (file)
--- a/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml
+++ b/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml
@@ -92,6 +92,13 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>odl-yangtools-export</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>ietf-restconf</artifactId>
@@ -107,7 +114,6 @@
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>restconf-nb-rfc8040</artifactId>
-            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/features/restconf/odl-restconf-nb-rfc8040-noauth/src/main/feature/feature.xml b/features/restconf/odl-restconf-nb-rfc8040-noauth/src/main/feature/feature.xml
index a190dfc48d2c397dd8df699a5b90a317f3e3f413..2be16c28bad53bfba25728d95cb05a43dd38c988 100644 (file)
--- a/features/restconf/odl-restconf-nb-rfc8040-noauth/src/main/feature/feature.xml
+++ b/features/restconf/odl-restconf-nb-rfc8040-noauth/src/main/feature/feature.xml
@@ -10,5 +10,6 @@
     <feature name="odl-restconf-nb-rfc8040-noauth" version="${project.version}">
         <feature version="[3.0.0,4)">odl-karaf-feat-jetty</feature>
         <feature version="[3.0.0,4)">odl-netty-4</feature>
+        <feature version="[2.0.1,3)">odl-yangtools-export</feature>
     </feature>
 </features>