features-test patch4

changing plugin version from 0.1 --> 0.1-SNAPSHOT

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

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 414b4dae1448f03d85fe18e7a11d148f102a47a0..0148a7d13a3535863fe1dfa9867f40c4768d4723 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -7,11 +7,11 @@
   <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>
-  <version>0.1</version>
+  <version>0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 07b9f7ab962310518be2c35634e7f04d2852be53..8e33553bbc50e09ab149e0d51619f8160c80e6f1 100755 (executable)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -4,7 +4,7 @@
   <parent>\r
     <artifactId>commons.plugin2oc</artifactId>\r
     <groupId>org.opendaylight.plugin2oc</groupId>\r
-    <version>0.1</version>\r
+    <version>0.1-SNAPSHOT</version>\r
     <relativePath>../commons/parent</relativePath>\r
 </parent>\r
   <artifactId>distribution-karaf</artifactId>\r
@@ -61,11 +61,27 @@
     <dependency>\r
         <groupId>org.opendaylight.plugin2oc</groupId>\r
         <artifactId>features-plugin2oc</artifactId>\r
-        <version>0.1</version>\r
+        <version>0.1-SNAPSHOT</version>\r
         <classifier>features</classifier>\r
         <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..da89b94946c15d8ade6472dac7be3420d47504ee 100755 (executable)
--- a/features-plugin2oc/pom.xml
+++ b/features-plugin2oc/pom.xml
@@ -9,7 +9,7 @@
    <parent>\r
     <artifactId>plugin2oc.project</artifactId>\r
     <groupId>org.opendaylight.plugin2oc</groupId>\r
-    <version>0.1</version>\r
+    <version>0.1-SNAPSHOT</version>\r
   </parent>\r
    <artifactId>features-plugin2oc</artifactId>\r
    <groupId>org.opendaylight.plugin2oc</groupId>\r
@@ -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
@@ -64,10 +78,24 @@
         </dependency>\r
         <dependency>\r
             <groupId>org.opendaylight.plugin2oc</groupId>\r
-            <version>0.1</version>\r
+            <version>0.1-SNAPSHOT</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..abdf565022f48949fcf7858bd9acca74cb1ca826 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>
+        <bundle>mvn:org.opendaylight.plugin2oc/plugin2oc.neutron/0.1-SNAPSHOT</bundle>
     </feature>
 </features>
-

diff --git a/neutron/pom.xml b/neutron/pom.xml
index 9a32dfb5bb84d4a06661bdc339633930239fa229..3606a0bb8f450525a2108bd63b65c60ded11bb13 100755 (executable)
--- a/neutron/pom.xml
+++ b/neutron/pom.xml
@@ -5,11 +5,11 @@
     <parent>\r
         <groupId>org.opendaylight.plugin2oc</groupId>\r
         <artifactId>commons.plugin2oc</artifactId>\r
-        <version>0.1</version>\r
+        <version>0.1-SNAPSHOT</version>\r
         <relativePath>../commons/parent</relativePath>\r
     </parent>\r
     <artifactId>plugin2oc.neutron</artifactId>\r
-    <version>0.1</version>\r
+    <version>0.1-SNAPSHOT</version>\r
     <packaging>bundle</packaging>\r
     <repositories>\r
         <repository>\r
@@ -90,12 +90,12 @@
         <dependency>\r
             <groupId>com.google.guava</groupId>\r
             <artifactId>guava</artifactId>\r
-            <version>14.0</version>\r
+            <version>14.0.1</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>commons-lang</groupId>\r
             <artifactId>commons-lang</artifactId>\r
-            <version>2.3</version>\r
+            <version>2.6</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.apache.commons</groupId>\r
@@ -138,7 +138,7 @@
         <dependency>\r
             <groupId>org.javassist</groupId>\r
             <artifactId>javassist</artifactId>\r
-            <version>3.15.0-GA</version>\r
+            <version>3.17.1-GA</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.easymock</groupId>\r

diff --git a/pom.xml b/pom.xml
index cc402c45c0d6180fe1fc8793dfb85221808b8e70..cd8ac58b672895875d56087f31673ba2281ca5c8 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.opendaylight.plugin2oc</groupId>
     <artifactId>commons.plugin2oc</artifactId>
-    <version>0.1</version>
+    <version>0.1-SNAPSHOT</version>
     <relativePath>commons/parent</relativePath>
   </parent>
   <groupId>org.opendaylight.plugin2oc</groupId>
   <artifactId>plugin2oc.project</artifactId>
-  <version>0.1</version>
+  <version>0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <properties>
   <sonar.host.url> http://localhost:9000/ </sonar.host.url>