X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=artifacts%2Fpom.xml;h=4bb60acbba2e6f321a0207a19f9d869ecc4ab216;hb=d9f3b7bd66f2a4937dc47a4b99ccb14ebc248d78;hp=aa06af3fc6632ef9758d85d3405e93e5b8494c51;hpb=2e9bb7b3c8c38f91b2ebd8702876e427a34808b7;p=netconf.git

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index aa06af3fc6..4bb60acbba 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,22 +14,17 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>9.0.12</version>
+      <version>13.0.3</version>
       <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-artifacts</artifactId>
-    <version>2.0.12-SNAPSHOT</version>
+    <version>7.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-authn-odl-plugin</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netconf-api</artifactId>
@@ -37,12 +32,12 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-dom-api</artifactId>
+                <artifactId>netconf-auth</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-auth</artifactId>
+                <artifactId>netconf-auth-aaa</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -57,37 +52,38 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-config</artifactId>
+                <artifactId>netconf-common-mdsal</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-netconf-connector</artifactId>
+                <artifactId>netconf-config</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-impl</artifactId>
+                <artifactId>netconf-dom-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-mapping-api</artifactId>
+                <artifactId>netconf-server</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-netconf-monitoring</artifactId>
+                <artifactId>netconf-server-mdsal</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>mdsal-netconf-yang-library</artifactId>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netconf-test-util</artifactId>
                 <version>${project.version}</version>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>mdsal-netconf-impl</artifactId>
+                <artifactId>mdsal-netconf-yang-library</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -107,63 +103,131 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-util</artifactId>
+                <artifactId>netconf-client-mdsal</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
+            <!-- NETCONF Transport API and implementations-->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-util</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>transport-api</artifactId>
                 <version>${project.version}</version>
-                <classifier>config</classifier>
-                <type>cfg</type>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-netconf-connector</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>transport-ssh</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>transport-tcp</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-acm</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>transport-tls</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- NETCONF Transport features -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-monitoring</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>odl-netconf-transport</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-monitoring-extension</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>odl-netconf-transport-api</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
 
+            <!-- YANG models -->
+            <!-- RFC5277 NETCONF Event Notifications -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-nmda</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-notifications</artifactId>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc6022</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- RFC6241 Network Configuration Protocol (NETCONF) -->
+            <dependency>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc6241</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- RFC6243 With-defaults Capability for NETCONF -->
+            <dependency>
+                <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>
+            <!-- RFC7407 A YANG Data Model for SNMP Configuration -->
+            <dependency>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc7407-ietf-x509-cert-to-name</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- RFC8641 Subscription to YANG Notifications -->
+            <dependency>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc8641</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- RFC8650 Dynamic Subscription to YANG Events and Datastores over RESTCONF -->
+            <dependency>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc8650</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,58 +235,66 @@
                 <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>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>callhome-model</artifactId>
+                <artifactId>odl-netconf-keystore</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-provider</artifactId>
+                <artifactId>truststore-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-notifications-api</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>truststore-none</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-netconf-notification</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>odl-netconf-truststore</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
+
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-netconf-ssh</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>yanglib</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-netconf-tcp</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>callhome-protocol</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-topology</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>callhome-model</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-topology-impl</artifactId>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>callhome-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netconf-client</artifactId>
@@ -231,27 +303,31 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-impl</artifactId>
+                <artifactId>netconf-netty-util</artifactId>
                 <version>${project.version}</version>
                 <type>test-jar</type>
             </dependency>
+
+            <!-- Applications -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-netty-util</artifactId>
+                <artifactId>netconf-console</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>netconf-nb</artifactId>
                 <version>${project.version}</version>
-                <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-ssh</artifactId>
+                <artifactId>netconf-topology</artifactId>
                 <version>${project.version}</version>
-                <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-util</artifactId>
+                <artifactId>netconf-topology-impl</artifactId>
                 <version>${project.version}</version>
-                <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
@@ -260,10 +336,11 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-console</artifactId>
+                <artifactId>yanglib-mdsal-writer</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- Shaded third-party libraries -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>shaded-exificient</artifactId>
@@ -292,193 +369,197 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-aaa-netconf-plugin-no-cluster</artifactId>
+                <artifactId>odl-netconf-all</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-all</artifactId>
+                <artifactId>odl-netconf-api</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-api</artifactId>
+                <artifactId>odl-netconf-client</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-client</artifactId>
+                <artifactId>odl-netconf-impl</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-impl</artifactId>
+                <artifactId>odl-netconf-mdsal</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-mapping-api</artifactId>
+                <artifactId>odl-netconf-model-rfc5277</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-mdsal</artifactId>
+                <artifactId>odl-netconf-model-rfc6022</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-monitoring</artifactId>
+                <artifactId>odl-netconf-model-rfc6241</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-netty-util</artifactId>
+                <artifactId>odl-netconf-model-rfc6243</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-notifications-api</artifactId>
+                <artifactId>odl-netconf-model-rfc6470</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-notifications-impl</artifactId>
+                <artifactId>odl-netconf-model-rfc8040</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-ssh</artifactId>
+                <artifactId>odl-netconf-model-rfc8341</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-tcp</artifactId>
+                <artifactId>odl-netconf-model-rfc8526</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-util</artifactId>
+                <artifactId>odl-netconf-model-rfc8639</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
-
-            <!-- netconf-connector features -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>features-netconf-connector</artifactId>
+                <artifactId>odl-netconf-model-rfc8641</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-clustered-topology</artifactId>
+                <artifactId>odl-netconf-model-rfc8650</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-connector</artifactId>
+                <artifactId>odl-netconf-monitoring</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-connector-all</artifactId>
+                <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-connector-ssh</artifactId>
+                <artifactId>odl-netconf-util</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-callhome-ssh</artifactId>
+                <artifactId>odl-yanglib-mdsal-writer</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+
+            <!-- netconf-connector features -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-console</artifactId>
+                <artifactId>odl-netconf-clustered-topology</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-topology</artifactId>
+                <artifactId>odl-netconf-connector</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
-
-            <!-- yanglib features -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>features-yanglib</artifactId>
+                <artifactId>odl-netconf-connector-all</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-yanglib</artifactId>
+                <artifactId>odl-netconf-connector-ssh</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
-
-            <!-- RESTCONF -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-restconf</artifactId>
+                <artifactId>odl-netconf-callhome-ssh</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-restconf-monitoring</artifactId>
+                <artifactId>odl-netconf-console</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-yang-patch</artifactId>
+                <artifactId>odl-netconf-topology</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
+
+            <!-- RESTCONF -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>restconf-common-models</artifactId>
@@ -486,22 +567,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>
@@ -520,7 +601,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>sal-rest-docgen</artifactId>
+                <artifactId>restconf-openapi</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -542,65 +623,67 @@
             <!-- restconf features -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>features-restconf</artifactId>
+                <artifactId>odl-restconf-openapi</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-apidocs</artifactId>
+                <artifactId>odl-restconf</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-restconf</artifactId>
+                <artifactId>odl-restconf-all</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-restconf-all</artifactId>
+                <artifactId>odl-restconf-common</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-restconf-common</artifactId>
+                <artifactId>odl-restconf-nb</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+
+            <!-- Testing features -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-restconf-nb-bierman02</artifactId>
+                <artifactId>features-netconf-testing</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-netconf-test-tools</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
 
-            <!-- Testing features -->
+            <!-- Experimental features -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>features-netconf-testing</artifactId>
+                <artifactId>features-netconf-experimental</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-test-tools</artifactId>
+                <artifactId>odl-yanglib</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>