Add SFC back to Fluorine Autorelease

[integration/distribution.git] / features / singles / odl-integration-compatible-with-all / pom.xml

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 43d4acade29cbe3f2dde2346cd48f2958382f6fc..19f69a78b3ec47dfa21343c9b877e662b24edbbc 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -19,7 +19,7 @@
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>odl-integration-compatible-with-all</artifactId>
     <!-- TODO: Shorter name? -->
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.9.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
@@ -50,6 +50,19 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+    <!-- Override odlparent default to get the speed improvements in feature generation
+         FIXME: remove this once odlparent ships 4.1.5+ -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <version>4.1.5</version>
+            </plugin>
+        </plugins>
+    </build>
+
     <!-- User facing single features. Alphabetical order -->
     <profiles>
         <!-- AAA -->
@@ -72,7 +85,7 @@
             <id>alto</id>
             <activation>
                 <!-- Commented because of SFT memory issues -->
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
@@ -155,26 +168,11 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- Distribution -->
-        <profile>
-            <id>distribution</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>odl-distribution-version</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- DluxApps -->
         <profile>
             <id>dluxapps</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
@@ -359,7 +357,7 @@
         <profile>
             <id>packetcable</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
@@ -401,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>
@@ -425,7 +417,6 @@
         <profile>
             <id>snmp4sdn</id>
             <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
                 <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
@@ -441,7 +432,7 @@
         <profile>
             <id>sxp</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>