Revert "temp rm netvirt-sfc feature while sfc is busted"

This reverts commit 17fd01cfd7fa6839035767e3123dd2fdbe476136.

Revert "temp rm netvirt-sfc feature while sfc is busted"

This reverts commit 112ea539ae0ca3b355f15ca0944819b904f1bb5a.

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

diff --git a/vpnservice/features/pom.xml b/vpnservice/features/pom.xml
index e416b8e12c741c607ef7dce23f5858f2d0b46325..c7a90a4726b89cc9b9a05e0223b3f9f30d7048c1 100644 (file)
--- a/vpnservice/features/pom.xml
+++ b/vpnservice/features/pom.xml
@@ -30,7 +30,7 @@
         <module>odl-netvirt-federation</module>
         -->
         <module>odl-netvirt-ui</module>
-        <!--<module>odl-netvirt-sfc</module>-->
+        <module>odl-netvirt-sfc</module>
     </modules>
 
     <!-- Maven Site Configuration The following configuration is necessary

diff --git a/vpnservice/features/vpnservice-features/pom.xml b/vpnservice/features/vpnservice-features/pom.xml
index 03d7c2d2c3c2ed1ed5198db30c81a410242c2099..16d9939f14c2997a42c9ab76fdb8e42637951a31 100644 (file)
--- a/vpnservice/features/vpnservice-features/pom.xml
+++ b/vpnservice/features/vpnservice-features/pom.xml
@@ -61,13 +61,13 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <!--<dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-netvirt-sfc</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
-        </dependency>-->
+        </dependency>
     </dependencies>
     
 </project>

diff --git a/vpnservice/pom.xml b/vpnservice/pom.xml
index 07ca2dc6133c6c25de109aaa810e160acc644abd..41ba344295d8524f19cd166c5acc91e100ba46ef 100644 (file)
--- a/vpnservice/pom.xml
+++ b/vpnservice/pom.xml
@@ -42,7 +42,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <module>vpnservice-artifacts</module>
     <module>statemanager</module>
     <module>statistics</module>
-    <!--<module>sfc</module>-->
+    <module>sfc</module>
     <module>ovsdb-ui</module>
   </modules>
 

diff --git a/vpnservice/vpnservice-artifacts/pom.xml b/vpnservice/vpnservice-artifacts/pom.xml
index 5ae367b2e06be998ff56eb4baa0d1b74a1ee55e4..5b819e6fb37be37dbf57c988725b3778168479e4 100644 (file)
--- a/vpnservice/vpnservice-artifacts/pom.xml
+++ b/vpnservice/vpnservice-artifacts/pom.xml
@@ -70,13 +70,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <classifier>features</classifier>
         <type>xml</type>
       </dependency>
-      <!--<dependency>
+      <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>odl-netvirt-sfc</artifactId>
         <version>${project.version}</version>
         <classifier>features</classifier>
         <type>xml</type>
-      </dependency>-->
+      </dependency>
     </dependencies>
   </dependencyManagement>