X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fnetconf-connector%2Ffeatures-netconf-connector%2Fpom.xml;h=a437da1afb24ad8e948830719267b4afc3900d83;hb=ed635bd35457055fb23203b825089bf97ce88645;hp=d0e3035e0e46567bcd033fa6017043fd834e5b5c;hpb=9cdbc4e634d8e64254c19f46650736365756c7d4;p=netconf.git

diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml
index d0e3035e0e..a437da1afb 100644
--- a/features/netconf-connector/features-netconf-connector/pom.xml
+++ b/features/netconf-connector/features-netconf-connector/pom.xml
@@ -6,141 +6,76 @@
  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>features-parent</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <artifactId>feature-repo-parent</artifactId>
+    <version>4.0.11</version>
     <relativePath/>
   </parent>
+
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>features-netconf-connector</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <version>1.6.2-SNAPSHOT</version>
+  <packaging>feature</packaging>
 
   <properties>
-    <commons.opendaylight.version>1.9.0-SNAPSHOT</commons.opendaylight.version>
-    <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
-    <config.version>0.7.0-SNAPSHOT</config.version>
-    <features.test.version>1.9.0-SNAPSHOT</features.test.version>
-    <mdsal.version>2.3.0-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
-    <netconf.connector.version>1.6.0-SNAPSHOT</netconf.connector.version>
-    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
+    <!-- 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>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <version>${yangtools.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <version>${controller.mdsal.version}</version>
-      <classifier>features</classifier>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-message-bus</artifactId>
+      <version>${project.version}</version>
       <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
       <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>features-netconf</artifactId>
-      <classifier>features</classifier>
+      <artifactId>odl-netconf-clustered-topology</artifactId>
+      <version>${project.version}</version>
       <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>sal-netconf-connector</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>messagebus-netconf</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-console</artifactId>
+      <artifactId>odl-netconf-connector</artifactId>
       <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-topology</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-topology-config</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-tcp</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-ssh</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-topology-singleton</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-connector-config</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-config</artifactId>
+      <artifactId>odl-netconf-connector-all</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>callhome-model</artifactId>
+      <artifactId>odl-netconf-callhome-ssh</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>callhome-protocol</artifactId>
+      <artifactId>odl-netconf-console</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>callhome-provider</artifactId>
+      <artifactId>odl-netconf-topology</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
   </dependencies>
-
-  <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=summary</url>
-  </scm>
 </project>