Remove config system remnants

The config system is being removed in Flourine so remove
the unused config system dependencies.

Change-Id: I47175e831eced456d14f95cbcefd44dd404333dc
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

diff --git a/bgp/benchmark-app/pom.xml b/bgp/benchmark-app/pom.xml
index 5aef2ec1cdfe3a8f603f5fe9694e21f501455c2f..979de1f01b1fc2fe6c01f4e172fd54ab38765ef6 100644 (file)
--- a/bgp/benchmark-app/pom.xml
+++ b/bgp/benchmark-app/pom.xml
@@ -67,10 +67,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-inet</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
@@ -79,10 +75,6 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -97,6 +89,11 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>

diff --git a/bgp/evpn/pom.xml b/bgp/evpn/pom.xml
index 09489879ec7856e7c326294581661ff51d3429bd..719e804d388c444338264b97b55fc0ccabfd3cf8 100644 (file)
--- a/bgp/evpn/pom.xml
+++ b/bgp/evpn/pom.xml
@@ -78,16 +78,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-rib-spi</artifactId>

diff --git a/bgp/flowspec/pom.xml b/bgp/flowspec/pom.xml
index d841f36fb184325643f90ebe05aa619460894dca..a8ba4250da40bd9bf4f98d9166c524177a63466a 100644 (file)
--- a/bgp/flowspec/pom.xml
+++ b/bgp/flowspec/pom.xml
@@ -111,21 +111,11 @@
             <artifactId>bgp-openconfig-spi</artifactId>
         </dependency>
         <!-- test scope dependencies -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-rib-spi</artifactId>
             <type>test-jar</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/bgp/labeled-unicast/pom.xml b/bgp/labeled-unicast/pom.xml
index e1895438b3e61aba73f8d73c10bb1f7f7c40a279..321e16a0de272239808cf8fe036a605e4f88244a 100644 (file)
--- a/bgp/labeled-unicast/pom.xml
+++ b/bgp/labeled-unicast/pom.xml
@@ -99,11 +99,6 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
@@ -163,16 +158,6 @@
             <artifactId>mdsal-binding-dom-adapter</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/bgp/linkstate/pom.xml b/bgp/linkstate/pom.xml
index 1ddd6cf48dbab6c18a8a7237262283ba54f03c68..ac7f404c42f9802a4a6291004335fc18cbe94f73 100644 (file)
--- a/bgp/linkstate/pom.xml
+++ b/bgp/linkstate/pom.xml
@@ -86,10 +86,6 @@
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types-2013-07-15</artifactId>
         </dependency>
-         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-         </dependency>
          <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
@@ -122,20 +118,6 @@
              <groupId>junit</groupId>
              <artifactId>junit</artifactId>
          </dependency>
-         <dependency>
-             <groupId>org.opendaylight.controller</groupId>
-             <artifactId>config-manager</artifactId>
-             <type>test-jar</type>
-         </dependency>
-         <dependency>
-             <groupId>org.opendaylight.controller</groupId>
-             <artifactId>config-manager</artifactId>
-             <scope>test</scope>
-         </dependency>
-         <dependency>
-             <groupId>org.opendaylight.controller</groupId>
-             <artifactId>config-util</artifactId>
-         </dependency>
          <dependency>
              <groupId>org.opendaylight.yangtools</groupId>
              <artifactId>mockito-configuration</artifactId>

diff --git a/bgp/parser-spi/pom.xml b/bgp/parser-spi/pom.xml
index 2f18d22b999bc333352028b79ad4c9c26603762e..7687c0ee2207d34daef30bfb5fb838692fc8c2cc 100644 (file)
--- a/bgp/parser-spi/pom.xml
+++ b/bgp/parser-spi/pom.xml
@@ -50,11 +50,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
@@ -63,6 +58,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-impl</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
@@ -91,25 +90,10 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/bgp/path-selection-mode/pom.xml b/bgp/path-selection-mode/pom.xml
index 13472926a649d4e745ce69131b87fb42ca6aeaf6..7ca49fe5b119e3407bb2d9be0355f382f6871624 100644 (file)
--- a/bgp/path-selection-mode/pom.xml
+++ b/bgp/path-selection-mode/pom.xml
@@ -25,10 +25,6 @@
 
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-parser-api</artifactId>
@@ -70,22 +66,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>bgp-inet</artifactId>

diff --git a/bgp/rib-api/pom.xml b/bgp/rib-api/pom.xml
index 760bc924b3bbd2bce629ab73e5e03cd49f69c958..eb3e673efdd3fbd2a8b2ff11246d5e51baacf3c8 100644 (file)
--- a/bgp/rib-api/pom.xml
+++ b/bgp/rib-api/pom.xml
@@ -49,10 +49,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types-2013-07-15</artifactId>

