From 0661e60baba0f3b075ddb6e955ca679d34a67b85 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 18 Jan 2018 20:38:45 +0100
Subject: [PATCH] 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>
---
 common/features/odl-mdsal-binding-api/pom.xml              | 6 ------
 .../odl-mdsal-binding-api/src/main/feature/feature.xml     | 7 +++++++
 .../odl-mdsal-binding-base/src/main/feature/feature.xml    | 7 +++++++
 .../odl-mdsal-binding-runtime/src/main/feature/feature.xml | 2 ++
 common/features/odl-mdsal-binding2-base/pom.xml            | 6 ------
 .../odl-mdsal-binding2-base/src/main/feature/feature.xml   | 7 +++++++
 .../src/main/feature/feature.xml                           | 1 +
 .../features/odl-mdsal-common/src/main/feature/feature.xml | 7 +++++++
 .../odl-mdsal-dom-api/src/main/feature/feature.xml         | 7 +++++++
 .../odl-mdsal-dom-broker/src/main/feature/feature.xml      | 1 +
 .../src/main/feature/feature.xml                           | 2 ++
 common/features/odl-mdsal-eos-common/pom.xml               | 6 ------
 .../odl-mdsal-eos-common/src/main/feature/feature.xml      | 7 +++++++
 13 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 common/features/odl-mdsal-binding-api/src/main/feature/feature.xml
 create mode 100644 common/features/odl-mdsal-binding-base/src/main/feature/feature.xml
 create mode 100644 common/features/odl-mdsal-binding2-base/src/main/feature/feature.xml
 create mode 100644 common/features/odl-mdsal-common/src/main/feature/feature.xml
 create mode 100644 common/features/odl-mdsal-dom-api/src/main/feature/feature.xml
 create mode 100644 common/features/odl-mdsal-eos-common/src/main/feature/feature.xml

diff --git a/common/features/odl-mdsal-binding-api/pom.xml b/common/features/odl-mdsal-binding-api/pom.xml
index fdb867a5e9..27c25d506e 100644
--- 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
index 0000000000..204e437d57
--- /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
index 0000000000..f052cb46bd
--- /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 a46af9b329..9e89759ac3 100644
--- 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 268ed9883b..707eecd98d 100644
--- 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
index 0000000000..e2c818bea5
--- /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 eedbd8b1f3..ff432cc4c1 100644
--- 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
index 0000000000..7344f227aa
--- /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
index 0000000000..c8ef702fca
--- /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 8eca714659..02452d4b00 100644
--- 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 e09f658e15..9fb9eaa339 100644
--- 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 9935dafbd0..34fb51f35a 100644
--- 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
index 0000000000..ee42e2025f
--- /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>
+
-- 
2.36.6