Use opendaylight-karaf-empty from odlparent

Change-Id: Ife119cda21db958a0038d35deeeaa8c055b268bc
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index b4b260c8871a135fe1af8ad541bc7a3711688495..ade6cd2275dacafa8ba34979030b2cdf00108383 100644 (file)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -47,6 +47,10 @@
                     <groupId>org.opendaylight.controller</groupId>
                     <artifactId>opendaylight-karaf-empty</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.opendaylight.odlparent</groupId>
+                    <artifactId>opendaylight-karaf-empty</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!-- integration test feature -->
@@ -62,6 +66,10 @@
                     <groupId>org.opendaylight.controller</groupId>
                     <artifactId>opendaylight-karaf-empty</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.opendaylight.odlparent</groupId>
+                    <artifactId>opendaylight-karaf-empty</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>

diff --git a/features-distribution/pom.xml b/features-distribution/pom.xml
index d52c97b4d30b8d3c7e04f6f76407b620d036a94f..e8a8f57ba6c140a9e14f8d84866873b0aa0183c4 100644 (file)
--- a/features-distribution/pom.xml
+++ b/features-distribution/pom.xml
@@ -71,7 +71,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>${feature.odlparent.version}</version>
             <type>zip</type>
@@ -142,7 +142,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <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>${feature.odlparent.version}</karaf.distro.version>
                     </systemPropertyVariables>

diff --git a/features-index/pom.xml b/features-index/pom.xml
index a88a94e437e096c33e93fd60eb7d2e498b97e741..c74b722e33b6e7b3e6f9d39c722ca498a489ebb8 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -529,7 +529,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>${feature.odlparent.version}</version>
             <type>zip</type>
@@ -600,7 +600,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <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>${feature.odlparent.version}</karaf.distro.version>
                     </systemPropertyVariables>

diff --git a/features-test/pom.xml b/features-test/pom.xml
index 38712f81f0d913f1b7355b975b8f39d5abd436d4..11e2adbcc496d06919705bab7215effef89b4090 100644 (file)
--- a/features-test/pom.xml
+++ b/features-test/pom.xml
@@ -58,7 +58,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>${feature.odlparent.version}</version>
             <type>zip</type>
@@ -129,7 +129,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <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>${feature.odlparent.version}</karaf.distro.version>
                     </systemPropertyVariables>