Eliminate mdsal-model-artifact references

Use mdsal-artifacts instead, or no imports when not needed.

Change-Id: I13d1847c6b9c079e9572091d7988c847c87593bf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/common/features/odl-mdsal-binding-base/pom.xml b/common/features/odl-mdsal-binding-base/pom.xml
index 0c561a3283864d4907edafcd3a7049225448a837..be24ad9b14c41169da903e783acc36218be247c5 100644 (file)
--- a/common/features/odl-mdsal-binding-base/pom.xml
+++ b/common/features/odl-mdsal-binding-base/pom.xml
@@ -35,14 +35,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <version>2.7.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/common/features/odl-mdsal-binding2-base/pom.xml b/common/features/odl-mdsal-binding2-base/pom.xml
index 7bd19dcd1b08f8a41f293529384d9ca597180e78..930ab72e6c0ffa10ac4a8a95ed50ba5edcfa974d 100644 (file)
--- a/common/features/odl-mdsal-binding2-base/pom.xml
+++ b/common/features/odl-mdsal-binding2-base/pom.xml
@@ -35,14 +35,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <version>2.7.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/dom/dom-parent/pom.xml b/dom/dom-parent/pom.xml
index d39275ff23f49cf034d3929aa1293e896f58b21e..8057ac19e2622e3496cae7fb3f79a8e6d201a517 100644 (file)
--- a/dom/dom-parent/pom.xml
+++ b/dom/dom-parent/pom.xml
@@ -40,13 +40,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

