X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fsingles%2Fodl-integration-all%2Fpom.xml;h=086de385f70b2bdf7f73cb03151c799ea1e05b2f;hb=4117c5eef0b90134859d23b52228f3f340812714;hp=e1a8a456bb9a4d21e6bce4e5d462521f89c53521;hpb=2aba1047193eb843327c8d15ceb19fe478e3314c;p=integration%2Fdistribution.git

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index e1a8a456..086de385 100644
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
 
@@ -6,20 +6,18 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>6.0.1</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. -->
@@ -59,18 +57,6 @@
         </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 -->
@@ -190,5 +176,26 @@
                 </dependency>
             </dependencies>
         </profile>
+        <!-- Serviceutils -->
+        <profile>
+            <id>serviceutils</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.serviceutils</groupId>
+                    <artifactId>odl-serviceutils-srm</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.serviceutils</groupId>
+                    <artifactId>odl-serviceutils-tools</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 </project>