From 98a3e5e5c873ee9476bd7ba6e05b18724a6cb29a Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 26 May 2020 19:33:01 +0200
Subject: [PATCH] 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>
---
 cloudscaler/api/pom.xml               |  4 ----
 cloudscaler/impl/pom.xml              |  4 ----
 commons/testutils/pom.xml             | 11 -----------
 itm/itm-impl/pom.xml                  |  4 ----
 mdsalutil/mdsalutil-api/pom.xml       | 15 ---------------
 mdsalutil/mdsalutil-impl/pom.xml      | 15 ---------------
 mdsalutil/mdsalutil-testutils/pom.xml | 11 -----------
 7 files changed, 64 deletions(-)

diff --git a/cloudscaler/api/pom.xml b/cloudscaler/api/pom.xml
index c1436b27c..811434240 100644
--- 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 881bcb473..06a774630 100644
--- 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 e12c57955..8f1219ff5 100644
--- 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 fff489dfa..7aea1a880 100644
--- 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 6d249e19e..517173d44 100644
--- 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 0c4a55acb..240130c5d 100644
--- 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 68ec25083..98d9e1f88 100644
--- 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>
-- 
2.36.6