From 13fdb5a0aaf8a5e3b5c90c1031cebdeca9e40597 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 31 May 2020 13:23:36 +0200
Subject: [PATCH] Remove commented-out controller deependencies

These are just throwing people off, they should never have been
here.

JIRA: NETVIRT-1630
Change-Id: If53117d04046dab0ef218188083a9a1ee30356aa
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 aclservice/impl/pom.xml           | 14 --------------
 bgpmanager/impl/pom.xml           | 11 -----------
 cloud-servicechain/impl/pom.xml   |  4 ----
 dhcpservice/impl/pom.xml          |  4 ----
 elanmanager/api/pom.xml           |  4 ----
 elanmanager/impl/pom.xml          | 10 ----------
 features/odl-netvirt-impl/pom.xml |  7 -------
 ipv6service/impl/pom.xml          |  4 ----
 neutronvpn/api/pom.xml            |  4 ----
 statemanager/impl/pom.xml         |  4 ----
 vpnmanager/impl/pom.xml           | 20 +++++---------------
 11 files changed, 5 insertions(+), 81 deletions(-)

diff --git a/aclservice/impl/pom.xml b/aclservice/impl/pom.xml
index 1a2fa8211e..0e9fe27f0c 100644
--- a/aclservice/impl/pom.xml
+++ b/aclservice/impl/pom.xml
@@ -31,14 +31,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>aclservice-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!--dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-        </dependency-->
-<!--        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-        </dependency>-->
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-dom-adapter</artifactId>
@@ -132,12 +124,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>testutils</artifactId>
             <scope>test</scope>
         </dependency>
-<!--        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>-->
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-dom-adapter</artifactId>
diff --git a/bgpmanager/impl/pom.xml b/bgpmanager/impl/pom.xml
index 5f7eef489f..3860347a61 100644
--- a/bgpmanager/impl/pom.xml
+++ b/bgpmanager/impl/pom.xml
@@ -66,17 +66,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>vpnmanager-api</artifactId>
             <version>${project.version}</version>
         </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/cloud-servicechain/impl/pom.xml b/cloud-servicechain/impl/pom.xml
index d0a7ca73c3..a7e3c4b151 100644
--- a/cloud-servicechain/impl/pom.xml
+++ b/cloud-servicechain/impl/pom.xml
@@ -30,10 +30,6 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
-<!--        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-        </dependency>-->
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-dom-adapter</artifactId>
diff --git a/dhcpservice/impl/pom.xml b/dhcpservice/impl/pom.xml
index 4c07ee027b..4a36f20b6a 100644
--- a/dhcpservice/impl/pom.xml
+++ b/dhcpservice/impl/pom.xml
@@ -37,10 +37,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>org.apache.karaf.shell.console</artifactId>
             <scope>provided</scope>
         </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>
diff --git a/elanmanager/api/pom.xml b/elanmanager/api/pom.xml
index b2e27b5927..616ca1a11d 100644
--- a/elanmanager/api/pom.xml
+++ b/elanmanager/api/pom.xml
@@ -33,10 +33,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc7223</artifactId>
         </dependency>
-        <!--dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>yang-ext</artifactId>
-        </dependency-->
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>idmanager-api</artifactId>
diff --git a/elanmanager/impl/pom.xml b/elanmanager/impl/pom.xml
index efd94ce92a..eb5a616170 100644
--- a/elanmanager/impl/pom.xml
+++ b/elanmanager/impl/pom.xml
@@ -75,10 +75,6 @@ this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>neutronvpn-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!--        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-        </dependency>-->
        <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-dom-adapter</artifactId>
@@ -160,12 +156,6 @@ this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
             <version>${genius.version}</version>
             <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-dom-adapter</artifactId>
diff --git a/features/odl-netvirt-impl/pom.xml b/features/odl-netvirt-impl/pom.xml
index d90d5d4d43..2eadadc0d0 100644
--- a/features/odl-netvirt-impl/pom.xml
+++ b/features/odl-netvirt-impl/pom.xml
@@ -23,13 +23,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <dependencies>
-        <!--dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <version>1.11.0</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency-->
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>odl-genius</artifactId>
diff --git a/ipv6service/impl/pom.xml b/ipv6service/impl/pom.xml
index 453e1f9f38..e1f69053db 100644
--- a/ipv6service/impl/pom.xml
+++ b/ipv6service/impl/pom.xml
@@ -28,10 +28,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
-<!--        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-        </dependency>-->
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>interfacemanager-api</artifactId>
diff --git a/neutronvpn/api/pom.xml b/neutronvpn/api/pom.xml
index cdd60e212c..ae98ea33c2 100644
--- a/neutronvpn/api/pom.xml
+++ b/neutronvpn/api/pom.xml
@@ -22,10 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <modelVersion>4.0.0</modelVersion>
 
     <dependencies>
-<!--        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-        </dependency>-->
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>mdsalutil-api</artifactId>
diff --git a/statemanager/impl/pom.xml b/statemanager/impl/pom.xml
index 6000af6365..0a0a4857ee 100644
--- a/statemanager/impl/pom.xml
+++ b/statemanager/impl/pom.xml
@@ -32,10 +32,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
-   <!--     <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-        </dependency>-->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgpmanager-api</artifactId>
diff --git a/vpnmanager/impl/pom.xml b/vpnmanager/impl/pom.xml
index 87f07a7f71..69b158a580 100644
--- a/vpnmanager/impl/pom.xml
+++ b/vpnmanager/impl/pom.xml
@@ -22,15 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <modelVersion>4.0.0</modelVersion>
 
     <dependencies>
-<!--        <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>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>alivenessmonitor-api</artifactId>
@@ -112,18 +103,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         </dependency>
 
         <!-- Testing dependencies -->
-<!--        <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-dom-adapter</artifactId>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-test-utils</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
-- 
2.36.6