Merge "Depend on opendaylight-karaf-empty from odlparent"

diff --git a/dblib/features/pom.xml b/dblib/features/pom.xml
index 00b3c2a..995a1c5 100755 (executable)
--- a/dblib/features/pom.xml
+++ b/dblib/features/pom.xml
@@ -45,7 +45,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>
@@ -101,7 +101,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 (executable)
--- 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 41cf463..84dbc43 100755 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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>