Add serviceutils to distribution

Adding it back with activeByDefault as false.

Change-Id: Ic2c050babdc6e725cc2e8641d92c3e34d2e16e42
Signed-off-by: Faseela K <faseela.k@ericsson.com>

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 4eeebcd61261c708d8b8271a6037f3332ddbfb9c..009eb8101573bac146e0c69d99b70f22254653f6 100644 (file)
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -265,5 +265,22 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
+        <profile>
+            <id>serviceutils</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.serviceutils</groupId>
+                        <artifactId>serviceutils-artifacts</artifactId>
+                        <version>${serviceutils.version}</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
     </profiles>
 </project>

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index c78886503ae00181dc933593ee68a917ee79ffd8..6f0b0c568ee1a38e2243be35fc0797c4c26bdce4 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -61,6 +61,7 @@
         <openflowplugin.version>0.7.0-SNAPSHOT</openflowplugin.version>
         <ovsdb.version>1.7.0-SNAPSHOT</ovsdb.version>
         <restconf.version>1.8.0-SNAPSHOT</restconf.version>
+        <serviceutils.version>0.2.0-SNAPSHOT</serviceutils.version>
         <sfc.version>0.8.0-SNAPSHOT</sfc.version>
         <!-- Keep this list sorted alphabetically please. -->
     </properties>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index af0be9ccd925398450fbee7d4f293ca8e89176ba..b0aa55982608aa4e5af7a6c42089f92bd5f59bcd 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -361,6 +361,21 @@
                 </dependency>
             </dependencies>
         </profile>
+        <!-- Serviceutils -->
+        <profile>
+            <id>serviceutils</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.serviceutils</groupId>
+                    <artifactId>serviceutils-features</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- SFC -->
         <profile>
             <id>sfc</id>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index c3d16ca8d8fe157a570611b51daaca40e902dc03..a54eef34d839e074858a5733e30a659a14e931ce 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -188,5 +188,26 @@
                 </dependency>
             </dependencies>
         </profile>
+        <!-- Serviceutils -->
+        <profile>
+            <id>serviceutils</id>
+            <activation>
+                <activeByDefault>false</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>