X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fnetconf-connector%2Fpom.xml;h=d2c3acc43c31806e81011c4eacad7ba9907faebb;hb=18e2dee4cae31c74617ddda27a23bf10d5a465e0;hp=02efc20c865268bdc31d537c9628ecd5e206aa55;hpb=c9e94ddcd19f8ca0ca22c11e44371230a14729a8;p=netconf.git

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 02efc20c86..d2c3acc43c 100644
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
 
  This program and the accompanying materials are made available under the
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -12,26 +12,24 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>features-netconf-connector</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>
-    <aaa.version>0.4.0-SNAPSHOT</aaa.version>
-    <commons.opendaylight.version>1.7.0-SNAPSHOT</commons.opendaylight.version>
-    <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
-    <config.version>0.5.0-SNAPSHOT</config.version>
-    <features.test.version>1.7.0-SNAPSHOT</features.test.version>
-    <mdsal.version>2.1.0-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
-    <netconf.version>1.1.0-SNAPSHOT</netconf.version>
-    <netconf.connector.version>1.4.0-SNAPSHOT</netconf.connector.version>
-    <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
-    <surefire.version>2.15</surefire.version>
+    <commons.opendaylight.version>1.8.0-SNAPSHOT</commons.opendaylight.version>
+    <controller.mdsal.version>1.5.0-SNAPSHOT</controller.mdsal.version>
+    <config.version>0.6.0-SNAPSHOT</config.version>
+    <features.test.version>1.8.0-SNAPSHOT</features.test.version>
+    <mdsal.version>2.2.0-SNAPSHOT</mdsal.version>
+    <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.2.0-SNAPSHOT</netconf.version>
+    <netconf.connector.version>1.5.0-SNAPSHOT</netconf.connector.version>
+    <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
 
     <features.file>features.xml</features.file>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
@@ -45,7 +43,7 @@
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -82,13 +80,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>features-aaa</artifactId>
-      <version>${aaa.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>sal-netconf-connector</artifactId>
@@ -105,15 +96,8 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-config-dispatcher</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-connector-config</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>abstract-topology</artifactId>
+      <artifactId>netconf-console</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -125,12 +109,6 @@
       <classifier>config</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-       <groupId>${project.groupId}</groupId>
-       <artifactId>netconf-topology-config</artifactId>
-       <classifier>clustered-config</classifier>
-       <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-tcp</artifactId>
@@ -147,6 +125,10 @@
       <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>
@@ -155,17 +137,8 @@
       <type>xml</type>
       <classifier>config</classifier>
     </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.controller</groupId>
-      <artifactId>opendaylight-karaf-empty</artifactId>
-      <version>${commons.opendaylight.version}</version>
-      <scope>test</scope>
-      <type>zip</type>
-    </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>