diff --git a/model/features/features-mdsal-model/pom.xml b/model/features/features-mdsal-model/pom.xml
index 53959ad7da66c0d4960fa3998e9803c6c7a89c4e..3fdaa6e2623454bb02d7352b0dea87b46170dd91 100644 (file)
--- a/model/features/features-mdsal-model/pom.xml
+++ b/model/features/features-mdsal-model/pom.xml
@@ -24,9 +24,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>${project.version}</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-draft-bierman-netconf-restconf-02/pom.xml b/model/features/odl-mdsal-model-draft-bierman-netconf-restconf-02/pom.xml
index 5ab85ffc08004db85d310ca8c93690158bd5bcdd..32d4a01c27f17c0e549c302faceb51cfbc184902 100644 (file)
--- a/model/features/odl-mdsal-model-draft-bierman-netconf-restconf-02/pom.xml
+++ b/model/features/odl-mdsal-model-draft-bierman-netconf-restconf-02/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal/pom.xml b/model/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal/pom.xml
index 713c988e361323b3e8e9afdb2a7e3d2360c416bb..e5720081c75c724c5478897655d7181b746bcd82 100644 (file)
--- a/model/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal/pom.xml
+++ b/model/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01/pom.xml b/model/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01/pom.xml
index 3114e30fdb65a7ce8d87f640cd4809f353bf922f..39a8ee6a614329d6cfe12bc2fee001013c2ce23a 100644 (file)
--- a/model/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01/pom.xml
+++ b/model/features/odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-draft-ietf-lisp-lcaf-10/pom.xml b/model/features/odl-mdsal-model-draft-ietf-lisp-lcaf-10/pom.xml
index 2d8cea4886099fa5c592fd535c3956b94fcecf38..7227113bd97f8ddc4452051524ba83a43779acb7 100644 (file)
--- a/model/features/odl-mdsal-model-draft-ietf-lisp-lcaf-10/pom.xml
+++ b/model/features/odl-mdsal-model-draft-ietf-lisp-lcaf-10/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-draft-ietf-netmod-acl-model-07/pom.xml b/model/features/odl-mdsal-model-draft-ietf-netmod-acl-model-07/pom.xml
index 447272b3a28c8729bb3412a6cc8ed4d93e308c85..e62d8d4ea70d02dca6f84ca0ceb56057f7b7d6f4 100644 (file)
--- a/model/features/odl-mdsal-model-draft-ietf-netmod-acl-model-07/pom.xml
+++ b/model/features/odl-mdsal-model-draft-ietf-netmod-acl-model-07/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-draft-ietf-netmod-iana-afn-safi-00/pom.xml b/model/features/odl-mdsal-model-draft-ietf-netmod-iana-afn-safi-00/pom.xml
index b9f644b2bbc5fe0d5265a02bf4ebd6cb7d366be7..f0294c9e1a0a5760cc0e9c03d02ee1b1a4a01b08 100644 (file)
--- a/model/features/odl-mdsal-model-draft-ietf-netmod-iana-afn-safi-00/pom.xml
+++ b/model/features/odl-mdsal-model-draft-ietf-netmod-iana-afn-safi-00/pom.xml
@@ -32,13 +32,6 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/model/features/odl-mdsal-model-odl-l2-types/pom.xml b/model/features/odl-mdsal-model-odl-l2-types/pom.xml
index 171689e24e48647c96cf973a4d23a1721253cc50..7f0bb6331af518ede782619149f665e03be567b0 100644 (file)
--- a/model/features/odl-mdsal-model-odl-l2-types/pom.xml
+++ b/model/features/odl-mdsal-model-odl-l2-types/pom.xml
@@ -32,13 +32,6 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/model/features/odl-mdsal-model-rfc6991/pom.xml b/model/features/odl-mdsal-model-rfc6991/pom.xml
index a359aa24e19dc7a98a9038b75230e3c1180a877f..e3cba47638f2aed6ade3833d97dd39ff11b3a36c 100644 (file)
--- a/model/features/odl-mdsal-model-rfc6991/pom.xml
+++ b/model/features/odl-mdsal-model-rfc6991/pom.xml
@@ -32,13 +32,6 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/model/features/odl-mdsal-model-rfc7223/pom.xml b/model/features/odl-mdsal-model-rfc7223/pom.xml
index 0691baff5025a05832d0dd90b9c9546951bfe8a5..a66978330bee67188f99d854ef76973634ac3ab5 100644 (file)
--- a/model/features/odl-mdsal-model-rfc7223/pom.xml
+++ b/model/features/odl-mdsal-model-rfc7223/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-rfc7224/pom.xml b/model/features/odl-mdsal-model-rfc7224/pom.xml
index 0c9db4a1612b626a358a018091dca34aca491ad6..ca8dbbcde55996eb09485e9a858e4d714ddcb471 100644 (file)
--- a/model/features/odl-mdsal-model-rfc7224/pom.xml
+++ b/model/features/odl-mdsal-model-rfc7224/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-rfc7277/pom.xml b/model/features/odl-mdsal-model-rfc7277/pom.xml
index 51acee449fa558870143a22b9a8e7aed08d24fd5..26350526684cabce1c91c9b837ba91f1257a4e97 100644 (file)
--- a/model/features/odl-mdsal-model-rfc7277/pom.xml
+++ b/model/features/odl-mdsal-model-rfc7277/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-rfc7895/pom.xml b/model/features/odl-mdsal-model-rfc7895/pom.xml
index cd4d9ac2ee4e4e1f2911e781a4b5a1cd32b3aa0a..b0cb3794226d39e9895f557a543f18cd867c6761 100644 (file)
--- a/model/features/odl-mdsal-model-rfc7895/pom.xml
+++ b/model/features/odl-mdsal-model-rfc7895/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-rfc7952/pom.xml b/model/features/odl-mdsal-model-rfc7952/pom.xml
index 9fa367af4e6b11cccf6a2166d3fb639683a62548..c74a7438ef5c91d0d0b52dd40c92c46b04ca074e 100644 (file)
--- a/model/features/odl-mdsal-model-rfc7952/pom.xml
+++ b/model/features/odl-mdsal-model-rfc7952/pom.xml
@@ -32,13 +32,6 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/model/features/odl-mdsal-model-rfc8294/pom.xml b/model/features/odl-mdsal-model-rfc8294/pom.xml
index 8c6752edf4a5169a59d6c2e242087cace7bb0d97..1c2d631ba66f2c2532f4d951f24d1e4f19868270 100644 (file)
--- a/model/features/odl-mdsal-model-rfc8294/pom.xml
+++ b/model/features/odl-mdsal-model-rfc8294/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-rfc8342/pom.xml b/model/features/odl-mdsal-model-rfc8342/pom.xml
index 3096a8d4119787c03d3da818957de992c492259c..3db6e05332ec1f34d879e81da174af944a616707 100644 (file)
--- a/model/features/odl-mdsal-model-rfc8342/pom.xml
+++ b/model/features/odl-mdsal-model-rfc8342/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-rfc8343/pom.xml b/model/features/odl-mdsal-model-rfc8343/pom.xml
index 623b31df223b47b40cbd8a3aa5cf513a17a68202..b7ad206313510d49c884c8d2f4fc933c77735f19 100644 (file)
--- a/model/features/odl-mdsal-model-rfc8343/pom.xml
+++ b/model/features/odl-mdsal-model-rfc8343/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-rfc8344/pom.xml b/model/features/odl-mdsal-model-rfc8344/pom.xml
index 759ddc9f3722ab82d0c20159215519fcd08e3de5..75d3836e0322865a9cf57dd1299b4478e6d37497 100644 (file)
--- a/model/features/odl-mdsal-model-rfc8344/pom.xml
+++ b/model/features/odl-mdsal-model-rfc8344/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-rfc8345-non-nmda/pom.xml b/model/features/odl-mdsal-model-rfc8345-non-nmda/pom.xml
index 36886e200a9a95e53f8b81a1580ba4f72f5094a9..d0d3b57ea70a6d5fe7dea841fe1ac891df58e2e0 100644 (file)
--- a/model/features/odl-mdsal-model-rfc8345-non-nmda/pom.xml
+++ b/model/features/odl-mdsal-model-rfc8345-non-nmda/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-rfc8345/pom.xml b/model/features/odl-mdsal-model-rfc8345/pom.xml
index f75a1f419d6d4e56573ce02b9338ba158a44ca92..fa898a2080c077700ac6efe94e055d8d4f4d4d97 100644 (file)
--- a/model/features/odl-mdsal-model-rfc8345/pom.xml
+++ b/model/features/odl-mdsal-model-rfc8345/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-rfc8348-non-nmda/pom.xml b/model/features/odl-mdsal-model-rfc8348-non-nmda/pom.xml
index 595009d21e0a1cd42f6aa4cda45af4c218aac459..fbb9e539316349ae86bb6e2a961f1151871fbe47 100644 (file)
--- a/model/features/odl-mdsal-model-rfc8348-non-nmda/pom.xml
+++ b/model/features/odl-mdsal-model-rfc8348-non-nmda/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-rfc8348/pom.xml b/model/features/odl-mdsal-model-rfc8348/pom.xml
index 219669f9e5bc18ab0200660de9344c59be70c35a..78692d3e2b66499f60804dd2173c16be4261b972 100644 (file)
--- a/model/features/odl-mdsal-model-rfc8348/pom.xml
+++ b/model/features/odl-mdsal-model-rfc8348/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/features/odl-mdsal-model-rfc8349/pom.xml b/model/features/odl-mdsal-model-rfc8349/pom.xml
index 8a90166cbdb53c75cda7dd9fc8e340540bf4693a..d2855c1133959e826c4fb5d618d94f228fe724de 100644 (file)
--- a/model/features/odl-mdsal-model-rfc8349/pom.xml
+++ b/model/features/odl-mdsal-model-rfc8349/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/model/ietf/rfc8294-ietf-routing-types/pom.xml b/model/ietf/rfc8294-ietf-routing-types/pom.xml
index 9e066c8f6a758b627e22debab8157d5077164581..c4463769a3d3a6949f92129b99b1a6a68553bdbe 100644 (file)
--- a/model/ietf/rfc8294-ietf-routing-types/pom.xml
+++ b/model/ietf/rfc8294-ietf-routing-types/pom.xml
@@ -26,18 +26,6 @@
     <name>${project.artifactId}</name>
     <description>RFC8294 ietf-routing-types</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/model/ietf/rfc8294/pom.xml b/model/ietf/rfc8294/pom.xml
