X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=artifacts%2Fpom.xml;h=65db20213bdb0f724d8b2822021e46bdb4c998f4;hb=2c347423e1684f28b9dea56b6517055294174b3a;hp=1d0f84cca93bbfc5ca7c50234812464147c2512f;hpb=d3ee3fa3b44f2823d045d1795749f9538dea4223;p=netconf.git

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 1d0f84cca9..65db20213b 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,13 +14,13 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>13.0.10</version>
+      <version>13.0.11</version>
       <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-artifacts</artifactId>
-    <version>7.0.0-SNAPSHOT</version>
+    <version>7.0.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>
@@ -52,12 +52,12 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-common-mdsal</artifactId>
+                <artifactId>netconf-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-config</artifactId>
+                <artifactId>netconf-common-mdsal</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -248,56 +248,61 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>keystore-none</artifactId>
+                <artifactId>keystore-legacy</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>odl-netconf-keystore</artifactId>
+                <artifactId>keystore-none</artifactId>
                 <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
             </dependency>
-
-            <!-- Truststore API and implementations. This is a manifestation of draft-ietf-netconf-truststore. -->
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>truststore-api</artifactId>
+                <artifactId>keystore-plaintext-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>truststore-none</artifactId>
+                <artifactId>keystore-plaintext-localfile</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+             <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>keystore-plaintext-cli</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>odl-netconf-truststore</artifactId>
+                <artifactId>odl-netconf-keystore</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
-
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>yanglib</artifactId>
+                <artifactId>odl-netconf-keystore-plaintext</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
 
+            <!-- Truststore API and implementations. This is a manifestation of draft-ietf-netconf-truststore. -->
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>callhome-model</artifactId>
+                <artifactId>truststore-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>callhome-server</artifactId>
+                <artifactId>truststore-none</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>callhome-provider</artifactId>
+                <artifactId>odl-netconf-truststore</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
 
             <dependency>
@@ -309,6 +314,11 @@
             </dependency>
 
             <!-- Applications -->
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>callhome-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netconf-console</artifactId>
@@ -388,6 +398,13 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-netconf-common</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-netconf-impl</artifactId>
@@ -486,13 +503,6 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-netty-util</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-netconf-util</artifactId>
@@ -691,13 +701,6 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-yanglib</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>