BUG-8923: Bump odlparent to 2.0.4

[netconf.git] / features / netconf-connector / pom.xml

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 0750c52c2d0ec28f0c2ee5db90cc6aae50d9c320..ca70c0e019a953d18e2468432cf2c8f623676562 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -1,43 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 <?xml version="1.0" encoding="UTF-8"?>
 <!--

- Copyright (c) 2016 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
 
  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">
 <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.8.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.netconf</groupId>
-  <artifactId>features-netconf-connector</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>2.0.4</version>
+        <relativePath/>
+    </parent>
+    <groupId>org.opendaylight.netconf</groupId>
+    <artifactId>features-netconf-connector-aggregator</artifactId>
+    <version>1.3.0-SNAPSHOT</version>
+    <packaging>pom</packaging>

 
 

-  <properties>
-    <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>
-  </properties>
+    <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>
+      <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>
+
+    <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>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>

-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>

         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <type>pom</type>
         <scope>import</scope>
       </dependency>


@@ -104,16 +115,20 @@
       <artifactId>netconf-ssh</artifactId>
     </dependency>
     <dependency>
       <artifactId>netconf-ssh</artifactId>
     </dependency>
     <dependency>

-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netconf-topology-singleton</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>callhome-model</artifactId>

     </dependency>
     <dependency>
     </dependency>
     <dependency>

-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>callhome-provider</artifactId>

     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

-      <artifactId>netconf-topology-singleton</artifactId>
+      <artifactId>callhome-protocol</artifactId>

     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>