index ed84e4c8bbda5640c9ed070bbc6a3bffcee1964b..ed4f0680da93cb792de3e7f730626895ba5d0168 100644 (file)
--- a/model/ietf/rfc8294/pom.xml
+++ b/model/ietf/rfc8294/pom.xml
@@ -27,9 +27,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/model/ietf/rfc8342-ietf-origin/pom.xml b/model/ietf/rfc8342-ietf-origin/pom.xml
index f4848c049bb14bed9a6210e19fed07767bb1d76e..ff6b86d751e20b24739ced018cc3e49a951147ac 100644 (file)
--- a/model/ietf/rfc8342-ietf-origin/pom.xml
+++ b/model/ietf/rfc8342-ietf-origin/pom.xml
@@ -26,18 +26,6 @@
     <name>${project.artifactId}</name>
     <description>RFC8342 ietf-origin</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>

diff --git a/model/ietf/rfc8342/pom.xml b/model/ietf/rfc8342/pom.xml
index ab8db02e4a52b79a1fce8c0ff72ce56e904c0e02..73c3fa241221b992580826e47294afaf9e5cfc5a 100644 (file)
--- a/model/ietf/rfc8342/pom.xml
+++ b/model/ietf/rfc8342/pom.xml
@@ -27,9 +27,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/model/ietf/rfc8343/pom.xml b/model/ietf/rfc8343/pom.xml
index 6f892d67ae3b9f10c834e6276d61e5890d096fa3..1b4db43c5ddc40967029cf1a473f1f6910818a7a 100644 (file)
--- a/model/ietf/rfc8343/pom.xml
+++ b/model/ietf/rfc8343/pom.xml
@@ -26,18 +26,6 @@
     <name>${project.artifactId}</name>
     <description>RFC8343 Interface Management</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/model/ietf/rfc8344/pom.xml b/model/ietf/rfc8344/pom.xml
