X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=artifacts%2Fpom.xml;h=56a6635cc40fe232da89d8aa1232c8830671bc2c;hb=refs%2Fchanges%2F81%2F101881%2F2;hp=579479d0b9213ac8c907f9eeae51a6b08fc0dfd2;hpb=5b3bbd2287f6f5c583c73130d442486ee511454f;p=netconf.git

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 579479d0b9..56a6635cc4 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>10.0.2</version>
+      <version>11.0.0</version>
       <relativePath/>
     </parent>
 
@@ -123,47 +123,64 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- YANG models -->
+            <!-- RFC5277 NETCONF Event Notifications -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf</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-acm</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-monitoring</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-monitoring-extension</artifactId>
+                <groupId>org.opendaylight.netconf.model</groupId>
+                <artifactId>rfc6243</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
+            <!-- RFC6470 Network Configuration Protocol (NETCONF) Base Notifications -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-nmda</artifactId>
+                <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>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-notifications</artifactId>
+                <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>${project.groupId}</groupId>
-                <artifactId>ietf-netconf-with-defaults</artifactId>
+                <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>
 
+            <!-- FIXME: place these models with their users -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netconf-test-models</artifactId>
@@ -464,11 +481,6 @@
             </dependency>
 
             <!-- RESTCONF -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-restconf-monitoring</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>restconf-common-models</artifactId>
@@ -481,12 +493,12 @@
             </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>
@@ -562,7 +574,7 @@
             </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>