diff --git a/bgp/rib-impl/pom.xml b/bgp/rib-impl/pom.xml
index 1b1094989637c45577cde458e6eb8a20a630315b..fed33e69d0dc93fc44182246cf4a00dfa5794cae 100644 (file)
--- a/bgp/rib-impl/pom.xml
+++ b/bgp/rib-impl/pom.xml
@@ -61,10 +61,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-parser-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-generator-impl</artifactId>
@@ -80,10 +76,6 @@
         </dependency>
 
         <!--Netty -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-timer-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec</artifactId>
@@ -170,45 +162,24 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-config-example</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-event-executor-config</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-dom-adapter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-threadgroup-config</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
+            <artifactId>sal-broker-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-broker-impl</artifactId>
+            <artifactId>sal-binding-broker-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/bgp/rib-spi/pom.xml b/bgp/rib-spi/pom.xml
index b2598c1dc680276654733172b5bdfe7336fe7a6b..b4d38e1000422ec898ffe4f219dec6c73bc1c6b3 100644 (file)
--- a/bgp/rib-spi/pom.xml
+++ b/bgp/rib-spi/pom.xml
@@ -61,10 +61,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
@@ -112,20 +108,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-dom-adapter</artifactId>

diff --git a/bgp/topology-provider/pom.xml b/bgp/topology-provider/pom.xml
index 1876f20894666e30d44924a8f132bc4f69c4ee0c..cb1eeae91836928f6f40628f7c608f6e508e1307 100644 (file)
--- a/bgp/topology-provider/pom.xml
+++ b/bgp/topology-provider/pom.xml
@@ -117,16 +117,6 @@
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types-2013-07-15</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
@@ -147,20 +137,6 @@
             <artifactId>testtool-util</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -172,6 +148,11 @@
             <artifactId>bgp-rib-impl</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
@@ -203,16 +184,6 @@
             <artifactId>mockito-configuration</artifactId>
         </dependency>
         <!-- netty -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-event-executor-config</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-threadgroup-config</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-test-util</artifactId>

diff --git a/bmp/bmp-impl/pom.xml b/bmp/bmp-impl/pom.xml
index eaec95a542da859256a8c7fe82892d09e0bb73ad..8130b309cc7100d5a189f741aa559f56ee16bb91 100644 (file)
--- a/bmp/bmp-impl/pom.xml
+++ b/bmp/bmp-impl/pom.xml
@@ -102,10 +102,6 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-dom-codec</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
@@ -163,14 +159,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
@@ -192,6 +180,11 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
@@ -213,27 +206,6 @@
             <artifactId>testtool-util</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-event-executor-config</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-threadgroup-config</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-dom-broker-config</artifactId>

diff --git a/bmp/bmp-spi/pom.xml b/bmp/bmp-spi/pom.xml
index 16a6bbf7df1dab6a8f09c5579e0dfa676ee80322..559207a0cdead28731442feae53fd7e2c04adf44 100644 (file)
--- a/bmp/bmp-spi/pom.xml
+++ b/bmp/bmp-spi/pom.xml
@@ -72,18 +72,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
@@ -93,17 +85,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

diff --git a/data-change-counter/pom.xml b/data-change-counter/pom.xml
index fe01fda0392c3f54c0d051a7f2c99393356255c6..bed5f0b7e01cb0edc8179f067de7f835d867fc47 100644 (file)
--- a/data-change-counter/pom.xml
+++ b/data-change-counter/pom.xml
@@ -48,21 +48,10 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-api</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
@@ -85,15 +74,6 @@
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -102,11 +82,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>testtool-util</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml b/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml
index 9c9b3cf9d61bc31a9a32eb2bcc2fae00904b90a0..623914924020993475865c440e3fb7a8d324da82 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml
@@ -37,11 +37,5 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-config-core</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
     </dependencies>
 </project>

diff --git a/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml b/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml
index 443632d1ee1a092f0e34d8ed5452f02bb2f09b6e..acfeae01f99de2d10422bb6d4eb4ac5f2e6c36a2 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml
@@ -43,11 +43,5 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-config-api</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
     </dependencies>
 </project>

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

diff --git a/features/bmp/odl-bgpcep-bmp/pom.xml b/features/bmp/odl-bgpcep-bmp/pom.xml
index d3c43d85981d21e67a064e646ddcbc2c2bbf409e..200f611b7fecd2938a343a33fae9036c84f7e9c4 100644 (file)
--- a/features/bmp/odl-bgpcep-bmp/pom.xml
+++ b/features/bmp/odl-bgpcep-bmp/pom.xml
@@ -88,18 +88,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-config-netty</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-config-netty-config-api</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bmp-config-loader</artifactId>

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

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

