BUg-2658: Remove adsal and migrate to mdsal

Remove networkconfiguration.

Change-Id: I571a39a7b933ef59634e10e8ebf8d052c1c31b45
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/commons/integrationtest/pom.xml b/commons/integrationtest/pom.xml
index 57b9ff51ad92dd03dcc7cbed37dcbeb497dfa073..a530fb633310b8f5580eba77d2ac36972016774c 100644 (file)
--- a/commons/integrationtest/pom.xml
+++ b/commons/integrationtest/pom.xml
@@ -553,16 +553,6 @@
       <artifactId>sal.implementation</artifactId>
       <version>${sal.implementation.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal.networkconfiguration</artifactId>
-      <version>${sal.networkconfiguration.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal.networkconfiguration.implementation</artifactId>
-      <version>${sal.networkconfiguration.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>security</artifactId>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index e4abf11fa7f715c825d493e967b9dc85b3ced03b..9b0df333ea067118e9fc6041dff1683aa953a682 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -57,7 +57,6 @@
     <clustering.services.version>0.6.0-SNAPSHOT</clustering.services.version>
     <sal.version>0.9.0-SNAPSHOT</sal.version>
     <sal.connection.version>0.2.0-SNAPSHOT</sal.connection.version>
-    <sal.networkconfiguration.version>0.1.0-SNAPSHOT</sal.networkconfiguration.version>
     <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
     <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
     <openflowjava-nicira.version>0.1.0-SNAPSHOT</openflowjava-nicira.version>
@@ -126,11 +125,6 @@
         <artifactId>sal.connection</artifactId>
         <version>${sal.connection.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal.networkconfiguration</artifactId>
-        <version>${sal.networkconfiguration.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>containermanager</artifactId>

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
index f43dea7f331640a2f45f1505fe9efb2b1c2a5a5f..6da1be63537f1b64c39d1f8aea2bedafb7dd200f 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
@@ -51,8 +51,6 @@ public class ConfigurationBundles {
                 mavenBundle("org.opendaylight.controller", "sal.connection").versionAsInProject(),
                 mavenBundle("org.opendaylight.controller", "sal.connection.implementation").versionAsInProject(),
                 mavenBundle("org.opendaylight.controller", "sal.implementation").versionAsInProject(),
-                mavenBundle("org.opendaylight.controller", "sal.networkconfiguration").versionAsInProject(),
-                mavenBundle("org.opendaylight.controller", "sal.networkconfiguration.implementation").versionAsInProject(),
                 mavenBundle("org.slf4j", "log4j-over-slf4j").versionAsInProject(),
                 mavenBundle("org.slf4j", "slf4j-api").versionAsInProject()
 
@@ -142,8 +140,6 @@ public class ConfigurationBundles {
                 mavenBundle("org.opendaylight.controller","forwardingrulesmanager.implementation").versionAsInProject(),
                 mavenBundle("org.opendaylight.controller","sal.connection.implementation").versionAsInProject(),
                 mavenBundle("org.opendaylight.controller","sal.implementation").versionAsInProject(),
-                mavenBundle("org.opendaylight.controller","sal.networkconfiguration").versionAsInProject(),
-                mavenBundle("org.opendaylight.controller","sal.networkconfiguration.implementation").versionAsInProject(),
                 mavenBundle("org.opendaylight.controller.thirdparty", "com.sun.jersey.jersey-servlet").versionAsInProject(),
                 mavenBundle("org.opendaylight.controller.thirdparty", "net.sf.jung2").versionAsInProject(),
                 mavenBundle("org.opendaylight.controller.thirdparty", "org.apache.catalina.filters.CorsFilter").versionAsInProject().noStart(),

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 8b2300ee0e26407440c94abff91fa18614095dfa..c496c680717f15a0d905f45f6de0ba5c35601d5b 100755 (executable)
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -85,10 +85,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal.connection</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal.networkconfiguration</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>library</artifactId>
@@ -140,7 +136,6 @@
               org.opendaylight.controller.sal.utils,
               org.opendaylight.controller.sal.connection,
               org.opendaylight.controller.clustering.services,
-              org.opendaylight.controller.sal.networkconfig.bridgedomain,
               org.opendaylight.ovsdb.lib.error,
               org.opendaylight.ovsdb.lib.notation,
               org.opendaylight.ovsdb.lib.operations,