Add SFC back to Fluorine Autorelease

- It was removed due to failure that have since been fixed.
- Removed odl-sfc-ui as it no longer exists, thus removing
  SFC's dependency on DLUX.

Change-Id: Ie0ee2e224db4398c4351536b2f0edcecbcfd5f73
Signed-off-by: Brady Johnson <bjohnson@inocybe.com>

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 51727cde32a75953b72b7d25340ce110b9713aec..dffa186c210cb3a1a9684e92bc2fa1ed1dcac377 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -383,7 +383,7 @@
         <profile>
             <id>sfc</id>
             <activation>
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index 2d1cf03c8f8477a95b88456a19490e515ecd48b8..37d2188d18b8a85079eaa923abe78551e4e19d15 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -501,7 +501,7 @@
         <profile>
             <id>sfc</id>
             <activation>
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
@@ -540,13 +540,6 @@
                         <type>xml</type>
                         <classifier>features</classifier>
                     </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.sfc</groupId>
-                        <artifactId>odl-sfc-ui</artifactId>
-                        <version>${sfc.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                    </dependency>
                     <dependency>
                         <groupId>org.opendaylight.sfc</groupId>
                         <artifactId>odl-sfc-vpp-renderer</artifactId>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 7bf7db8f46464f663e4f940d844a845550c9d0f8..b1df20b91224ca8e1798833ce31a9f855ba0a7c6 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -612,7 +612,7 @@
         <profile>
             <id>sfc</id>
             <activation>
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 556ee7ba2353d12aed424e0e52e3a2e1e06b4995..79b548fd5fd7c4e75b18dd9355b818ead9aafe4b 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -407,7 +407,7 @@
         <profile>
             <id>sfc</id>
             <activation>
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 004cd650e5f4d889a848d4fe0bc5d40f3d278eb3..19f69a78b3ec47dfa21343c9b877e662b24edbbc 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -384,7 +384,7 @@
         <profile>
             <id>sfc</id>
             <activation>
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
@@ -399,12 +399,6 @@
                     <type>xml</type>
                     <classifier>features</classifier>
                 </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfc-ui</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
                 <dependency>
                     <groupId>org.opendaylight.sfc</groupId>
                     <artifactId>odl-sfclisp</artifactId>