Changes for SFC project features

Relies on https://git.opendaylight.org/gerrit/#/c/29169/

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

diff --git a/features/pom.xml b/features/pom.xml
index d08a709a55ff3c58dbcf6f9808a1e1a79b172066..1de575c1c7e801136bf75de7847c1eec67eda666 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -146,30 +146,6 @@
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>features-sfc-sb-rest</artifactId>
-      <version>${sfc.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>features-sfc-ovs</artifactId>
-      <version>${sfc.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>features-sfcofl2</artifactId>
-      <version>${sfc.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
 
     <!-- Netconf -->
     <dependency>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index ff5671c374ca5b98a578a261f623dbd9b1e03cf5..c4ffef0dcf35438b6457c452738d02b5983af500 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -23,9 +23,6 @@
     <repository>mvn:org.opendaylight.neutron/features-neutron/{{VERSION}}/xml/features</repository>
     <!-- Repos needed by ofoverlay for SFC -->
     <repository>mvn:org.opendaylight.sfc/features-sfc/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.sfc/features-sfc-sb-rest/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.sfc/features-sfc-ovs/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.sfc/features-sfcofl2/{{VERSION}}/xml/features</repository>
     <!-- Repos needed by the UI Backend -->
     <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
     <!-- Repos needed by the UI -->
@@ -50,11 +47,7 @@
         <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>
-        <feature version='${sfc.version}'>odl-sfc-core</feature>
-        <feature version='${sfc.version}'>odl-sfc-test-consumer</feature>
-        <feature version='${sfc.version}'>odl-sfc-sb-rest</feature>
         <feature version='${sfc.version}'>odl-sfcofl2</feature>
-        <feature version='${sfc.version}'>odl-sfc-ovs</feature>
         <feature version='${sfc.version}'>odl-sfc-ui</feature>
         <bundle>mvn:commons-net/commons-net/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/ofoverlay-renderer/{{VERSION}}</bundle>
@@ -79,7 +72,6 @@
          The Neutron provider
     -->
     <feature name='odl-groupbasedpolicy-neutronmapper' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: Neutron Mapper mapps neutron APIs to GBP APIs '>
-        <feature version="${controller.mdsal.version}">odl-mdsal-broker</feature>
         <feature version="${neutron.version}">odl-neutron-service</feature>
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
         <feature version="${project.version}">odl-groupbasedpolicy-ofoverlay</feature>
@@ -93,7 +85,6 @@
          The UI Backend
     -->
     <feature name='odl-groupbasedpolicy-uibackend' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: UI Backend provides APIs for UI '>
-        <feature version="${controller.mdsal.version}">odl-mdsal-broker</feature>
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
         <feature version="${restconf.version}">odl-restconf</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/ui-backend/{{VERSION}}</bundle>

diff --git a/renderers/ofoverlay/pom.xml b/renderers/ofoverlay/pom.xml
index 90614a6650ab2dc4532a863e5590f7c518d7930e..80f58720ef8dc7870e8499529f57ab3cd5fbf341 100644 (file)
--- a/renderers/ofoverlay/pom.xml
+++ b/renderers/ofoverlay/pom.xml
@@ -51,11 +51,6 @@
       <artifactId>commons-net</artifactId>
     </dependency>
     <!-- SFC -->
-    <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>sfc-model</artifactId>
-      <version>${sfc.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.sfc</groupId>
       <artifactId>sfc-provider</artifactId>