Eliminate unneeded dependencies on yangtools features

yangtools features are mostly brought in transitively, hence
we do not need to reference them at all. Those that we do need
to pull in are turned into range imports.

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

diff --git a/features/config/odl-config-core/pom.xml b/features/config/odl-config-core/pom.xml
index bdcab727ca2bc276d5dcb3445e025824065d1cea..e464115a2c47304f888c9dfe6043fbd2e4b4a9c7 100644 (file)
--- a/features/config/odl-config-core/pom.xml
+++ b/features/config/odl-config-core/pom.xml
@@ -25,13 +25,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
@@ -50,12 +43,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.mdsal</groupId>
             <artifactId>odl-mdsal-binding-runtime</artifactId>

diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index 58a59776c4d8a89afa7c6426a9472408c45dc29e..8dcf71402f0cda6be80bac063c99fb626b32694a 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -86,12 +86,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <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-codec</artifactId>

diff --git a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
index 3593abfbb7b28864951b89fed20b9e829ca10094..3bb69627fe5b2afdf2ef2a7a10f3a1825a1666c6 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
@@ -11,6 +11,7 @@
     <repository>mvn:org.opendaylight.controller/odl-mdsal-common/${project.version}/xml/features</repository>
     <feature name="odl-mdsal-broker-local" version="${project.version}">
         <feature version="[3.0.0,4)">odl-lmax-3</feature>
+        <feature version="[2.0.1,3)">odl-yangtools-codec</feature>
         <bundle start-level="70">mvn:org.opendaylight.controller/sal-schema-service/${project.version}</bundle>
         <bundle start-level="40">mvn:org.opendaylight.controller/blueprint/${blueprint.version}</bundle>
         <configfile finalname="${config.configfile.directory}/${config.mdsal.configfile}" override="true">

diff --git a/features/mdsal/odl-mdsal-common/pom.xml b/features/mdsal/odl-mdsal-common/pom.xml
index 8b292a8c8ca9a4869098fb048e56e3f9231b6454..c89a2e6e7453b62bd586ca453468749f23714a77 100644 (file)
--- a/features/mdsal/odl-mdsal-common/pom.xml
+++ b/features/mdsal/odl-mdsal-common/pom.xml
@@ -23,16 +23,9 @@
     <version>1.7.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Config :: All</name>
+    <name>OpenDaylight :: MDSAL :: Common</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>odl-yangtools-data</artifactId>
-            <version>2.0.1</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-api</artifactId>

diff --git a/features/mdsal/odl-toaster/pom.xml b/features/mdsal/odl-toaster/pom.xml
index 2485b0093a679b7573d945aa4e959c7e9615b4b3..6d78033ff6ca8ef3a7feb670fe3e08e5389a2183 100644 (file)
--- a/features/mdsal/odl-toaster/pom.xml
+++ b/features/mdsal/odl-toaster/pom.xml
@@ -26,13 +26,6 @@
     <name>OpenDaylight :: Toaster</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>odl-yangtools-common</artifactId>
-            <version>2.0.1</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-runtime</artifactId>