features-test patch3

Fixes transitive dependency issue - due to org.opendaylight.controller version in commons/parent/pom.xml

Signed-off-by: pchopra <pchopra@juniper.net>
Change-Id: I7bb6c4323515d2bf7c9399ec3a5ec4b89c798de5

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 414b4dae1448f03d85fe18e7a11d148f102a47a0..f2ae0ac33aba3da83d67a5b1f19d36b85906773f 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-SNAPSHOT</version>
   </parent>
   <groupId>org.opendaylight.plugin2oc</groupId>
   <artifactId>commons.plugin2oc</artifactId>

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 07b9f7ab962310518be2c35634e7f04d2852be53..ec81a8cf467d573a1b3618ab82b8098b8cf13b87 100755 (executable)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -66,6 +66,22 @@
         <type>xml</type>\r
         <scope>runtime</scope>\r
       </dependency>\r
+    <dependency>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
+        <artifactId>features-yangtools</artifactId>\r
+        <version>0.6.2-SNAPSHOT</version>\r
+        <classifier>features</classifier>\r
+        <type>xml</type>\r
+        <scope>runtime</scope>\r
+      </dependency>\r
+      <dependency>\r
+        <groupId>org.opendaylight.controller</groupId>\r
+        <artifactId>features-mdsal</artifactId>\r
+        <version>1.1-SNAPSHOT</version>\r
+        <classifier>features</classifier>\r
+        <type>xml</type>\r
+        <scope>runtime</scope>\r
+       </dependency>\r
     <!-- ODL Branding -->\r
     <dependency>\r
       <groupId>org.opendaylight.controller</groupId>\r

diff --git a/features-plugin2oc/pom.xml b/features-plugin2oc/pom.xml
index f374bcce410d8e95d0bcc557e1fc99c20d5eecad..209e253fcd45eebd4fd72c65cc9137c45139f22d 100755 (executable)
--- a/features-plugin2oc/pom.xml
+++ b/features-plugin2oc/pom.xml
@@ -21,11 +21,18 @@
       <karaf.version>3.0.1</karaf.version>\r
       <feature.test.version>0.6.2-SNAPSHOT</feature.test.version>\r
       <karaf.empty.version>1.4.2-SNAPSHOT</karaf.empty.version>\r
-      <surefire.version>2.16</surefire.version>\r
+      <surefire.version>2.17</surefire.version>\r
       <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>\r
    </properties>\r
 \r
    <dependencies>\r
+        <dependency>\r
+          <groupId>org.opendaylight.yangtools</groupId>\r
+          <artifactId>features-yangtools</artifactId>\r
+          <version>0.6.2-SNAPSHOT</version>\r
+          <classifier>features</classifier>\r
+          <type>xml</type>\r
+        </dependency>\r
         <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r
           <artifactId>features-nsf</artifactId>\r
@@ -47,6 +54,13 @@
           <classifier>features</classifier>\r
           <type>xml</type>\r
         </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.controller</groupId>\r
+            <artifactId>features-mdsal</artifactId>\r
+            <version>1.1-SNAPSHOT</version>\r
+            <classifier>features</classifier>\r
+            <type>xml</type>\r
+        </dependency>\r
         <dependency>\r
             <groupId>org.opendaylight.controller</groupId>\r
             <artifactId>sal</artifactId>\r
@@ -67,7 +81,21 @@
             <version>0.1</version>\r
             <artifactId>plugin2oc.neutron</artifactId>\r
         </dependency>\r
+    <!-- test the features.xml -->\r
+    <dependency>\r
+      <groupId>org.opendaylight.yangtools</groupId>\r
+      <artifactId>features-test</artifactId>\r
+      <version>0.6.2-SNAPSHOT</version>\r
+      <scope>test</scope>\r
+    </dependency>\r
 \r
+    <!-- dependency for opendaylight-karaf-empty for use by testing -->\r
+    <dependency>\r
+      <groupId>org.opendaylight.controller</groupId>\r
+      <artifactId>opendaylight-karaf-empty</artifactId>\r
+      <version>1.4.2-SNAPSHOT</version>\r
+      <type>zip</type>\r
+    </dependency>\r
    </dependencies>\r
    <build>\r
       <resources>\r
@@ -136,4 +164,3 @@
       <url>https://git.opendaylight.org/gerrit/gitweb?p=plugin2oc.git;a=summary</url>\r
    </scm>\r
 </project>\r
-\r

diff --git a/features-plugin2oc/src/main/resources/features.xml b/features-plugin2oc/src/main/resources/features.xml
index 1a87f27c04568ba288745a031a01b7b5bb382af1..4b4aac80cc27564e7bcc7138abda809ce234cef6 100755 (executable)
--- a/features-plugin2oc/src/main/resources/features.xml
+++ b/features-plugin2oc/src/main/resources/features.xml
@@ -8,17 +8,21 @@
 <features name="odl-plugin2oc-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+    <repository>mvn:org.opendaylight.yangtools/features-yangtools/0.6.2-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-nsf/0.4.2-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-adsal/0.8.1-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/base-features/1.4.2-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-mdsal/1.1-SNAPSHOT/xml/features</repository>
     <feature name='odl-plugin2oc' description="OpenDaylight :: plugin2oc :: Plugin" version='${project.version}'>
-        <feature>odl-nsf-managers</feature>
+        <feature>odl-nsf-all</feature>
         <feature>odl-adsal-all</feature>
         <feature>odl-base-all</feature>
+        <feature>odl-mdsal-broker</feature>
+        <feature>odl-yangtools-models</feature>
+        <feature>odl-yangtools-binding</feature>
         <bundle>mvn:org.opendaylight.controller/networkconfig.neutron/0.4.2-SNAPSHOT</bundle>
         <bundle>mvn:org.opendaylight.controller/sal/0.8.1-SNAPSHOT</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-binding-api/1.1-SNAPSHOT</bundle>
         <bundle>mvn:org.opendaylight.plugin2oc/plugin2oc.neutron/0.1</bundle>
     </feature>
 </features>
-