index f961117b9adc6ef665ac95dd7524d761c55b1e3a..190c9d7e9b72ba502c9d9c7b15a76073a9f2a0ec 100644 (file)
--- a/model/ietf/rfc8344/pom.xml
+++ b/model/ietf/rfc8344/pom.xml
@@ -26,18 +26,6 @@
     <name>${project.artifactId}</name>
     <description>RFC8343 IP Management</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/model/ietf/rfc8345-ietf-network-state/pom.xml b/model/ietf/rfc8345-ietf-network-state/pom.xml
index 158aeb695d6801cd9aacfb983916a8bfaa2ba3a3..9eac012a8c65c08cdd70f4e61aa69f8c5368fc4b 100644 (file)
--- a/model/ietf/rfc8345-ietf-network-state/pom.xml
+++ b/model/ietf/rfc8345-ietf-network-state/pom.xml
@@ -26,18 +26,6 @@
     <name>${project.artifactId}</name>
     <description>RFC8345 ietf-network for non-NMDA</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>

diff --git a/model/ietf/rfc8345-ietf-network-topology-state/pom.xml b/model/ietf/rfc8345-ietf-network-topology-state/pom.xml
index 97266315be6f61329253dfba0d0c0029d9a8d686..b6d1b02294f051e318b6d888903e5525860efb85 100644 (file)
--- a/model/ietf/rfc8345-ietf-network-topology-state/pom.xml
+++ b/model/ietf/rfc8345-ietf-network-topology-state/pom.xml
@@ -26,18 +26,6 @@
     <name>${project.artifactId}</name>
     <description>RFC8345 ietf-network-topology for non-NMDA</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>

diff --git a/model/ietf/rfc8345-ietf-network-topology/pom.xml b/model/ietf/rfc8345-ietf-network-topology/pom.xml
index 563e7d0c7546dad123cfedf1b48540e557f501ec..6693c753ab6346adc43831ef69fdc30ad370fb81 100644 (file)
--- a/model/ietf/rfc8345-ietf-network-topology/pom.xml
+++ b/model/ietf/rfc8345-ietf-network-topology/pom.xml
@@ -26,18 +26,6 @@
     <name>${project.artifactId}</name>
     <description>RFC8345 ietf-network-topology</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>

