Code Review / mdsal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 5b6ea41)
Remove mdsal-model-artifacts 28/75128/2
authorRobert Varga <robert.varga@pantheon.tech>
Sat, 11 Aug 2018 07:59:53 +0000 (09:59 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Sat, 11 Aug 2018 08:10:30 +0000 (10:10 +0200)
Integrate the declarations into mdsal-artifacts and remove
mdsal-model-artifacts.

Change-Id: I4247d3ebe07cb9d5b689b70ec613782afcc06631
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
common/artifacts/pom.xml patch | blob | history
model/artifacts/pom.xml [deleted file] patch | blob | history
model/pom.xml patch | blob | history

diff --git a/common/artifacts/pom.xml b/common/artifacts/pom.xml
index 82b5c9081df993a070080d525bd5a774757adf86..230f8f23e227d000347eadd325bd2ba4da3273d4 100644 (file)
--- a/common/artifacts/pom.xml
+++ b/common/artifacts/pom.xml
@@ -24,7 +24,6 @@
 
     <dependencyManagement>
         <dependencies>
-
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>features-mdsal</artifactId>
@@ -33,14 +32,6 @@
                 <type>xml</type>
             </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>
-
             <!-- Common APIs for Binding and DOM -->
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
@@ -436,6 +427,423 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+
+            <!-- MODELS -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>opendaylight-l2-types</artifactId>
+                <version>2013.08.27.15.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC6991 -->
+            <!-- FIXME: harmonize packaging of these two, as per the discussion at
+                 https://lists.opendaylight.org/pipermail/mdsal-dev/2018-April/001656.html -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-inet-types-2013-07-15</artifactId>
+                <version>1.7.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-yang-types-20130715</artifactId>
+                <version>2013.07.15.15.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-type-util</artifactId>
+                <version>2.3.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC7223 -->
+            <!-- FIXME: upgrade this to RFC8343 (2018-02-20, NMDA) -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-interfaces</artifactId>
+                <version>2014.05.08.15.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC7224, live version lives here: https://github.com/YangModels/yang/blob/master/standard/ietf/RFC/iana-if-type.yang -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>iana-if-type-2014-05-08</artifactId>
+                <version>2014.05.08.15.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC7277 -->
+            <!-- FIXME: upgrade this to RFC8344 (2018-02-22, NMDA) -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-ip-2014-06-16</artifactId>
+                <version>2014.06.16.15.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC7895 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>rfc7895</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC7952 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc7952</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC8294 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8294</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8294-ietf-routing-types</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
+                <artifactId>iana-routing-types</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC8342 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8342</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8342-ietf-datastores</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8342-ietf-origin</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC8343 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8343</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC8344 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8344</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC8345 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8345</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8345-ietf-network</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8345-ietf-network-state</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8345-ietf-network-topology</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8345-ietf-network-topology-state</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC8348 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8348</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8348-ietf-hardware</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8348-ietf-hardware-state</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
+                <artifactId>iana-hardware</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC8349 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8349</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8349-ietf-routing</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8349-ietf-ipv4-unicast-routing</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8349-ietf-ipv6-unicast-routing</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- draft-bierman-netconf-restconf-02 -->
+            <!-- FIXME: upgrade to RFC8040 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-restconf</artifactId>
+                <version>2013.10.19.15.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- draft-clemm-netmod-yang-network-topo-01 -->
+            <!-- FIXME: figure out migration path towads:
+                        RFC8345
+                        RFC8346
+                        draft-ietf-teas-yang-te-topo-15 (?)
+                        draft-ietf-teas-yang-l3-te-topo-01 (?) -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-ted</artifactId>
+                <version>2013.10.21.15.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-topology</artifactId>
+                <version>2013.10.21.15.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-topology-isis</artifactId>
+                <version>2013.10.21.15.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-topology-l3-unicast-igp</artifactId>
+                <version>2013.10.21.15.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-topology-ospf</artifactId>
+                <version>2013.10.21.15.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-topology-l3-unicast</artifactId>
+                <version>2013.10.21.15.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-lisp-address-types-2015-11-05</artifactId>
+                <version>1.4.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- draft-ietf-netmod-acl-model-07 -->
+            <!-- FIXME: figure out the upgrade path towards
+                        draft-ietf-netmod-acl-model-18 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-packet-fields</artifactId>
+                <version>0.13.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-access-control-list</artifactId>
+                <version>0.13.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- draft-ietf-netmod-iana-afn-safi-00, expired -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>iana-afn-safi</artifactId>
+                <version>2013.07.04.15.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- Features -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>features-mdsal-model</artifactId>
+                <classifier>features</classifier>
+                <version>0.15.0-SNAPSHOT</version>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc6991</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc7223</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc7224</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc7277</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc7895</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc7952</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc8294</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc8342</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc8343</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc8344</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc8345</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc8345-non-nmda</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc8348</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc8348-non-nmda</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc8349</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-draft-bierman-netconf-restconf-02</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-draft-ietf-lisp-lcaf-10</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-draft-ietf-netmod-acl-model-07</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-draft-ietf-netmod-iana-afn-safi-00</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-odl-l2-types</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/model/artifacts/pom.xml b/model/artifacts/pom.xml
deleted file mode 100644 (file)
index 514bfda..0000000
--- a/model/artifacts/pom.xml
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-      <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>odlparent-lite</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
-      <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.mdsal.model</groupId>
-    <artifactId>mdsal-model-artifacts</artifactId>
-    <version>0.15.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <!-- Model versions -->
-        <ietf.topology.version>2013.10.21.15.0-SNAPSHOT</ietf.topology.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>opendaylight-l2-types</artifactId>
-                <version>2013.08.27.15.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>general-entity</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- RFC6991 -->
-            <!-- FIXME: harmonize packaging of these two, as per the discussion at
-                 https://lists.opendaylight.org/pipermail/mdsal-dev/2018-April/001656.html -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-inet-types-2013-07-15</artifactId>
-                <version>1.7.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-yang-types-20130715</artifactId>
-                <version>2013.07.15.15.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-type-util</artifactId>
-                <version>2.3.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- RFC7223 -->
-            <!-- FIXME: upgrade this to RFC8343 (2018-02-20, NMDA) -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-interfaces</artifactId>
-                <version>2014.05.08.15.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- RFC7224, live version lives here: https://github.com/YangModels/yang/blob/master/standard/ietf/RFC/iana-if-type.yang -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>iana-if-type-2014-05-08</artifactId>
-                <version>2014.05.08.15.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- RFC7277 -->
-            <!-- FIXME: upgrade this to RFC8344 (2018-02-22, NMDA) -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-ip-2014-06-16</artifactId>
-                <version>2014.06.16.15.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- RFC7895 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>rfc7895</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- RFC7952 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc7952</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- RFC8294 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8294</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8294-ietf-routing-types</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
-                <artifactId>iana-routing-types</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- RFC8342 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8342</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8342-ietf-datastores</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8342-ietf-origin</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- RFC8343 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8343</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- RFC8344 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8344</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- RFC8345 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8345</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8345-ietf-network</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8345-ietf-network-state</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8345-ietf-network-topology</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8345-ietf-network-topology-state</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- RFC8348 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8348</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8348-ietf-hardware</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8348-ietf-hardware-state</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
-                <artifactId>iana-hardware</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- RFC8349 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8349</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8349-ietf-routing</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8349-ietf-ipv4-unicast-routing</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8349-ietf-ipv6-unicast-routing</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- draft-bierman-netconf-restconf-02 -->
-            <!-- FIXME: upgrade to RFC8040 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-restconf</artifactId>
-                <version>2013.10.19.15.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- draft-clemm-netmod-yang-network-topo-01 -->
-            <!-- FIXME: figure out migration path towads:
-                        RFC8345
-                        RFC8346
-                        draft-ietf-teas-yang-te-topo-15 (?)
-                        draft-ietf-teas-yang-l3-te-topo-01 (?) -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-ted</artifactId>
-                <version>${ietf.topology.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-topology</artifactId>
-                <version>${ietf.topology.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-topology-isis</artifactId>
-                <version>${ietf.topology.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-topology-l3-unicast-igp</artifactId>
-                <version>${ietf.topology.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-topology-ospf</artifactId>
-                <version>${ietf.topology.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-topology-l3-unicast</artifactId>
-                <version>${ietf.topology.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-lisp-address-types-2015-11-05</artifactId>
-                <version>1.4.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- draft-ietf-netmod-acl-model-07 -->
-            <!-- FIXME: figure out the upgrade path towards
-                        draft-ietf-netmod-acl-model-18 -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-packet-fields</artifactId>
-                <version>0.13.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-access-control-list</artifactId>
-                <version>0.13.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- draft-ietf-netmod-iana-afn-safi-00, expired -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>iana-afn-safi</artifactId>
-                <version>2013.07.04.15.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- Features -->
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>features-mdsal-model</artifactId>
-                <classifier>features</classifier>
-                <version>0.15.0-SNAPSHOT</version>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc6991</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc7223</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc7224</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc7277</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc7895</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc7952</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc8294</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc8342</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc8343</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc8344</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc8345</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc8345-non-nmda</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc8348</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc8348-non-nmda</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc8349</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-draft-bierman-netconf-restconf-02</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-draft-ietf-lisp-lcaf-10</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-draft-ietf-netmod-acl-model-07</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-draft-ietf-netmod-iana-afn-safi-00</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-odl-l2-types</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
diff --git a/model/pom.xml b/model/pom.xml
index 154e3ea49a6e7f8146b42b8e153be99515738186..610652e3ffdd7a464c48983694cc2e4bbf3e31e8 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -26,7 +26,6 @@
 
     <modules>
         <module>features</module>
-        <module>artifacts</module>
         <module>yang-ext</module>
         <module>iana</module>
         <module>ietf</module>
MD-SAL: Model-Driven Service Adaptation Layer