Minimize yangtools dependencies and bump to 2.0.1

Squash dependencies so that netconf features are pulling in
the bare minimum set of yangtools features directly and use
version ranges for them.

Properties should be avoided and inter-project dependencies should
be expressed via ${upstream}-artifacts dependencyManagement import.

yangtools-2.0.1 contains a fix to multi-revision modules, which are
badly broken in 2.0.0. It also introduces APIs we require to fix
compliance with RFC8040 (i.e. follow RFC7159).

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

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 068b7595a367b3f6c9556908642e111c03620721..1a96e17afb55fbab18efb8a0a2df0b3f532ac4db 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -28,7 +28,6 @@
       <mdsal.model.version>0.12.0-SNAPSHOT</mdsal.model.version>
       <netconf.version>1.4.0-SNAPSHOT</netconf.version>
       <netconf.connector.version>1.7.0-SNAPSHOT</netconf.connector.version>
-      <yangtools.version>2.0.0</yangtools.version>
     </properties>
 
     <modules>
@@ -52,6 +51,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>2.0.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -59,7 +65,6 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>features-yangtools</artifactId>
-      <version>${yangtools.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>

diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml
index 5821f68c647d1c70777b56ae75da1012853d7910..9bd02bbb2548503530e95065813801a399cb48dc 100644 (file)
--- a/features/netconf/odl-netconf-api/pom.xml
+++ b/features/netconf/odl-netconf-api/pom.xml
@@ -37,7 +37,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -53,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>odl-yangtools-data</artifactId>
+            <artifactId>odl-yangtools-data-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/netconf/odl-netconf-api/src/main/feature/feature.xml b/features/netconf/odl-netconf-api/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..332ef13
--- /dev/null
+++ b/features/netconf/odl-netconf-api/src/main/feature/feature.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-api">
+    <feature name="odl-netconf-api">
+        <feature version="[2.0.1,3)">odl-yangtools-data-api</feature>
+    </feature>
+</features>

diff --git a/features/netconf/odl-netconf-util/pom.xml b/features/netconf/odl-netconf-util/pom.xml
index c3e555dfdd3bc00f115c1b461fadc7af95dc822f..e4259f345d541087c9fea5cf0228b0fc4f1b7c66 100644 (file)
--- a/features/netconf/odl-netconf-util/pom.xml
+++ b/features/netconf/odl-netconf-util/pom.xml
@@ -33,8 +33,8 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>odl-yangtools-data</artifactId>
-            <version>2.0.0</version>
+            <artifactId>odl-yangtools-codec</artifactId>
+            <version>2.0.1</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/netconf/odl-netconf-util/src/main/feature/feature.xml b/features/netconf/odl-netconf-util/src/main/feature/feature.xml
index 2735392ec3a6820bdac7055c4893156527b9f8fb..0a3d259eacb45c232779509b12d0cb9f329227ab 100644 (file)
--- a/features/netconf/odl-netconf-util/src/main/feature/feature.xml
+++ b/features/netconf/odl-netconf-util/src/main/feature/feature.xml
@@ -11,5 +11,6 @@
         <configfile finalname="etc/netconf.cfg">
             mvn:org.opendaylight.netconf/netconf-util/${project.version}/cfg/config
         </configfile>
+        <feature version="[2.0.1,3)">odl-yangtools-codec</feature>
     </feature>
 </features>

diff --git a/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml b/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml
index 2b6dba1bc690cbd73a3209c8ee2dba8a4b2fa723..0cb5872df2a5f8d187ae03851495f196ac596bf1 100644 (file)
--- a/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml
+++ b/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml
@@ -37,7 +37,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/restconf/odl-restconf-noauth/pom.xml b/features/restconf/odl-restconf-noauth/pom.xml
index 204e198a712536e204630466d7b68e8ebe84a8e1..6feee9e64810b4efb9cd5771f0f84d4e6d0aece3 100644 (file)
--- a/features/restconf/odl-restconf-noauth/pom.xml
+++ b/features/restconf/odl-restconf-noauth/pom.xml
@@ -37,7 +37,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/yanglib/odl-yanglib/pom.xml b/features/yanglib/odl-yanglib/pom.xml
index 65d02262e42d913da3b786118a1e1e41df4fdb52..0bddb9eb6549ab16ed206008ebc2a05b11179959 100644 (file)
--- a/features/yanglib/odl-yanglib/pom.xml
+++ b/features/yanglib/odl-yanglib/pom.xml
@@ -31,13 +31,6 @@
             <artifactId>yanglib</artifactId>
             <version>1.4.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>odl-yangtools-data</artifactId>
-            <version>2.0.0</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-restconf</artifactId>

diff --git a/netconf/config-netconf-connector/pom.xml b/netconf/config-netconf-connector/pom.xml
index ed9e8d12fdb913c810cbc2488145a9b26b350f81..73bb311b01518f6b549a9f258d851086434f67ae 100644 (file)
--- a/netconf/config-netconf-connector/pom.xml
+++ b/netconf/config-netconf-connector/pom.xml
@@ -48,7 +48,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml
index cbb002e0ab15a09ebcd9548e2c0e3c1bba0ffd30..a2c1a2ed0b434a87157dca4985af1f6f6dff5e3a 100644 (file)
--- a/netconf/mdsal-netconf-connector/pom.xml
+++ b/netconf/mdsal-netconf-connector/pom.xml
@@ -34,7 +34,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/mdsal-netconf-monitoring/pom.xml b/netconf/mdsal-netconf-monitoring/pom.xml
index 10ec13a47a0ea4709826052544fda0f9d5f89c94..1e37ab6fb56375615d9e0e5e0ee52888b1f51ffe 100644 (file)
--- a/netconf/mdsal-netconf-monitoring/pom.xml
+++ b/netconf/mdsal-netconf-monitoring/pom.xml
@@ -40,7 +40,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/mdsal-netconf-notification/pom.xml b/netconf/mdsal-netconf-notification/pom.xml
index ada4c1b71746d708383d68c6cc1c88f2f9a8c5f4..ed90e7b0645d418979d6c701239a27afea88e44c 100644 (file)
--- a/netconf/mdsal-netconf-notification/pom.xml
+++ b/netconf/mdsal-netconf-notification/pom.xml
@@ -40,7 +40,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/netconf/mdsal-netconf-yang-library/pom.xml b/netconf/mdsal-netconf-yang-library/pom.xml
index 1d2cfe45ab824f79826cc4807043b33227255baa..e6aad7f2ef8eea5b264aa699458e3da6d483d842 100644 (file)
--- a/netconf/mdsal-netconf-yang-library/pom.xml
+++ b/netconf/mdsal-netconf-yang-library/pom.xml
@@ -48,7 +48,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/netconf/messagebus-netconf/pom.xml b/netconf/messagebus-netconf/pom.xml
index 7af2c4eb9eb0f44774ccd71eb5615f2f645918bb..a7385ee372d46e56be9b417a60c03fe11bb53f10 100644 (file)
--- a/netconf/messagebus-netconf/pom.xml
+++ b/netconf/messagebus-netconf/pom.xml
@@ -43,7 +43,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/netconf/netconf-api/pom.xml b/netconf/netconf-api/pom.xml
index 6fb4db2a56452b3833dc80476dc3ceced765ec9f..520114decb6edcdf15af0e9709f7759dd70ee35a 100644 (file)
--- a/netconf/netconf-api/pom.xml
+++ b/netconf/netconf-api/pom.xml
@@ -34,7 +34,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/netconf-client/pom.xml b/netconf/netconf-client/pom.xml
index 2394c7152d819eb14c524a789e027225aad56baa..c9fc7e8b33a8d4481d23da0db96e827ce32e122d 100644 (file)
--- a/netconf/netconf-client/pom.xml
+++ b/netconf/netconf-client/pom.xml
@@ -34,7 +34,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/netconf-console/pom.xml b/netconf/netconf-console/pom.xml
index 60b69733d4a13bf3efb95cc14996b34e59c502ea..3886c03e0fffe14416a3d5d9b80f0467608ca56e 100644 (file)
--- a/netconf/netconf-console/pom.xml
+++ b/netconf/netconf-console/pom.xml
@@ -40,7 +40,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/netconf-impl/pom.xml b/netconf/netconf-impl/pom.xml
index 8e2a890b0d039c8d9c9d091bc40debade0b469e4..3892493f8a64402fdb9f4fc1809945067c635acd 100644 (file)
--- a/netconf/netconf-impl/pom.xml
+++ b/netconf/netconf-impl/pom.xml
@@ -34,7 +34,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/netconf-monitoring/pom.xml b/netconf/netconf-monitoring/pom.xml
index fb2fffe23af1cf9af0821227e1b14925eebf1425..cd9650592a924caf6f38f0930cd06b88b521bce3 100644 (file)
--- a/netconf/netconf-monitoring/pom.xml
+++ b/netconf/netconf-monitoring/pom.xml
@@ -34,7 +34,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/netconf-netty-util/pom.xml b/netconf/netconf-netty-util/pom.xml
index 37779348d64ca574e6cf5b1e3f6ac99bb3dfd41b..038fa0954711be0821891e92baee2191532d9efc 100644 (file)
--- a/netconf/netconf-netty-util/pom.xml
+++ b/netconf/netconf-netty-util/pom.xml
@@ -34,7 +34,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/netconf-notifications-impl/pom.xml b/netconf/netconf-notifications-impl/pom.xml
index 8253e09fa58a18e2a436e1618e318d361f038407..8e2fc26eb4667c8067ea7dccf2385e11d77e8656 100644 (file)
--- a/netconf/netconf-notifications-impl/pom.xml
+++ b/netconf/netconf-notifications-impl/pom.xml
@@ -49,7 +49,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/netconf/netconf-ssh/pom.xml b/netconf/netconf-ssh/pom.xml
index 4e2160b30321f59e6f4c61033ddd463c5a9b4dc4..58a0f7d927c3f777a4e212cd4b10d194356768c7 100644 (file)
--- a/netconf/netconf-ssh/pom.xml
+++ b/netconf/netconf-ssh/pom.xml
@@ -33,7 +33,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/netconf-tcp/pom.xml b/netconf/netconf-tcp/pom.xml
index 7f3e89073dfb4c5bfabde8bbb3867cc5f5babd77..04cce67209faacfee552ab4450d4725c32be01d2 100644 (file)
--- a/netconf/netconf-tcp/pom.xml
+++ b/netconf/netconf-tcp/pom.xml
@@ -34,7 +34,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/netconf-topology/pom.xml b/netconf/netconf-topology/pom.xml
index a76c9561ac3328a9bdc2c5ffb7d4222d0db2d762..79792d39c54378776186f097ee9709e789585a59 100644 (file)
--- a/netconf/netconf-topology/pom.xml
+++ b/netconf/netconf-topology/pom.xml
@@ -41,7 +41,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/netconf/netconf-util/pom.xml b/netconf/netconf-util/pom.xml
index 35c213373728d26d0e3e7a25137fb2be8609ab3b..3c6c3930d1a9c341d236d7f9338955b603488aa1 100644 (file)
--- a/netconf/netconf-util/pom.xml
+++ b/netconf/netconf-util/pom.xml
@@ -34,7 +34,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index 3763058e7b182b2a9965c106264e2b8c01dc6d22..55c8df087698456860aa4b5c9aefdd1b488dd892 100644 (file)
--- a/netconf/tools/netconf-testtool/pom.xml
+++ b/netconf/tools/netconf-testtool/pom.xml
@@ -40,7 +40,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/protocol-framework/pom.xml b/protocol-framework/pom.xml
index fa4245495c0c236cd610d4b06e4702d34b53b483..a72b609c29a5ff89e1a210add87d73ee4ddfbfd1 100644 (file)
--- a/protocol-framework/pom.xml
+++ b/protocol-framework/pom.xml
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>mockito-configuration</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/restconf/sal-rest-docgen-maven/pom.xml b/restconf/sal-rest-docgen-maven/pom.xml
index 4359ba9ac42b4fee4f8be03c4ef664dfc541d7a7..bf6ed545b3189aedcdc669a567902c0b3dc820e4 100644 (file)
--- a/restconf/sal-rest-docgen-maven/pom.xml
+++ b/restconf/sal-rest-docgen-maven/pom.xml
@@ -33,7 +33,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/restconf/sal-rest-docgen/pom.xml b/restconf/sal-rest-docgen/pom.xml
index 2c129148e1cb4831cc5cae92a54c0adeded229fe..687ec614eab44ce4747680b691f808ee98599910 100644 (file)
--- a/restconf/sal-rest-docgen/pom.xml
+++ b/restconf/sal-rest-docgen/pom.xml
@@ -25,7 +25,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>