diff --git a/features/rsvp/odl-bgpcep-rsvp-api/pom.xml b/features/rsvp/odl-bgpcep-rsvp-api/pom.xml
index 9865781ad946fd90f50e1c6dc09d54b74bebf0d8..5a3e62a8ab623fea2c139f2112dd9dd0a8ef3c79 100644 (file)
--- a/features/rsvp/odl-bgpcep-rsvp-api/pom.xml
+++ b/features/rsvp/odl-bgpcep-rsvp-api/pom.xml
@@ -30,12 +30,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>rsvp-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-config-core</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>odl-bgpcep-extras-dependencies</artifactId>

diff --git a/parent/pom.xml b/parent/pom.xml
index f6f8d1cd11ca915316ead13afa476fbdd732b22d..59ed9ca25c17b40354740607b6f84f546cb2d28c 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -49,13 +49,6 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>config-artifacts</artifactId>
-                <version>0.9.0-SNAPSHOT</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
             <!-- YANG TOOLS ARTIFACTS -->
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>

diff --git a/pcep/api/pom.xml b/pcep/api/pom.xml
index daa2485c31ea4eb99983444e07b5d0afa6b08fa8..cbcc372d023637516830b22aefddebff2d35a8c5 100644 (file)
--- a/pcep/api/pom.xml
+++ b/pcep/api/pom.xml
@@ -73,11 +73,6 @@
             <artifactId>ietf-inet-types-2013-07-15</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-
         <!-- Testing dependencies -->
         <dependency>
             <groupId>junit</groupId>

diff --git a/pcep/auto-bandwidth-extension/pom.xml b/pcep/auto-bandwidth-extension/pom.xml
index 433909d5c3323d8aef73297c7df7210b818a3752..2819814d2f5fe38268978547e74af663bad4e4f9 100644 (file)
--- a/pcep/auto-bandwidth-extension/pom.xml
+++ b/pcep/auto-bandwidth-extension/pom.xml
@@ -33,10 +33,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-api</artifactId>

diff --git a/pcep/ietf-stateful07/pom.xml b/pcep/ietf-stateful07/pom.xml
index 8b7a2ab87930f7057d0b8c9c935fea5e7c80a7d6..620923da5181bc31d24996ee54d0ff8f724ade85 100644 (file)
--- a/pcep/ietf-stateful07/pom.xml
+++ b/pcep/ietf-stateful07/pom.xml
@@ -32,10 +32,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-api</artifactId>
@@ -122,20 +118,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>

diff --git a/pcep/impl/pom.xml b/pcep/impl/pom.xml
index 4ee7c337126122e300e491902cc8186d21b9654e..9347679a00ad95a6a7c227328c2a19e78261d9db 100644 (file)
--- a/pcep/impl/pom.xml
+++ b/pcep/impl/pom.xml
@@ -104,15 +104,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
@@ -128,35 +119,10 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-threadgroup-config</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-timer-config</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-spi</artifactId>

diff --git a/pcep/pcc-mock/pom.xml b/pcep/pcc-mock/pom.xml
index b6778223002ef1db2257294fcd716da45b8a809a..f47546fc5d056faca4a1ceb2ce39fe68621480ae 100644 (file)
--- a/pcep/pcc-mock/pom.xml
+++ b/pcep/pcc-mock/pom.xml
@@ -103,16 +103,6 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/pcep/segment-routing/pom.xml b/pcep/segment-routing/pom.xml
index 21dbe0fb65e4e69a8c732cf021d4ab58ed59b47f..3ec3aaed205190d249f48c3b19748e69931670b1 100644 (file)
--- a/pcep/segment-routing/pom.xml
+++ b/pcep/segment-routing/pom.xml
@@ -73,11 +73,6 @@
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
@@ -100,20 +95,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>

diff --git a/pcep/topology/topology-provider/pom.xml b/pcep/topology/topology-provider/pom.xml
index 7832ccc1464d6466ed9d8db8a18a0db828dc1e95..35b43995078665a641f2261e2cfadc1e5f25debb 100644 (file)
--- a/pcep/topology/topology-provider/pom.xml
+++ b/pcep/topology/topology-provider/pom.xml
@@ -77,16 +77,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>util</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types-2013-07-15</artifactId>
@@ -153,21 +143,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -182,16 +157,6 @@
             <artifactId>sal-binding-broker-impl</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-timer-config</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-threadgroup-config</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>programming-impl</artifactId>

diff --git a/pcep/tunnel/tunnel-provider/pom.xml b/pcep/tunnel/tunnel-provider/pom.xml
index 7dbd5aab5250289012cde716cc6e4332fcbb6e89..d261f3af496bc9cf7628a58bddd8a87fece8a01a 100644 (file)
--- a/pcep/tunnel/tunnel-provider/pom.xml
+++ b/pcep/tunnel/tunnel-provider/pom.xml
@@ -114,23 +114,18 @@
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology-l3-unicast-igp</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-topology-provider</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
@@ -147,33 +142,10 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-timer-config</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-threadgroup-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>programming-impl</artifactId>

