Remove dependency on sfc-model to help with yangtools issues.

Also removed building southbound since it has issue with parent pom. Not sure if it is related to all the other build issues from the recent yangtools commits.

Change-Id: Id18ee252f1e619ee899702b0dadb9284db8310af
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 11077c398a4407e3ce0d1d940a57e42f50d21861..764232c964fdf0a94079c05fda47fa3b936a4fdc 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -78,7 +78,6 @@
     <karaf.shell.version>3.0.0</karaf.shell.version>
     <odl.karaf.base.version>1.5.0-SNAPSHOT</odl.karaf.base.version>
     <nsf.version>0.5.0-SNAPSHOT</nsf.version>
-    <sfc-model.version>0.1.0-SNAPSHOT</sfc-model.version>
   </properties>
 
   <dependencyManagement>
@@ -315,11 +314,6 @@
         <artifactId>plugin-shell</artifactId>
         <version>${plugin.shell.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.ovsdb</groupId>
-        <artifactId>ovssfc</artifactId>
-        <version>${ovsdb.ovssfc.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.ovsdb</groupId>
         <artifactId>openstack.net-virt</artifactId>
@@ -350,11 +344,6 @@
         <artifactId>plugin-mdsal-adapter</artifactId>
         <version>${ovsdb.plugin.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.sfc</groupId>
-        <artifactId>sfc-model</artifactId>
-        <version>${sfc-model.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.ovsdb</groupId>
         <artifactId>utils.config</artifactId>

diff --git a/features/ovs-sfc/pom.xml b/features/ovs-sfc/pom.xml
index 1014fbb009f3d669f13a239831b9282cccc7bbab..ac2e1d63f33549f45ac7f597bf3bcb0a33856129 100644 (file)
--- a/features/ovs-sfc/pom.xml
+++ b/features/ovs-sfc/pom.xml
@@ -27,27 +27,6 @@
     <features.file>features.xml</features.file>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>features-ovsdb</artifactId>
-      <version>${ovsdb.library.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      </dependency>
-    <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>features-sfc</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>features-openflowplugin-extension</artifactId>
-      <version>${openflowplugin.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>features-test</artifactId>
@@ -57,14 +36,6 @@
       <artifactId>opendaylight-karaf-empty</artifactId>
       <type>zip</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>plugin</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovssfc</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <resources>

diff --git a/features/ovs-sfc/src/main/resources/features.xml b/features/ovs-sfc/src/main/resources/features.xml
index f1bdb41029c331c5cddf8004edcb0c27462c62ed..404a0df631c97a6e761aa3a06c89c404621c51ce 100644 (file)
--- a/features/ovs-sfc/src/main/resources/features.xml
+++ b/features/ovs-sfc/src/main/resources/features.xml
@@ -1,21 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <features name="ovsdb-${project.version}"
+<features name="ovsdb-${project.version}"
           xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-    <repository>mvn:org.opendaylight.controller/features-nsf/${nsf.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${openflowplugin.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.ovsdb/features-ovsdb/${ovsdb.library.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.sfc/features-sfc/0.1.0-SNAPSHOT/xml/features</repository>
 
-    <feature name="odl-ovsdb-ovssfc"
-             description="OpenDaylight :: OVSDB :: OVS Service Function Chaining"
-             version='${ovsdb.ovssfc.version}'>
-        <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
-        <feature version="${openflowplugin.version}">odl-openflowplugin-nxm-extensions</feature>
-        <feature version="${nsf.version}">odl-nsf-all</feature>
-        <feature version='0.1.0-SNAPSHOT'>odl-sfc-provider</feature>
-        <feature version='0.1.0-SNAPSHOT'>odl-sfc-model</feature>
-        <bundle>mvn:org.opendaylight.ovsdb/ovssfc/${ovsdb.ovssfc.version}</bundle>
-    </feature>
+  <feature name="odl-ovsdb-ovssfc"
+           description="OpenDaylight :: OVSDB :: OVS Service Function Chaining"
+           version='${ovsdb.ovssfc.version}'>
+  </feature>
 </features>

diff --git a/pom.xml b/pom.xml
index 7c9d946bd2fb2b8b56d91cd11e0b9827510f7ed5..dd53dd3da8b95e86562824e8c2ae15ec6c95d98e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -34,8 +34,6 @@
     <module>utils/mdsal-openflow</module>
     <module>openstack/net-virt</module>
     <module>openstack/net-virt-providers</module>
-    <module>ovs-sfc</module>
-    <module>southbound</module>
     <!-- <module>southbound</module> REVERT-ME -->
     <!-- Integration Tests -->
     <module>integrationtest</module>