From: Tom Pantelis <tpanteli@brocade.com>
Date: Tue, 29 Mar 2016 13:34:52 +0000 (-0400)
Subject: Modify AbstractConfigTestBase to use opendaylight-karaf-empty
X-Git-Tag: release/boron~258
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=551c83f4a87638dfef2fa68ec0bd6af3cf89e4b7

Modify AbstractConfigTestBase to use opendaylight-karaf-empty

The vanilla karaf distro that AbstractConfigTestBase installs only has the
base features. We need the standard features which includes eventadmin
which is needed for the upcomng blueprint work. So I changed
AbstractConfigTestBase to install opendaylight-karaf-empty which now
includes the standard features as well as the updated Aries proxy-impl
1.0.5 artifact.

Change-Id: I46100cc8edb9743e0885b156a1adc37e3a18ca9e
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
---

diff --git a/opendaylight/config/config-it-base/pom.xml b/opendaylight/config/config-it-base/pom.xml
index 6c34e9137c..3848188d3d 100644
--- a/opendaylight/config/config-it-base/pom.xml
+++ b/opendaylight/config/config-it-base/pom.xml
@@ -17,6 +17,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
   <artifactId>config-it-base</artifactId>
   <packaging>bundle</packaging>
+
+  <properties>
+    <opendaylight.karaf.version>1.7.0-SNAPSHOT</opendaylight.karaf.version>
+  </properties>
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -33,6 +38,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-util</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>opendaylight-karaf-empty</artifactId>
+      <version>${opendaylight.karaf.version}</version>
+      <type>zip</type>
+    </dependency>
+
     <!-- Dependencies for pax exam karaf container -->
     <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
diff --git a/opendaylight/config/config-it-base/src/main/java/org/opendaylight/controller/config/it/base/AbstractConfigTestBase.java b/opendaylight/config/config-it-base/src/main/java/org/opendaylight/controller/config/it/base/AbstractConfigTestBase.java
index ce38de2d3a..05bcfbc043 100644
--- a/opendaylight/config/config-it-base/src/main/java/org/opendaylight/controller/config/it/base/AbstractConfigTestBase.java
+++ b/opendaylight/config/config-it-base/src/main/java/org/opendaylight/controller/config/it/base/AbstractConfigTestBase.java
@@ -56,8 +56,8 @@ public abstract class AbstractConfigTestBase {
      * Default values for karaf distro type, groupId, and artifactId
      */
     private static final String KARAF_DISTRO_TYPE = "zip";
-    private static final String KARAF_DISTRO_ARTIFACTID = "apache-karaf";
-    private static final String KARAF_DISTRO_GROUPID = "org.apache.karaf";
+    private static final String KARAF_DISTRO_ARTIFACTID = "opendaylight-karaf-empty";
+    private static final String KARAF_DISTRO_GROUPID = "org.opendaylight.controller";
 
     /*
      * Property names to override defaults for karaf distro artifactId, groupId, version, and type
diff --git a/opendaylight/config/config-it-base/src/main/resources/abstractconfigtestbase.properties b/opendaylight/config/config-it-base/src/main/resources/abstractconfigtestbase.properties
index 4d4867bf22..e5cee97046 100644
--- a/opendaylight/config/config-it-base/src/main/resources/abstractconfigtestbase.properties
+++ b/opendaylight/config/config-it-base/src/main/resources/abstractconfigtestbase.properties
@@ -1 +1 @@
-karaf.distro.version=${karaf.version}
+karaf.distro.version=${opendaylight.karaf.version}