Migrate to odlparent-provided features-test

The yangtools-provided one is going away, so update references.

Change-Id: Ib368a04ed732fe2d9de59ca6d80fdaa0c461004d
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index c4be38cc2fb0309bf384beed5ab4c200889d39ef..57f3dc25ee7cb1abbf40e4ee0e1c16cd0c9f6388 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -17,8 +17,9 @@
 
   <dependencies>
       <dependency>
-         <groupId>org.opendaylight.yangtools</groupId>
+         <groupId>org.opendaylight.odlparent</groupId>
          <artifactId>features-test</artifactId>
+         <version>1.5.0-SNAPSHOT</version>
       </dependency>
       <dependency>
          <groupId>org.opendaylight.controller</groupId>
@@ -105,21 +106,6 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.16</version>
-        <configuration>
-          <systemPropertyVariables>
-            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
-          </systemPropertyVariables>
-          <dependenciesToScan>
-           <dependency>org.opendaylight.yangtools:features-test</dependency>
-          </dependenciesToScan>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
@@ -165,7 +151,7 @@
             <karaf.distro.version>${commons.opendaylight.version}</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/pom.xml b/pom.xml
index 14431a10f1349a3f467767bd4d2fba0fef676aa2..81b6063af1375c44988d9e35feb27cb5923414fe 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -46,15 +46,6 @@
        <module>features</module>
        <module>distribution-dlux</module>
     </modules>
-    <dependencyManagement>
-      <dependencies>
-         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>features-test</artifactId>
-            <version>0.7.0-SNAPSHOT</version>
-         </dependency>
-      </dependencies>
-    </dependencyManagement>
    
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/dlux.git</connection>     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/dlux.git</developerConnection>