X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fnetconf-connector%2Fpom.xml;h=d2936e6980625a406f55f24c71e69e2a6cf5bbf4;hb=191ac8656b4523bb1595039cc4733772cdfaf8b9;hp=aed5088a67e739dd32ff6076fd93c18d36960e5b;hpb=eb92a7a04e05eb962592eaf01cac3499666400bd;p=netconf.git

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index aed5088a67..d2936e6980 100644
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -6,30 +6,25 @@
  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>odlparent</artifactId>
-        <version>2.0.2</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>features-netconf-connector-aggregator</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>pom</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</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>
+      <commons.opendaylight.version>1.12.0-SNAPSHOT</commons.opendaylight.version>
+      <controller.mdsal.version>1.9.0-SNAPSHOT</controller.mdsal.version>
+      <mdsal.version>3.0.1</mdsal.version>
+      <netconf.version>1.6.0-SNAPSHOT</netconf.version>
+      <netconf.connector.version>1.9.0-SNAPSHOT</netconf.connector.version>
     </properties>
 
     <modules>
@@ -38,7 +33,6 @@
         <module>odl-netconf-clustered-topology</module>
         <module>odl-netconf-connector</module>
         <module>odl-netconf-connector-all</module>
-        <module>odl-netconf-connector-ssh</module>
         <module>odl-netconf-callhome-ssh</module>
         <module>odl-netconf-console</module>
         <module>odl-netconf-topology</module>
@@ -49,7 +43,14 @@
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>2.1.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -60,7 +61,6 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>features-yangtools</artifactId>
-      <version>${yangtools.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -72,14 +72,6 @@
       <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>
@@ -115,16 +107,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-ssh</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>${bouncycastle.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>${bouncycastle.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-topology-singleton</artifactId>
@@ -141,10 +123,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>callhome-protocol</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-connector-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-config</artifactId>