X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fnetconf%2Fpom.xml;h=c82dc1c23a602530d8632f164a58a2cdfa38155c;hb=c0488b3e5a8d1bbe2894eda5eb1254f6ced347a4;hp=b79e70badd9140036ce1bff4fac4532efa9ff112;hpb=79442845154d6d54cd826745711ca73cc17bc318;p=netconf.git

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index b79e70badd..c82dc1c23a 100644
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -4,30 +4,27 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
-  <!-- FIXME: Convert to features-parent -->
+
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>features-netconf</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>
-    <aaa.version>0.3.0-SNAPSHOT</aaa.version>
-    <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
-    <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
-    <config.version>0.4.0-SNAPSHOT</config.version>
-    <exi.nagasena.version>0000.0002.0053.0</exi.nagasena.version>
-    <features.test.version>1.6.0-SNAPSHOT</features.test.version>
-    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
-    <netconf.version>1.0.0-SNAPSHOT</netconf.version>
-    <protocol-framework.version>0.7.0-SNAPSHOT</protocol-framework.version>
-    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
-    <surefire.version>2.15</surefire.version>
+    <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.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.1.0-SNAPSHOT</netconf.version>
+    <protocol-framework.version>0.8.0-SNAPSHOT</protocol-framework.version>
+    <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
     <sshd-core.version>0.14.0</sshd-core.version>
 
-    <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.mdsal.configfile>08-mdsal-netconf.xml</config.netconf.mdsal.configfile>
@@ -35,6 +32,20 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.aaa</groupId>
+        <artifactId>aaa-artifacts</artifactId>
+        <version>${aaa.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-artifacts</artifactId>
+        <version>1.7.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-artifacts</artifactId>
@@ -75,9 +86,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>features-aaa-shiro</artifactId>
-      <version>${aaa.version}</version>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>features-odlparent</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -89,10 +99,27 @@
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-config</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-config-persister</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-config-netty</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>features-aaa</artifactId>
-      <version>${aaa.version}</version>
+      <artifactId>features-aaa-shiro</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -104,10 +131,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-auth</artifactId>
@@ -144,18 +167,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>ietf-netconf-notifications</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-yang-types</artifactId>
-    </dependency>
-      <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-model-api</artifactId>
-      </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-mapping-api</artifactId>
@@ -184,36 +195,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-netty-util</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.sshd</groupId>
-      <artifactId>sshd-core</artifactId>
-      <version>${sshd-core.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>openexi</groupId>
-      <artifactId>nagasena</artifactId>
-      <version>${exi.nagasena.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-handler</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
@@ -229,14 +210,12 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-config</artifactId>
-      <version>${netconf.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-connector-config</artifactId>
-      <version>${netconf.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
@@ -258,14 +237,6 @@
       <classifier>config</classifier>
       <type>xml</type>
     </dependency>
-    <!-- dependency for opendaylight-karaf-empty for use by testing -->
-    <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>