From 7178e2c26ac9ab0ec4e1c8b824386ea58791f9a3 Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Tue, 10 Mar 2015 09:17:06 +0100
Subject: [PATCH] Migrate away from yangtools features-test

The replacement comes from odlparent, so migrate to the new (and
working) one.

Change-Id: Ic0fee09f5d80a3864da3bc18531d072dff84fdcf
Signed-off-by: Robert Varga <rovarga@cisco.com>
---
 features/pom.xml                         | 6 +++---
 features/src/main/resources/features.xml | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/features/pom.xml b/features/pom.xml
index b93a8252..52158dc6 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -153,9 +153,9 @@
 
     <!-- test to validate features.xml -->
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>features-test</artifactId>
-      <version>0.7.0-SNAPSHOT</version>
+      <version>1.5.0-SNAPSHOT</version>
     </dependency>
     <!-- dependency for opendaylight-karaf-empty for use by testing -->
     <dependency>
@@ -219,7 +219,7 @@
             <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/src/main/resources/features.xml b/features/src/main/resources/features.xml
index bdfcace0..9cd132a8 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -3,7 +3,6 @@
           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.openflowplugin/features-openflowplugin/${openflow.plugin.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-flow/${mdsal.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
   <feature name='odl-l2switch-all' description="OpenDaylight :: L2Switch :: All" version='${project.version}'>
-- 
2.36.6