Cleanup unused config subsystem dependencies

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

diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml
index ef902cff502a4bb98cc9b6ac8030e7fd0c44c82b..4d32db212df97f066ee56ec90809004f7cde309f 100644 (file)
--- a/features/netconf/odl-netconf-api/pom.xml
+++ b/features/netconf/odl-netconf-api/pom.xml
@@ -52,11 +52,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-            <version>0.7.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-api</artifactId>
@@ -93,4 +88,4 @@
             <classifier>features</classifier>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml
index 6a84259c221646bd389a07b61bfcffdd77a53ba7..73b3b777d59430903171fbb1c61b777592579506 100644 (file)
--- a/netconf/mdsal-netconf-connector/pom.xml
+++ b/netconf/mdsal-netconf-connector/pom.xml
@@ -85,14 +85,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-util</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>ietf-netconf</artifactId>

diff --git a/netconf/mdsal-netconf-monitoring/pom.xml b/netconf/mdsal-netconf-monitoring/pom.xml
index 9b170ceb5b969323b9bd1a71d3b8a8fdfc048016..de39fb4a4969e588ae115a817a2dfb68d5b84080 100644 (file)
--- a/netconf/mdsal-netconf-monitoring/pom.xml
+++ b/netconf/mdsal-netconf-monitoring/pom.xml
@@ -53,8 +53,12 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
+      <artifactId>sal-binding-api</artifactId>
+     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-common-util</artifactId>
+     </dependency>
 
     <dependency>
       <groupId>com.google.guava</groupId>

diff --git a/netconf/mdsal-netconf-notification/pom.xml b/netconf/mdsal-netconf-notification/pom.xml
index 124003e0f702f1b3ff6685a94c4ceba1b425e798..454f9168eb90c50363a99d9a92e72ef3405aba71 100644 (file)
--- a/netconf/mdsal-netconf-notification/pom.xml
+++ b/netconf/mdsal-netconf-notification/pom.xml
@@ -53,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
+            <artifactId>sal-common-util</artifactId>
         </dependency>
 
         <dependency>

diff --git a/netconf/messagebus-netconf/pom.xml b/netconf/messagebus-netconf/pom.xml
index 341d2c8146683a11d72113685b1f8815922ff214..93ea90d936ef2775c80c3e58efce13a5461ddd2f 100644 (file)
--- a/netconf/messagebus-netconf/pom.xml
+++ b/netconf/messagebus-netconf/pom.xml
@@ -57,10 +57,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>messagebus-api</artifactId>
@@ -77,10 +73,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-netconf-connector</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
 
         <!-- Testing Dependencies -->
         <dependency>

diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml
index 354e4078c42316f97260bcc878e023cf09fc7d2b..ad15de2a2793294f5e6d27e401f19841c3fa0b4f 100644 (file)
--- a/netconf/netconf-config/pom.xml
+++ b/netconf/netconf-config/pom.xml
@@ -22,18 +22,6 @@
   <description>Configuration files for netconf</description>
   <packaging>bundle</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-artifacts</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <build>
     <plugins>
       <plugin>

diff --git a/netconf/netconf-impl/pom.xml b/netconf/netconf-impl/pom.xml
index 22f1c5e4835275cbfd33613463085aca998f5991..06a5e232e56e10a5414324555aefacc2ddd7686f 100644 (file)
--- a/netconf/netconf-impl/pom.xml
+++ b/netconf/netconf-impl/pom.xml
@@ -72,10 +72,6 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-util</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>protocol-framework</artifactId>

diff --git a/netconf/netconf-mapping-api/pom.xml b/netconf/netconf-mapping-api/pom.xml
index 81d018cfd6bc40bb2ec3644cf134a784315e0e3a..1b1c8bc1c0389a657a2a2f1e130f5213a24222c6 100644 (file)
--- a/netconf/netconf-mapping-api/pom.xml
+++ b/netconf/netconf-mapping-api/pom.xml
@@ -39,10 +39,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-manager-facade-xml</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>