diff --git a/programming/impl/pom.xml b/programming/impl/pom.xml
index 1fe8bf5962bd2eecf05d0eea37fb05ff2107e8c1..5a3940704136e8d7991f1ebdab3ca50dbd884da2 100644 (file)
--- a/programming/impl/pom.xml
+++ b/programming/impl/pom.xml
@@ -63,23 +63,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
@@ -102,20 +89,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -124,11 +97,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-timer-config</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-broker-impl</artifactId>

diff --git a/programming/spi/pom.xml b/programming/spi/pom.xml
index 188057be94c72eb6ba975bf88d93618450bdb1b4..12738570667aaea65d1497b84c0f8106e67aacb9 100644 (file)
--- a/programming/spi/pom.xml
+++ b/programming/spi/pom.xml
@@ -47,10 +47,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
 
         <!-- Testing dependencies -->
         <dependency>

diff --git a/programming/spi/src/main/yang/odl-programming-spi-cfg.yang b/programming/spi/src/main/yang/odl-programming-spi-cfg.yang
deleted file mode 100644 (file)
index 51139b4..0000000
--- a/programming/spi/src/main/yang/odl-programming-spi-cfg.yang
+++ /dev/null
@@ -1,37 +0,0 @@
-// vi: set smarttab et sw=4 tabstop=4:
-module odl-programming-spi-cfg {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:programming:spi";
-    prefix "spi";
-
-    import config { prefix config; revision-date 2013-04-05; }
-
-    organization "Cisco Systems, Inc.";
-
-    contact "Robert Varga <rovarga@cisco.com>";
-
-    description
-        "This module contains the base YANG definitions for
-         Programming SPI.
-
-        Copyright (c)2013 Cisco Systems, Inc. All rights reserved.;
-
-        This program and the accompanying materials are made available
-        under the terms of the Eclipse Public License v1.0 which
-        accompanies this distribution, and is available at
-        http://www.eclipse.org/legal/epl-v10.html";
-
-    revision "2013-11-15" {
-        description
-            "Initial revision";
-    }
-
-    identity instruction-scheduler {
-        description
-            "Service representing an instruction scheduler.";
-
-        base "config:service-type";
-        config:java-class "org.opendaylight.bgpcep.programming.spi.InstructionScheduler";
-    }
-}
-

diff --git a/rsvp/impl/pom.xml b/rsvp/impl/pom.xml
index a69d456de7bd779204c4a441e9cccac91a410765..5a8aebbc3205b2e46937e96295ba3c1eb7276937 100644 (file)
--- a/rsvp/impl/pom.xml
+++ b/rsvp/impl/pom.xml
@@ -58,17 +58,5 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

diff --git a/rsvp/spi/pom.xml b/rsvp/spi/pom.xml
index 228f1f5ce4f056ffbd6573b9580428724b462aea..1bf32f633dfd369a3ceb021561ebffac6a63dd99 100644 (file)
--- a/rsvp/spi/pom.xml
+++ b/rsvp/spi/pom.xml
@@ -44,25 +44,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

diff --git a/topology/api/pom.xml b/topology/api/pom.xml
index 61e9b31294b872bcc424b1e7dcd291acbdd8e797..33ed6d34c3097464343a9e991a9fe68e895db4b5 100644 (file)
--- a/topology/api/pom.xml
+++ b/topology/api/pom.xml
@@ -49,10 +49,6 @@
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/topology/api/src/main/yang/odl-topology-api-cfg.yang b/topology/api/src/main/yang/odl-topology-api-cfg.yang
deleted file mode 100644 (file)
index 51475fc..0000000
--- a/topology/api/src/main/yang/odl-topology-api-cfg.yang
+++ /dev/null
@@ -1,37 +0,0 @@
-// vi: set smarttab et sw=4 tabstop=4:
-module odl-topology-api-cfg {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:topology";
-    prefix "topo";
-
-    import config { prefix config; revision-date 2013-04-05; }
-
-    organization "Cisco Systems, Inc.";
-
-    contact "Robert Varga <rovarga@cisco.com>";
-
-    description
-        "This module contains the base YANG definitions for
-        Topology API.
-
-        Copyright (c)2013 Cisco Systems, Inc. All rights reserved.;
-
-        This program and the accompanying materials are made available
-        under the terms of the Eclipse Public License v1.0 which
-        accompanies this distribution, and is available at
-        http://www.eclipse.org/legal/epl-v10.html";
-
-    revision "2013-11-15" {
-        description
-            "Initial revision";
-    }
-
-    identity topology-reference {
-        description
-            "Service representing a reference to a topology instance.";
-
-        base "config:service-type";
-        config:java-class "org.opendaylight.bgpcep.topology.TopologyReference";
-    }
-}
-