Change distribution name to controller-test-karaf

Shorted the name of the distribution and use a directory which
is a wee bit more friendly. Also do not package mdsal's feature
repository, only features from controller.

Change-Id: I90d413ce20e6de25138a6096d0951eafa26d0b6f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index ab8abcf466372be6b1f84261cceec8665bb02a61..64e5a917eb1c3c928c4d7010ee700a003450fae5 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -16,7 +16,7 @@
   </parent>
 
   <groupId>org.opendaylight.controller</groupId>
-  <artifactId>distribution.opendaylight-karaf</artifactId>
+  <artifactId>controller-test-karaf</artifactId>
   <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
@@ -24,7 +24,7 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-parent</artifactId>
+        <artifactId>controller-artifacts</artifactId>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
@@ -48,21 +48,21 @@
     -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-controller-experimental</artifactId>
+      <artifactId>features-controller</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-controller</artifactId>
+      <artifactId>features-controller-experimental</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>features-mdsal</artifactId>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-controller-testing</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>