Revert "Added feature dependency on odl-ovsdb-southbound-impl"

This reverts commit aa03a46446c4f267fc8f88f109cae13b864b30bb.

Change-Id: I38200796d8f01ea18528f95e4b12f7f839eb983d
Signed-off-by: Keith Burns <alagalah@gmail.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 7e441e58cebdd795a683f19cd9351192a693ea23..373caf814b0cde4c1da564856d47cd464725dadf 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -33,7 +33,6 @@
     <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
     <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
     <neutron.version>0.5.0-SNAPSHOT</neutron.version>
-    <ovsdb.southbound.version>1.1.0-SNAPSHOT</ovsdb.southbound.version>
   </properties>
 
   <dependencyManagement>
@@ -260,3 +259,4 @@
     <tag>HEAD</tag>
   </scm>
 </project>
+

diff --git a/features/pom.xml b/features/pom.xml
index e7ee8e178fc9f4306b6bd1b74c4ee9b8effc89a1..2eff442718728f5300f9cc8c8d91f59dc295c050 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -76,13 +76,6 @@
       <version>${neutron.version}</version>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>southbound-features</artifactId>
-      <version>${ovsdb.southbound.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
 
     <!-- gbp dependencies -->
     <dependency>
@@ -220,3 +213,4 @@
     <url>https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=summary</url>
   </scm>
 </project>
+

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 4e4180d6836c378e0c731beb5ff1f5adc01ebac6..aed61659aec3236807a478c11a5ff61ecee1b967 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -18,7 +18,6 @@
     <!-- Repos needed by the OpenFlow Overlay renderer -->
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${openflowplugin.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.ovsdb/southbound-features/${ovsdb.southbound.version}/xml/features</repository>
 
     <!-- Repos needed by the Neutron Mapper -->
     <repository>mvn:org.opendaylight.neutron/features-neutron/${neutron.version}/xml/features</repository>
@@ -41,7 +40,6 @@
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
         <feature version="${openflowplugin.version}">odl-openflowplugin-flow-services</feature>
         <feature version='${openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
-        <feature version='${ovsdb.southbound.version}'>odl-ovsdb-southbound-impl</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/ofoverlay-renderer/${project.version}</bundle>
         <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.ofoverlayconfigfile}">mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-ofoverlay-config/${project.version}/xml/config</configfile>
     </feature>
@@ -90,3 +88,4 @@
         <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.neutronmapperconfigfile}">mvn:org.opendaylight.groupbasedpolicy/neutron-mapper-config/${project.version}/xml/config</configfile>
     </feature>
 </features>
+