Minimize blueprint dependencies

We have drove down the dependencies, now we should be down to just two
features which depend on blueprint.

Change-Id: I94a237b1f5957ccdca1d24ed99092ed1b8980932
JIRA: BGPCEP-881
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml b/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml
index 87fb62d41806c46fc3cb373d4e74ddcf208659a9..faf23a86b15ebda61c17a99aca9b8f0296e688cc 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml
@@ -39,5 +39,11 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-controller-blueprint</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features/bgp/odl-bgpcep-bgp-benchmark/src/main/feature/feature.xml b/features/bgp/odl-bgpcep-bgp-benchmark/src/main/feature/feature.xml
index 8ffa30790b4cecdc05ce8e36004dd6023da3d229..a16336109d78f889bc7edd94a3d4539746aaedbf 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-benchmark/src/main/feature/feature.xml
+++ b/features/bgp/odl-bgpcep-bgp-benchmark/src/main/feature/feature.xml
@@ -12,5 +12,6 @@
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-bgpcep-bgp-benchmark" version="${project.version}">
         <feature version="[7,8)">odl-mdsal-broker</feature>
+        <feature version="[7,8)">odl-controller-blueprint</feature>
     </feature>
 </features>

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

diff --git a/features/bgp/odl-bgpcep-bgp-parser-api/src/main/feature/feature.xml b/features/bgp/odl-bgpcep-bgp-parser-api/src/main/feature/feature.xml
index aa340f40e72faf2cfc028ea4f4267fa29d211f8f..0c866cf88348c9632adefa91e31af0bc3b21e3e4 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-parser-api/src/main/feature/feature.xml
+++ b/features/bgp/odl-bgpcep-bgp-parser-api/src/main/feature/feature.xml
@@ -11,7 +11,6 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-bgpcep-bgp-parser-api" version="${project.version}">
-        <feature version="[7,8)">odl-controller-blueprint</feature>
         <feature version="[10,11)">odl-yangtools-data</feature>
         <feature version="[10,11)">odl-yangtools-netty</feature>
     </feature>

diff --git a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml b/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
index 06760944eb7986933c7b9be162170895c041f252..27f226e5a7367bd3c78d344f05419ef8554c0941 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
@@ -57,7 +57,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-binding-runtime-api</artifactId>
+            <artifactId>odl-mdsal-binding-runtime</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/bgp/odl-bgpcep-bgp-rib-api/src/main/feature/feature.xml b/features/bgp/odl-bgpcep-bgp-rib-api/src/main/feature/feature.xml
index 6122da8e51fd52b525b087d8d9dbe0259a4760fa..625de8cae6f4c33c6ec90d150fac9e9fdce54d1a 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-rib-api/src/main/feature/feature.xml
+++ b/features/bgp/odl-bgpcep-bgp-rib-api/src/main/feature/feature.xml
@@ -14,6 +14,6 @@
         <feature version="[11,12)">odl-mdsal-model-rfc8343</feature>
         <feature version="[11,12)">odl-mdsal-singleton-common</feature>
         <feature version="[11,12)">odl-mdsal-dom-api</feature>
-        <feature version="[11,12)">odl-mdsal-binding-runtime-api</feature>
+        <feature version="[11,12)">odl-mdsal-binding-runtime</feature>
     </feature>
 </features>

diff --git a/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml b/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml
index 1dba9439d449ea9ac262fdbd757ce75544a8d21b..af27135533eba3a7819fdfa05c02bf69276b9148 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml
@@ -91,5 +91,11 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-controller-blueprint</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features/bgp/odl-bgpcep-bgp-rib-impl/src/main/feature/feature.xml b/features/bgp/odl-bgpcep-bgp-rib-impl/src/main/feature/feature.xml
index e0c008c5e987b166eb08f3a9730c64d95cfe18c2..c8d13300ebd2b02666b5215df2b96f2f6104b160 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-rib-impl/src/main/feature/feature.xml
+++ b/features/bgp/odl-bgpcep-bgp-rib-impl/src/main/feature/feature.xml
@@ -11,6 +11,7 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-bgpcep-bgp-rib-impl" version="${project.version}">
+        <feature version="[7,8)">odl-controller-blueprint</feature>
         <feature version="[7,8)">odl-controller-exp-netty-config</feature>
         <configfile finalname="etc/opendaylight/bgpcep/routing-policy-default-config.xml">mvn:org.opendaylight.bgpcep/bgp-config-example/${project.version}/xml/routing-policy-default-config</configfile>
     </feature>

diff --git a/features/rsvp/odl-bgpcep-rsvp-api/pom.xml b/features/rsvp/odl-bgpcep-rsvp-api/pom.xml
index b27edfc8cc138878db6030e1bb89d1faa7276280..c13d27343f42a296bf3b0459ce91902a94c09079 100644 (file)
--- a/features/rsvp/odl-bgpcep-rsvp-api/pom.xml
+++ b/features/rsvp/odl-bgpcep-rsvp-api/pom.xml
@@ -36,12 +36,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-controller-blueprint</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-extras-dependencies</artifactId>

diff --git a/features/rsvp/odl-bgpcep-rsvp-api/src/main/feature/feature.xml b/features/rsvp/odl-bgpcep-rsvp-api/src/main/feature/feature.xml
index 26aea67d544ff457d3bed1421f1ad5a9759efe4c..8ea56205212fedf78330a843e68e8999410eb9bc 100644 (file)
--- a/features/rsvp/odl-bgpcep-rsvp-api/src/main/feature/feature.xml
+++ b/features/rsvp/odl-bgpcep-rsvp-api/src/main/feature/feature.xml
@@ -12,6 +12,5 @@
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-bgpcep-rsvp-api" version="${project.version}">
         <feature version="[10,11)">odl-yangtools-netty</feature>
-        <feature version="[7,8)">odl-controller-blueprint</feature>
     </feature>
 </features>