diff --git a/model/ietf/rfc8345-ietf-network/pom.xml b/model/ietf/rfc8345-ietf-network/pom.xml
index 0ed37e056d2c21a62ce9acbea810b17720364526..5c3cceb452cf36841e075c6b0a5843acd22cc064 100644 (file)
--- a/model/ietf/rfc8345-ietf-network/pom.xml
+++ b/model/ietf/rfc8345-ietf-network/pom.xml
@@ -26,18 +26,6 @@
     <name>${project.artifactId}</name>
     <description>RFC8345 ietf-network</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/model/ietf/rfc8345/pom.xml b/model/ietf/rfc8345/pom.xml
index 2b4477a11c14205bba03116126497e504a892606..8fb43b76ff0ce1b85d8e1106c685962063b88fcc 100644 (file)
--- a/model/ietf/rfc8345/pom.xml
+++ b/model/ietf/rfc8345/pom.xml
@@ -27,9 +27,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/model/ietf/rfc8348-ietf-hardware-state/pom.xml b/model/ietf/rfc8348-ietf-hardware-state/pom.xml
index a3152e72cd92cb9d79daf31aebc7850c9ba478b2..0d099e4c75a5bbcd9d07b6cfc4ae5fc42c690110 100644 (file)
--- a/model/ietf/rfc8348-ietf-hardware-state/pom.xml
+++ b/model/ietf/rfc8348-ietf-hardware-state/pom.xml
@@ -26,18 +26,6 @@
     <name>${project.artifactId}</name>
     <description>RFC8348 ietf-hardware-state</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>

diff --git a/model/ietf/rfc8348-ietf-hardware/pom.xml b/model/ietf/rfc8348-ietf-hardware/pom.xml
index 8f09e981b7c44f824daf108510926dfed3885cd6..ece4a007aba9f44a3b13624129e37f36a141caf5 100644 (file)
--- a/model/ietf/rfc8348-ietf-hardware/pom.xml
+++ b/model/ietf/rfc8348-ietf-hardware/pom.xml
@@ -26,18 +26,6 @@
     <name>${project.artifactId}</name>
     <description>RFC8348 ietf-hardware</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/model/ietf/rfc8348/pom.xml b/model/ietf/rfc8348/pom.xml
index 1b0c9045c7e43005d77ccdd1fcc1a6cd75a1006d..a79e920231c31fc9d6e541de8e4e7d3c1c5e6108 100644 (file)
--- a/model/ietf/rfc8348/pom.xml
+++ b/model/ietf/rfc8348/pom.xml
@@ -27,9 +27,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml b/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml
index fde0e9e26202f137964f872d2a8345ca74b1e61d..6b3712f942696488fe8b4cf7776435d5803326c2 100644 (file)
--- a/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml
+++ b/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml
@@ -26,18 +26,6 @@
     <name>${project.artifactId}</name>
     <description>RFC8349 ietf-ipv4-unicast-routing</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml b/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml
index d111d7692df55e78fbeb9fba8a9c0b13810ab2b0..91e3c5054d8560671e4b2064f6106f85f2233853 100644 (file)
--- a/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml
+++ b/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml
@@ -26,18 +26,6 @@
     <name>${project.artifactId}</name>
     <description>RFC8349 ietf-ipv6-unicast-routing</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>

diff --git a/model/ietf/rfc8349-ietf-routing/pom.xml b/model/ietf/rfc8349-ietf-routing/pom.xml
index 158996d4cec306ea2f90020185860789feeeee8b..18dde99121dd29b107c033dcb7fe8bca62f73bba 100644 (file)
--- a/model/ietf/rfc8349-ietf-routing/pom.xml
+++ b/model/ietf/rfc8349-ietf-routing/pom.xml
@@ -26,18 +26,6 @@
     <name>${project.artifactId}</name>
     <description>RFC8349 ietf-routing</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/model/ietf/rfc8349/pom.xml b/model/ietf/rfc8349/pom.xml
index 03a98d176ee9b7c6eda1675effeb59a781cb71f1..57dd4219de4f938cfa22e6065ba02ffb684d7aa3 100644 (file)
--- a/model/ietf/rfc8349/pom.xml
+++ b/model/ietf/rfc8349/pom.xml
@@ -27,9 +27,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>