X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fnetconf-connector%2Ffeatures-netconf-connector%2Fpom.xml;h=066e8325050844b0af7e7ac55f244facc2aea896;hb=6dbde064d876ae93f129b2a0bcb47f01777e8f9d;hp=01ffc85a65c4211133e16c4a211132c1e936ac36;hpb=fc7cf19a6e5f0d0f27365921f97c03e397ee9db7;p=netconf.git

diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml
index 01ffc85a65..066e832505 100644
--- a/features/netconf-connector/features-netconf-connector/pom.xml
+++ b/features/netconf-connector/features-netconf-connector/pom.xml
@@ -6,23 +6,27 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>2.0.0</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>features-netconf-connector</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
+  <properties>
+    <!-- Skip SFT as some of the features are mutually exclusive, i.e. SFT may fail
+         if certain features are installed together. -->
+    <skip.karaf.featureTest>true</skip.karaf.featureTest>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -52,13 +56,6 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-connector-ssh</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-callhome-ssh</artifactId>
@@ -81,4 +78,4 @@
       <classifier>features</classifier>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>