Revert "Add serviceutils to distribution"

This reverts commit 0a940653b5311dab6d73832bdd7c9edfbb4c755e.

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

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 4e6b20e68886f8eae0911b4f047206d87c75f842..4eeebcd61261c708d8b8271a6037f3332ddbfb9c 100644 (file)
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -265,22 +265,5 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
-        <profile>
-            <id>serviceutils</id>
-            <activation>
-                <activeByDefault>true</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 6f0b0c568ee1a38e2243be35fc0797c4c26bdce4..c78886503ae00181dc933593ee68a917ee79ffd8 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -61,7 +61,6 @@
         <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 775e56f0a8f67af639cb8c3149f75dff32912060..af0be9ccd925398450fbee7d4f293ca8e89176ba 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -361,21 +361,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- Serviceutils -->
-        <profile>
-            <id>serviceutils</id>
-            <activation>
-                <activeByDefault>true</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 071afb66a3dfd4a4eb6b62fb940176adf6815b3b..c3d16ca8d8fe157a570611b51daaca40e902dc03 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -188,20 +188,5 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- Serviceutils -->
-        <profile>
-            <id>serviceutils</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.serviceutils</groupId>
-                    <artifactId>odl-serviceutils-rest</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
     </profiles>
 </project>