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

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index ba2c186ea8..aed5088a67 100644
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -1,51 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ Copyright © 2017 Red Hat, Inc. and others.
 
  This program and the accompanying materials are made available under the
  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">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.netconf</groupId>
-  <artifactId>features-netconf-connector</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>2.0.2</version>
+        <relativePath/>
+    </parent>
+    <groupId>org.opendaylight.netconf</groupId>
+    <artifactId>features-netconf-connector-aggregator</artifactId>
+    <version>1.3.0-SNAPSHOT</version>
+    <packaging>pom</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>1.0.0-SNAPSHOT</yangtools.version>
-    <surefire.version>2.15</surefire.version>
+    <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>
+    </properties>
 
-    <features.file>features.xml</features.file>
-    <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-    <config.netconf.client.configfile>01-netconf.xml</config.netconf.client.configfile>
-    <config.netconf.topology.configfile>02-netconf-topology.xml</config.netconf.topology.configfile>
-    <config.netconf.connector.configfile>99-netconf-connector.xml</config.netconf.connector.configfile>
-  </properties>
+    <modules>
+        <module>features-netconf-connector</module>
+        <module>odl-message-bus</module>
+        <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>
+    </modules>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -82,13 +86,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>
@@ -98,74 +95,62 @@
       <artifactId>messagebus-netconf</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>messagebus-netconf</artifactId>
-      <type>xml</type>
-      <classifier>config</classifier>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netconf-console</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-config-dispatcher</artifactId>
+      <artifactId>netconf-topology</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-connector-config</artifactId>
+      <artifactId>netconf-topology-config</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>abstract-topology</artifactId>
+      <artifactId>netconf-tcp</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-topology</artifactId>
+      <artifactId>netconf-ssh</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-topology-config</artifactId>
-      <classifier>config</classifier>
-      <type>xml</type>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk15on</artifactId>
+      <version>${bouncycastle.version}</version>
     </dependency>
     <dependency>
-       <groupId>${project.groupId}</groupId>
-       <artifactId>netconf-topology-config</artifactId>
-       <classifier>clustered-config</classifier>
-       <type>xml</type>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+      <version>${bouncycastle.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-tcp</artifactId>
+      <artifactId>netconf-topology-singleton</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-ssh</artifactId>
+      <artifactId>callhome-model</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>callhome-provider</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>callhome-protocol</artifactId>
     </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-connector-config</artifactId>
-      <version>${netconf.version}</version>
-      <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>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netconf-config</artifactId>
     </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>