X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=artifacts%2Fpom.xml;h=01d78663b2599f76360791b158e9f503bd8ee0d3;hb=e5da6bd273d30e613d7d96375aa97378f55759d5;hp=ae465602a6d43b1e8b73d4db7e6a94d3b43bdc97;hpb=6f691498ea2a432e0bd4dd94294ec9fa78df4b8b;p=netconf.git

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index ae465602a6..01d78663b2 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,13 +14,13 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>9.0.8</version>
+      <version>12.0.5</version>
       <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-artifacts</artifactId>
-    <version>2.0.7-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>
@@ -62,18 +62,19 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-netconf-connector</artifactId>
+                <artifactId>netconf-server</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-impl</artifactId>
+                <artifactId>netconf-server-mdsal</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-mapping-api</artifactId>
+                <artifactId>netconf-test-util</artifactId>
                 <version>${project.version}</version>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
@@ -112,58 +113,97 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-util</artifactId>
+                <artifactId>sal-netconf-connector</artifactId>
                 <version>${project.version}</version>
-                <classifier>config</classifier>
-                <type>cfg</type>
             </dependency>
+
+            <!-- NETCONF Transport API and implementations-->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-netconf-connector</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>transport-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>transport-ssh</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-acm</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>transport-tcp</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>transport-tls</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- YANG models -->
+            <!-- RFC5277 NETCONF Event Notifications -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-monitoring</artifactId>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc5277</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <!-- RFC6022 YANG Module for NETCONF Monitoring -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-monitoring-extension</artifactId>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc6022</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
+            <!-- RFC6241 Network Configuration Protocol (NETCONF) -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-nmda</artifactId>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc6241</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
+            <!-- RFC6243 With-defaults Capability for NETCONF -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-notifications</artifactId>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc6243</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- RFC6470 Network Configuration Protocol (NETCONF) Base Notifications -->
+            <dependency>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc6470</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- RFC8040 RESTCONF Protocol
+                 Note that ietf-restconf is packaged in MD-SAL -->
+            <dependency>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc8040-ietf-restconf-monitoring</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- RFC8341 Network Configuration Access Control Model -->
+            <dependency>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc8341</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- RFC8526 NETCONF Extensions to Support NMDA -->
+            <dependency>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc8526</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- RFC8639 Subscription to YANG Notifications -->
+            <dependency>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc8639</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- draft-ietf-netconf-crypto-types -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-with-defaults</artifactId>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>draft-ietf-netconf-crypto-types</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- FIXME: place these models with their users -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netconf-test-models</artifactId>
@@ -171,67 +211,72 @@
                 <scope>test</scope>
             </dependency>
 
+            <!-- Keystore API and implementations. This is a manifestation of draft-ietf-netconf-keystore. -->
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>yanglib</artifactId>
+                <artifactId>keystore-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>callhome-protocol</artifactId>
+                <artifactId>keystore-none</artifactId>
                 <version>${project.version}</version>
             </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-provider</artifactId>
+                <artifactId>truststore-none</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-notifications-api</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>yanglib</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-netconf-notification</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>yanglib</artifactId>
                 <version>${project.version}</version>
+                <classifier>config</classifier>
+                <type>xml</type>
             </dependency>
+
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-netconf-ssh</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>callhome-protocol</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-netconf-tcp</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>callhome-model</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-topology</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>callhome-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-topology-impl</artifactId>
+                <artifactId>mdsal-netconf-ssh</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-client</artifactId>
+                <artifactId>mdsal-netconf-tcp</artifactId>
                 <version>${project.version}</version>
-                <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-impl</artifactId>
+                <artifactId>netconf-client</artifactId>
                 <version>${project.version}</version>
                 <type>test-jar</type>
             </dependency>
@@ -247,23 +292,35 @@
                 <version>${project.version}</version>
                 <type>test-jar</type>
             </dependency>
+
+            <!-- Applications -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-util</artifactId>
+                <artifactId>netconf-console</artifactId>
                 <version>${project.version}</version>
-                <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-topology-singleton</artifactId>
+                <artifactId>netconf-events-mdsal</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-console</artifactId>
+                <artifactId>netconf-topology</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netconf-topology-impl</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netconf-topology-singleton</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- Shaded third-party libraries -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>shaded-exificient</artifactId>
@@ -325,13 +382,6 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-mapping-api</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-netconf-mdsal</artifactId>
@@ -353,20 +403,6 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-notifications-api</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-notifications-impl</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-netconf-ssh</artifactId>
@@ -464,21 +500,6 @@
             </dependency>
 
             <!-- RESTCONF -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-restconf</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-restconf-monitoring</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-yang-patch</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>restconf-common-models</artifactId>
@@ -486,22 +507,22 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-common</artifactId>
+                <artifactId>restconf-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>restconf-nb-bierman02</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>restconf-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>restconf-nb-rfc8040</artifactId>
+                <artifactId>restconf-nb</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-nb-rfc8040</artifactId>
+                <artifactId>restconf-nb</artifactId>
                 <type>cfg</type>
                 <classifier>config</classifier>
                 <version>${project.version}</version>
@@ -577,14 +598,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-restconf-nb-bierman02</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-restconf-nb-rfc8040</artifactId>
+                <artifactId>odl-restconf-nb</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>