Merge "Bug 2731: Discard changes only when transaction exist."

[controller.git] / features / netconf-connector / pom.xml

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 6812076aa016185f4181f9a20f20b23706020a35..9cb2b1e33ffceaa6c20b92b0e67a5b601a30fe43 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -162,13 +162,12 @@
       Optional TODO: Remove TODO comments.
     -->
     <!-- test to validate features.xml -->
-    <!-- THIS IS A HORRIBLE IDEA, BUT NECESSARY TO BREAK A CYCLIC DEPENDENCY
+   <!--FIXME BUG-2195 When running single feature tests for netconf connector, features including ssh proxy server always fail (this behavior does not appear when running karaf distro directly)-->
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>features-test</artifactId>
-      <version>${yangtools.version}</version>
       <scope>test</scope>
-    </dependency> -->
+    </dependency>
     <!-- dependency for opendaylight-karaf-empty for use by testing -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -238,7 +237,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>