Cleanup feature dependencies

Some of our basic features do a rather massive over-inclusion,
fix that.

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

diff --git a/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml b/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml
index 623914924020993475865c440e3fb7a8d324da82..ea6371f9d0ba94bf76bca0bf647cdef8b3af5507 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml
@@ -31,6 +31,12 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-parser-spi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>odl-yangtools-data</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-dependencies</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-topology/pom.xml b/features/bgp/odl-bgpcep-bgp-topology/pom.xml
index fa3926a155b415d92cb3279af96d2ca291126367..55a5e4c9de86098fa2663f71f00fc66ec2290dee 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-topology/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-topology/pom.xml
@@ -44,6 +44,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>

diff --git a/features/concepts/odl-bgpcep-concepts/pom.xml b/features/concepts/odl-bgpcep-concepts/pom.xml
index 7d65f35c822c84caa4b2e31d649a5884e8d31cc4..dd4e3d0a6b16ec7740af5a4e9e10dabaa3f8756d 100644 (file)
--- a/features/concepts/odl-bgpcep-concepts/pom.xml
+++ b/features/concepts/odl-bgpcep-concepts/pom.xml
@@ -34,11 +34,5 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
     </dependencies>
 </project>

diff --git a/features/pcep/odl-bgpcep-pcep-api/pom.xml b/features/pcep/odl-bgpcep-pcep-api/pom.xml
index 00007e1f5a086014cac659c41e9c79a3626ccb2e..0fe33edd504a8b281a7b31c07d14b519960f0fa3 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-api/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-api/pom.xml
@@ -30,12 +30,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-rsvp-api</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-cli/pom.xml b/features/pcep/odl-bgpcep-pcep-cli/pom.xml
index e99ef118cddd98a001c502388c4cfd612d3cb700..3c6bac4545f682f53ee1e7ca91b54bd0e9d6345d 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-cli/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-cli/pom.xml
@@ -32,6 +32,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-topology</artifactId>
@@ -39,4 +45,4 @@
             <classifier>features</classifier>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml b/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml
index 8cdc908407da73c1cbdd118c9438d3be7a22e623..a4e5f611019daf021e1ae27eef77f93f13164c9b 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml
@@ -26,6 +26,12 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-segment-routing</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-stateful07</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml b/features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml
index 81314f5ccb516a52aeb5d4fd5f23dabedcd078ce..398064fb58d663c3d1c825f4c10f9b14864bc8b6 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml
@@ -26,6 +26,12 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-topology-stats</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-stateful07</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml b/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml
index 45159c3b7a16ecc90a3c2ed433cada5edc84b863..97cf044e0c91106e6caa316086c1b84e796ad2c2 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml
@@ -32,5 +32,11 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features/pcep/odl-bgpcep-programming-api/pom.xml b/features/pcep/odl-bgpcep-programming-api/pom.xml
index 0f72fe76a6aa569df196d4d83766410633ca5d1b..bcf2e0efc2de6f6b226b4891c9aecb6e62350bb4 100644 (file)
--- a/features/pcep/odl-bgpcep-programming-api/pom.xml
+++ b/features/pcep/odl-bgpcep-programming-api/pom.xml
@@ -54,5 +54,11 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-singleton-common</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features/topology/odl-bgpcep-topology-api/pom.xml b/features/topology/odl-bgpcep-topology-api/pom.xml
index fe6e3a3fb7444bf125ef5a3c8eb4d676fc173180..76f52bf4a52720354577365d418e18758d61208a 100644 (file)
--- a/features/topology/odl-bgpcep-topology-api/pom.xml
+++ b/features/topology/odl-bgpcep-topology-api/pom.xml
@@ -35,13 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
+            <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>