diff --git a/netconf/netconf-netty-util/pom.xml b/netconf/netconf-netty-util/pom.xml
index c0338b506144f58e9f53e240ec134e0237c52b6a..792a1d479b30c4a7e7e6a2e41d0067ce01410519 100644 (file)
--- a/netconf/netconf-netty-util/pom.xml
+++ b/netconf/netconf-netty-util/pom.xml
@@ -75,10 +75,6 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-handler</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>protocol-framework</artifactId>

diff --git a/netconf/netconf-notifications-api/pom.xml b/netconf/netconf-notifications-api/pom.xml
index f16ebc1abf2ea39c0dea1a6e9a54c53083d940e8..752dfd09780a7c9b840830dd5f3389d262868b7d 100644 (file)
--- a/netconf/netconf-notifications-api/pom.xml
+++ b/netconf/netconf-notifications-api/pom.xml
@@ -41,10 +41,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager-facade-xml</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ietf-netconf-notifications</artifactId>

diff --git a/netconf/netconf-topology/pom.xml b/netconf/netconf-topology/pom.xml
index aa3d9a3d49576699c68901f0c08de77dac904c4e..09bade954479facff7b2ae0bc2cd6e8cd3ec94ab 100644 (file)
--- a/netconf/netconf-topology/pom.xml
+++ b/netconf/netconf-topology/pom.xml
@@ -32,10 +32,6 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</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>

diff --git a/netconf/netconf-util/pom.xml b/netconf/netconf-util/pom.xml
index 0dfafb837c2e511bbc84a28e49b0b8f6b02a526e..43ec022c2359c31286c50cfae404ca0d4fba8f7f 100644 (file)
--- a/netconf/netconf-util/pom.xml
+++ b/netconf/netconf-util/pom.xml
@@ -43,9 +43,9 @@
 
   <dependencies>
     <!-- compile dependencies -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-manager-facade-xml</artifactId>
+   <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator-impl</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -63,10 +63,6 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-handler</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>

diff --git a/netconf/sal-netconf-connector/pom.xml b/netconf/sal-netconf-connector/pom.xml
index 87e88e669fbf8561ea20da83eee33b0cef8f51ff..96c4335bc49a17e17f9e28221037ccb7eeba2b29 100644 (file)
--- a/netconf/sal-netconf-connector/pom.xml
+++ b/netconf/sal-netconf-connector/pom.xml
@@ -78,10 +78,6 @@
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-generator-impl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-inventory</artifactId>

diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index bd79b357a402ebdb81a00002c2ef672811e0c843..e736b5469ab4550dad05ddea7cd7f2a311abd3b9 100644 (file)
--- a/netconf/tools/netconf-testtool/pom.xml
+++ b/netconf/tools/netconf-testtool/pom.xml
@@ -101,10 +101,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>

diff --git a/netconf/yanglib/pom.xml b/netconf/yanglib/pom.xml
index 30ac6aa7964a71e6de4d2c719b9112be9c2c282f..f7c8316366f7f2e49cd8bdf09c0dbfdf87b6d9dd 100644 (file)
--- a/netconf/yanglib/pom.xml
+++ b/netconf/yanglib/pom.xml
@@ -71,10 +71,6 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/restconf/pom.xml b/restconf/pom.xml
index 12b9479b7e06e21c62874d01536105d801b3abeb..4ed92263b966130c0baf25b934de84500837cd9a 100644 (file)
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -44,6 +44,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>netconf-parent</artifactId>
+                <version>1.3.0-SNAPSHOT</version>
+                <type>pom</type>
+               <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/restconf/sal-rest-connector/pom.xml b/restconf/sal-rest-connector/pom.xml
index c086aa81c3d770afd9558d876034d40edd0ec877..b15f4a5b2833b073598abb99c1891d793a712fe7 100644 (file)
--- a/restconf/sal-rest-connector/pom.xml
+++ b/restconf/sal-rest-connector/pom.xml
@@ -52,18 +52,10 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-core-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-util</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>

diff --git a/restconf/sal-restconf-broker/pom.xml b/restconf/sal-restconf-broker/pom.xml
index eecaa0acdabf762e1a8fc905b28133236994c4f7..f0e601b0bfb76e1086a89b75cab979a7509229c6 100644 (file)
--- a/restconf/sal-restconf-broker/pom.xml
+++ b/restconf/sal-restconf-broker/pom.xml
@@ -13,10 +13,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-util</artifactId>