Minimize model dependencies

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

diff --git a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml b/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
index f8878025a2beecbae638bc333f34e8d1024b2b00..c804dd3009534760145bf46673028cc6dd27307b 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
@@ -37,6 +37,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-rfc7223</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>

diff --git a/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml b/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml
index 7fd13064eb17c8af39f9b36c79864f9300dde9f2..eebc9b1c8b0db95338ec67ecade7dbc221f6e659 100644 (file)
--- a/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml
+++ b/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml
@@ -22,6 +22,13 @@
     <name>ODL :: Bgpcep :: odl-bgpcep-data-change-counter</name>
 
     <dependencies>
+        <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.bgpcep</groupId>
             <artifactId>data-change-counter</artifactId>

diff --git a/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml b/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml
index d7f00eb76552bb8aa4bf604ccf0998846c3344d8..9f755f04a23b0327d3860a6bfc565d306fc477ef 100644 (file)
--- a/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml
+++ b/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml
@@ -32,12 +32,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-models</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-netty-4</artifactId>

diff --git a/features/concepts/odl-bgpcep-concepts/pom.xml b/features/concepts/odl-bgpcep-concepts/pom.xml
index e20cd599ce6dad0301e7fd6781ec58b196531600..7d65f35c822c84caa4b2e31d649a5884e8d31cc4 100644 (file)
--- a/features/concepts/odl-bgpcep-concepts/pom.xml
+++ b/features/concepts/odl-bgpcep-concepts/pom.xml
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-models</artifactId>
+            <artifactId>odl-mdsal-model-rfc6991</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -41,4 +41,4 @@
             <classifier>features</classifier>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/config-loader/odl-bgpcep-topology-config-loader/pom.xml b/features/config-loader/odl-bgpcep-topology-config-loader/pom.xml
index dd0adfd34aa75144a69250b0cbd913e588217983..32de2a217dadeaa486dc18489ca52d39bec44c2c 100644 (file)
--- a/features/config-loader/odl-bgpcep-topology-config-loader/pom.xml
+++ b/features/config-loader/odl-bgpcep-topology-config-loader/pom.xml
@@ -32,5 +32,11 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-topology-api</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/topology/odl-bgpcep-topology-api/pom.xml b/features/topology/odl-bgpcep-topology-api/pom.xml
index 0006cfe706152e614246cdda9e304f24d99c2946..fe6e3a3fb7444bf125ef5a3c8eb4d676fc173180 100644 (file)
--- a/features/topology/odl-bgpcep-topology-api/pom.xml
+++ b/features/topology/odl-bgpcep-topology-api/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-models</artifactId>
+            <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -46,4 +46,4 @@
             <classifier>features</classifier>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>