X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fsingles%2Fodl-integration-all%2Fpom.xml;h=96d24e16c04cc88e8aad97eb7ed97e307284c17c;hb=0bd557e3ae3b2fca9bdfa8d115e1b2698d14feb4;hp=c3d16ca8d8fe157a570611b51daaca40e902dc03;hpb=dabf1ab251b8fb63c1aa70adb5fa01c5f9e2c26b;p=integration%2Fdistribution.git

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index c3d16ca8..96d24e16 100644
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -11,13 +11,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>odl-integration-all</artifactId>
     <!-- TODO: Diferent name? -->
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.12.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. -->
@@ -57,35 +57,8 @@
         </dependency>
     </dependencies>
 
-    <!-- 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>
-
     <!-- External single feature dependencies in alphabetical order -->
     <profiles>
-        <!-- COE -->
-        <profile>
-            <id>coe</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.coe</groupId>
-                    <artifactId>odl-coe</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
         <!-- Genius -->
         <profile>
             <id>genius</id>
@@ -155,34 +128,22 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- SFC -->
+        <!-- Serviceutils -->
         <profile>
-            <id>sfc</id>
+            <id>serviceutils</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfc-ios-xe-renderer</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfc-netconf</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfc-openflow-renderer</artifactId>
+                    <groupId>org.opendaylight.serviceutils</groupId>
+                    <artifactId>odl-serviceutils-srm</artifactId>
                     <type>xml</type>
                     <classifier>features</classifier>
                 </dependency>
                 <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfc-vpp-renderer</artifactId>
+                    <groupId>org.opendaylight.serviceutils</groupId>
+                    <artifactId>odl-serviceutils-tools</artifactId>
                     <type>xml</type>
                     <classifier>features</classifier>
                 </dependency>