Remove commented-out dependencies

Dependencies on controller artifacts are commented out, remove
them to prevent them from coming back.

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

diff --git a/cloudscaler/api/pom.xml b/cloudscaler/api/pom.xml
index c1436b27ca9ad81d4d9203b47ca542eeafdf2839..811434240e2b1de264674595c6fe48897e6c2c2d 100644 (file)
--- a/cloudscaler/api/pom.xml
+++ b/cloudscaler/api/pom.xml
@@ -50,10 +50,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-service</artifactId>
     </dependency>
-    <!--<dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-broker-impl</artifactId>
-    </dependency>!-->
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>

diff --git a/cloudscaler/impl/pom.xml b/cloudscaler/impl/pom.xml
index 881bcb473fb8f1744481f3dfd83aac14eed6f87f..06a774630bb0bc401459ac253061049483952bc9 100644 (file)
--- a/cloudscaler/impl/pom.xml
+++ b/cloudscaler/impl/pom.xml
@@ -114,10 +114,6 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-    <!--<dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-broker-impl</artifactId>
-    </dependency>!-->
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-test-utils</artifactId>

diff --git a/commons/testutils/pom.xml b/commons/testutils/pom.xml
index e12c579555e4cb52f65ba6d5cc0928958fb9408d..8f1219ff51ad61e426cdba11ad5d011286960b26 100644 (file)
--- a/commons/testutils/pom.xml
+++ b/commons/testutils/pom.xml
@@ -67,17 +67,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>mdsal-binding-test-utils</artifactId>
       <scope>compile</scope>
     </dependency>
-    <!--<dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-broker-impl</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-broker-impl</artifactId>
-      <type>test-jar</type>
-      <scope>compile</scope>
-    </dependency>!-->
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>mdsalutil-api</artifactId>

diff --git a/itm/itm-impl/pom.xml b/itm/itm-impl/pom.xml
index fff489dfad9213b20b1d18cd1cc18cf26abd30c9..7aea1a880f3dea7cc3173e3bf61ae892882c3b69 100644 (file)
--- a/itm/itm-impl/pom.xml
+++ b/itm/itm-impl/pom.xml
@@ -56,10 +56,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>blueprint-maven-plugin-annotation</artifactId>
       <optional>true</optional>
     </dependency>
-    <!--<dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-broker-impl</artifactId>
-    </dependency>!-->
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc7223</artifactId>

diff --git a/mdsalutil/mdsalutil-api/pom.xml b/mdsalutil/mdsalutil-api/pom.xml
index 6d249e19e065dd69093fe5d743dbb977a764f46b..517173d44872ec30ef7ee157c8012e1d2e5e68d4 100644 (file)
--- a/mdsalutil/mdsalutil-api/pom.xml
+++ b/mdsalutil/mdsalutil-api/pom.xml
@@ -42,10 +42,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.openflowplugin.libraries</groupId>
       <artifactId>liblldp</artifactId>
     </dependency>
-    <!--<dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-api</artifactId>
-    </dependency>!-->
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-eos-binding-api</artifactId>
@@ -167,17 +163,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>com.google.guava</groupId>
       <artifactId>guava-testlib</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>
-       <scope>test</scope>
-       <type>test-jar</type>
-     </dependency>!-->
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-test-utils</artifactId>

diff --git a/mdsalutil/mdsalutil-impl/pom.xml b/mdsalutil/mdsalutil-impl/pom.xml
index 0c4a55acbb42612947279496e268e8311989e0a3..240130c5dafd4d41f1caf7a5a28a07f83364a82d 100644 (file)
--- a/mdsalutil/mdsalutil-impl/pom.xml
+++ b/mdsalutil/mdsalutil-impl/pom.xml
@@ -26,10 +26,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: genius :: ${project.artifactId}</name>
 
   <dependencies>
-    <!--<dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-api</artifactId>
-    </dependency>!-->
     <dependency>
       <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-base</artifactId>
@@ -88,17 +84,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>infrautils-testutils</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>
-      <scope>test</scope>
-      <type>test-jar</type>
-    </dependency>!-->
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-test-utils</artifactId>

diff --git a/mdsalutil/mdsalutil-testutils/pom.xml b/mdsalutil/mdsalutil-testutils/pom.xml
index 68ec250830e737044d839064ca2d74bf8dccea19..98d9e1f886dfbcce466e9b0f843590ef34105346 100644 (file)
--- a/mdsalutil/mdsalutil-testutils/pom.xml
+++ b/mdsalutil/mdsalutil-testutils/pom.xml
@@ -70,17 +70,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>mockito-core</artifactId>
       <scope>compile</scope>
     </dependency>
-    <!--<dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-broker-impl</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-broker-impl</artifactId>
-      <type>test-jar</type>
-      <scope>compile</scope>
-    </dependency>!-->
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-test-utils</artifactId>