Fix odl-restconf-noauth packaging yangtools bundle

Depend on the corresponding feature and cleanup versions.

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

diff --git a/features/restconf/odl-restconf-noauth/pom.xml b/features/restconf/odl-restconf-noauth/pom.xml
index 6feee9e64810b4efb9cd5771f0f84d4e6d0aece3..0529d1b67113b154d9a94ded8e019155368f9634 100644 (file)
--- a/features/restconf/odl-restconf-noauth/pom.xml
+++ b/features/restconf/odl-restconf-noauth/pom.xml
@@ -48,6 +48,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.7.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
@@ -69,14 +76,18 @@
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>odl-aaa-shiro</artifactId>
-            <version>0.7.0-SNAPSHOT</version>
+            <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.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>1.7.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/restconf/odl-restconf-noauth/src/main/feature/feature.xml b/features/restconf/odl-restconf-noauth/src/main/feature/feature.xml
index 341cd50769a3db0db2ce68dcba0bcaf716a900ae..837a80c7d9d681ed020e4296076fdc589b09e6f7 100644 (file)
--- a/features/restconf/odl-restconf-noauth/src/main/feature/feature.xml
+++ b/features/restconf/odl-restconf-noauth/src/main/feature/feature.xml
@@ -13,5 +13,6 @@
         </configfile>
         <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>