Migrate ovsdb to use features-test from odlparent

Change-Id: I1e808c9f98bef104dabecf2d3fe8ae2381b9cc5e
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 3fbddcd9751d8e642e2afbe734e1889f10bf5959..bc2db98e8834481e135a818049984adbaf5cfc85 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -68,6 +68,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <northbound.commons.version>0.5.0-SNAPSHOT</northbound.commons.version>
     <nsf.version>0.5.0-SNAPSHOT</nsf.version>
     <odl.karaf.base.version>1.5.0-SNAPSHOT</odl.karaf.base.version>
+    <odlparent.version>1.5.0-SNAPSHOT</odlparent.version>
     <opendaylight-l2-types.version>2013.08.27.7-SNAPSHOT</opendaylight-l2-types.version>
     <openflowjava-nicira.version>0.1.0-SNAPSHOT</openflowjava-nicira.version>
     <openflowjava-extension.version>0.1.0-SNAPSHOT</openflowjava-extension.version>
@@ -192,6 +193,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>model-inventory</artifactId>
         <version>${mdsal.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>features-test</artifactId>
+        <version>${odlparent.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>concepts</artifactId>
@@ -207,12 +214,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>yang-common</artifactId>
         <version>${yangtools.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>features-test</artifactId>
-        <version>${yangtools.version}</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools.model</groupId>
         <artifactId>ietf-inet-types</artifactId>

diff --git a/features/ovs-sfc/pom.xml b/features/ovs-sfc/pom.xml
index 978de63b05f9898a86e184d6342425ac027848da..84af9578155dbe5988ea30f9d2eabeacb9d2eb89 100644 (file)
--- a/features/ovs-sfc/pom.xml
+++ b/features/ovs-sfc/pom.xml
@@ -27,15 +27,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-test</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>opendaylight-karaf-empty</artifactId>
       <type>zip</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>features-test</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
@@ -79,7 +79,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <karaf.distro.version>1.5.0-SNAPSHOT</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>
-           <dependency>org.opendaylight.yangtools:features-test</dependency>
+           <dependency>org.opendaylight.odlparent:features-test</dependency>
           </dependenciesToScan>
         </configuration>
       </plugin>

diff --git a/features/ovsdb/pom.xml b/features/ovsdb/pom.xml
index 510184d3967f2436ab4c8a216cfd9881c535c4d0..5056b0a789ca8084ae3570c8cee2d4bdffc9c368 100644 (file)
--- a/features/ovsdb/pom.xml
+++ b/features/ovsdb/pom.xml
@@ -63,7 +63,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>features-test</artifactId>
     </dependency>
     <dependency>
@@ -195,7 +195,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <karaf.distro.version>1.5.0-SNAPSHOT</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>
-           <dependency>org.opendaylight.yangtools:features-test</dependency>
+           <dependency>org.opendaylight.odlparent:features-test</dependency>
           </dependenciesToScan>
         </configuration>
       </plugin>