Use ranges to cross-reference yangtools features

This allows run-time to work with compatible versions of yangtools,
even when a new version is introduced after compilation. Also fixes
an odl-lmax-3 range omission and removes unneeded feature dependencies
when they are brought in transitively.

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

diff --git a/common/features/odl-mdsal-binding-api/pom.xml b/common/features/odl-mdsal-binding-api/pom.xml
index fdb867a5e929ab629d24ffdbd69b030bed3451b7..27c25d506e5efe43ff998ef5637c7d18dccebc9f 100644 (file)
--- a/common/features/odl-mdsal-binding-api/pom.xml
+++ b/common/features/odl-mdsal-binding-api/pom.xml
@@ -51,12 +51,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>odl-yangtools-parser-api</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-common</artifactId>

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

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

diff --git a/common/features/odl-mdsal-binding-runtime/src/main/feature/feature.xml b/common/features/odl-mdsal-binding-runtime/src/main/feature/feature.xml
index a46af9b3291a73eeac9cfcde4ace7c8260c27f96..9e89759ac3e9f7ed67d33d639d4bee0e077cad71 100644 (file)
--- a/common/features/odl-mdsal-binding-runtime/src/main/feature/feature.xml
+++ b/common/features/odl-mdsal-binding-runtime/src/main/feature/feature.xml
@@ -2,5 +2,7 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-mdsal-binding-runtime">
     <feature name="odl-mdsal-binding-runtime">
         <feature version="[3.0.0,4)">odl-javassist-3</feature>
+        <feature version="[2.0.1,3)">odl-yangtools-data</feature>
+        <feature version="[2.0.1,3)">odl-yangtools-parser</feature>
     </feature>
 </features>

diff --git a/common/features/odl-mdsal-binding2-base/pom.xml b/common/features/odl-mdsal-binding2-base/pom.xml
index 268ed9883b5925680e205ca59b55534058cef049..707eecd98d8d86403fef87579c63db9f5c7c5432 100644 (file)
--- a/common/features/odl-mdsal-binding2-base/pom.xml
+++ b/common/features/odl-mdsal-binding2-base/pom.xml
@@ -52,12 +52,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>odl-yangtools-common</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-parser-api</artifactId>

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

diff --git a/common/features/odl-mdsal-binding2-runtime/src/main/feature/feature.xml b/common/features/odl-mdsal-binding2-runtime/src/main/feature/feature.xml
index eedbd8b1f3352d0c783c72856b159719acaaf6f6..ff432cc4c149fc395cdc752439bf9ddd415349cd 100644 (file)
--- a/common/features/odl-mdsal-binding2-runtime/src/main/feature/feature.xml
+++ b/common/features/odl-mdsal-binding2-runtime/src/main/feature/feature.xml
@@ -2,5 +2,6 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-mdsal-binding2-runtime">
     <feature name="odl-mdsal-binding2-runtime">
         <feature version="[3.0.0,4)">odl-javassist-3</feature>
+        <feature version="[2.0.1,3)">odl-yangtools-data</feature>
     </feature>
 </features>

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

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

diff --git a/common/features/odl-mdsal-dom-broker/src/main/feature/feature.xml b/common/features/odl-mdsal-dom-broker/src/main/feature/feature.xml
index 8eca714659425f903ee7379aa181b97fb9d8a0bc..02452d4b00260cbba249b22e375c8a01b4576a6b 100644 (file)
--- a/common/features/odl-mdsal-dom-broker/src/main/feature/feature.xml
+++ b/common/features/odl-mdsal-dom-broker/src/main/feature/feature.xml
@@ -2,5 +2,6 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-mdsal-dom-broker">
     <feature name="odl-mdsal-dom-broker">
         <feature version="[3.0.0,4)">odl-lmax-3</feature>
+        <feature version="[2.0.1,3)">odl-yangtools-parser</feature>
     </feature>
 </features>

diff --git a/common/features/odl-mdsal-dom-schema-service-osgi/src/main/feature/feature.xml b/common/features/odl-mdsal-dom-schema-service-osgi/src/main/feature/feature.xml
index e09f658e15872dbb628a85b98a0f4460b25a86d5..9fb9eaa339a8c5a287f74eb9ea0dde5b91eb61c5 100644 (file)
--- a/common/features/odl-mdsal-dom-schema-service-osgi/src/main/feature/feature.xml
+++ b/common/features/odl-mdsal-dom-schema-service-osgi/src/main/feature/feature.xml
@@ -2,5 +2,7 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-mdsal-dom-schema-service-osgi">
     <feature name="odl-mdsal-dom-schema-service-osgi">
         <feature version="[3.0.0,4)">odl-lmax-3</feature>
+        <feature version="[2.0.1,3)">odl-yangtools-data</feature>
+        <feature version="[2.0.1,3)">odl-yangtools-parser</feature>
     </feature>
 </features>

diff --git a/common/features/odl-mdsal-eos-common/pom.xml b/common/features/odl-mdsal-eos-common/pom.xml
index 9935dafbd039d2ba51dc6d3ffc60f22a53a088f2..34fb51f35aed56f989eca78eacb226729127ce00 100644 (file)
--- a/common/features/odl-mdsal-eos-common/pom.xml
+++ b/common/features/odl-mdsal-eos-common/pom.xml
@@ -45,12 +45,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>odl-yangtools-common</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-data-api</artifactId>

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