From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Mon, 15 May 2017 12:48:32 +0000 (-0400)
Subject: Depend on opendaylight-karaf-empty from odlparent
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=44775a0ec9732f2874c1b07fee15c393949b55b8;p=sdnc%2Fcore.git

Depend on opendaylight-karaf-empty from odlparent

As per as BUG 6278 in ODL: https://bugs.opendaylight.org/show_bug.cgi?id=6278
karaf-parent, and its child have been moved to odlparent.

Aligning downstream consumer to avoid breakage once the artifact
is removed from controller.

Change-Id: I2cbcb29141405d5e14ea5815ca95a88ed9824157
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---

diff --git a/dblib/features/pom.xml b/dblib/features/pom.xml
index f6a4b7a..b6793d8 100755
--- a/dblib/features/pom.xml
+++ b/dblib/features/pom.xml
@@ -40,7 +40,7 @@
 
 		<!-- dependency for opendaylight-karaf-empty for use by testing -->
 		<dependency>
-			<groupId>org.opendaylight.controller</groupId>
+			<groupId>org.opendaylight.odlparent</groupId>
 			<artifactId>opendaylight-karaf-empty</artifactId>
             <version>${odl.karaf.empty.distro.version}</version>
 			<type>zip</type>
@@ -96,7 +96,7 @@
 				<version>2.16</version>
 				<configuration>
 					<systemPropertyVariables>
-						<karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+						<karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
 						<karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
 						<karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version>
 					</systemPropertyVariables>
diff --git a/filters/features/pom.xml b/filters/features/pom.xml
index 74247a6..74cdc3b 100755
--- a/filters/features/pom.xml
+++ b/filters/features/pom.xml
@@ -64,7 +64,7 @@
 				<version>2.16</version>
 				<configuration>
 					<systemPropertyVariables>
-						<karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+						<karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
 						<karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
 						<karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version>
 					</systemPropertyVariables>
diff --git a/rootpom/pom.xml b/rootpom/pom.xml
index aab4161..4ace6f4 100755
--- a/rootpom/pom.xml
+++ b/rootpom/pom.xml
@@ -163,7 +163,7 @@
 		<dependencyManagement>
 			<dependencies>
 				<dependency>
-					<groupId>org.opendaylight.controller</groupId>
+					<groupId>org.opendaylight.odlparent</groupId>
 					<artifactId>opendaylight-karaf-empty</artifactId>
 					<version>${odl.karaf.empty.distro.version}</version>
 					<type>zip</type>
diff --git a/sli/features/pom.xml b/sli/features/pom.xml
index d796986..d308105 100755
--- a/sli/features/pom.xml
+++ b/sli/features/pom.xml
@@ -44,7 +44,7 @@
 
 		<!-- dependency for opendaylight-karaf-empty for use by testing
 		<dependency>
-			<groupId>org.opendaylight.controller</groupId>
+			<groupId>org.opendaylight.odlparent</groupId>
 			<artifactId>opendaylight-karaf-empty</artifactId>
 			<version>${odl.karaf.empty.version}</version>
 			<type>zip</type>
@@ -99,7 +99,7 @@
 				<version>2.16</version>
 				<configuration>
 					<systemPropertyVariables>
-						<karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+						<karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
 						<karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
 						<karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version>
 					</systemPropertyVariables>
diff --git a/sliPluginUtils/features/pom.xml b/sliPluginUtils/features/pom.xml
index 46a8b04..d1c9614 100755
--- a/sliPluginUtils/features/pom.xml
+++ b/sliPluginUtils/features/pom.xml
@@ -35,7 +35,7 @@
 		</dependency>
 		<!-- dependency for opendaylight-karaf-empty for use by testing -->
 		<dependency>
-			<groupId>org.opendaylight.controller</groupId>
+			<groupId>org.opendaylight.odlparent</groupId>
 			<artifactId>opendaylight-karaf-empty</artifactId>
 			<version>${odl.karaf.empty.distro.version}</version>
 			<type>zip</type>
@@ -89,7 +89,7 @@
 				<version>2.16</version>
 				<configuration>
 					<systemPropertyVariables>
-						<karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+						<karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
 						<karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
 						<karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version>
 					</systemPropertyVariables>
diff --git a/sliapi/features/pom.xml b/sliapi/features/pom.xml
index 9f2ed4f..4a572cb 100755
--- a/sliapi/features/pom.xml
+++ b/sliapi/features/pom.xml
@@ -40,7 +40,7 @@
 
 		<!-- dependency for opendaylight-karaf-empty for use by testing -->
 		<dependency>
-			<groupId>org.opendaylight.controller</groupId>
+			<groupId>org.opendaylight.odlparent</groupId>
 			<artifactId>opendaylight-karaf-empty</artifactId>
 			<type>zip</type>
 		</dependency>
@@ -96,7 +96,7 @@
 				<version>2.16</version>
 				<configuration>
 					<systemPropertyVariables>
-						<karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+						<karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
 						<karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
 						<karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version>
 					</systemPropertyVariables>