Remove dependency on sal-common-util

This dependency is no longer used, remove it along with use
of controller's odl-mdsal-common.

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

diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
index 084ffe9b954b9fd9eac241f56713c1995958be70..e09ae90184b1e1336f9a60f47cb0add6be64d731 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
@@ -21,7 +21,6 @@
     <name>ODL :: openflowjava :: ${project.artifactId}</name>
 
     <properties>
-        <controller.mdsal.version>1.7.0-SNAPSHOT</controller.mdsal.version>
         <mdsal.version>2.4.0-SNAPSHOT</mdsal.version>
         <mdsal.model.version>0.12.0-SNAPSHOT</mdsal.model.version>
     </properties>
@@ -63,15 +62,6 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-
-            <!-- Controller infrastructure -->
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${controller.mdsal.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -89,12 +79,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-common</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-netty-4</artifactId>

diff --git a/openflowjava/openflow-protocol-impl/pom.xml b/openflowjava/openflow-protocol-impl/pom.xml
index 65d33581429b50c38fcd24f9f14a91bf837862de..22bfca2c2768f40816d905cc3804160a257683e3 100644 (file)
--- a/openflowjava/openflow-protocol-impl/pom.xml
+++ b/openflowjava/openflow-protocol-impl/pom.xml
@@ -57,20 +57,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>openflowjava-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.opendaylight.controller</groupId>
-                    <artifactId>sal-common-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.opendaylight.yangtools</groupId>
-                    <artifactId>concepts</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>