BUG-8923: use karaf-empty for SFT

Since we are excluding bouncy castle from generated features (and
we want to assume it is installed), we cannot run SFT against
vanilla karaf. This patch adjusts features-test to pull in our
pre-build opendaylight-karaf-empty instead of vanilla upstream.

Change-Id: Ic45ff713e90c0be7c232e0a1cee36b27c83efe95
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 70f33da04cfdd2e9ddea9a322da5e0b9f6610106)

diff --git a/features-test/pom.xml b/features-test/pom.xml
index c825d9ee90eaa8ecc13d2471bc09abb29b89e4a4..d9430593bbcd31ded468357d40ab37addbb541fc 100644 (file)
--- a/features-test/pom.xml
+++ b/features-test/pom.xml
@@ -89,9 +89,8 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>apache-karaf</artifactId>
-            <version>${karaf.version}</version>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>opendaylight-karaf-empty</artifactId>
             <type>zip</type>
         </dependency>
         <!-- BEWARE of adding additional dependencies here...

diff --git a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
index 651d596c073c33cca5d15e8f43980d1243b95a2d..b902c4ded168af30b944c30c0d1e4ee3a365823a 100644 (file)
--- a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
+++ b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
@@ -83,8 +83,8 @@ public class SingleFeatureTest {
      * 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.odlparent";
 
     /*
      * Property names to override defaults for karaf distro artifactId, groupId, version, and type

diff --git a/features-test/src/main/resources/singlefeaturetest.properties b/features-test/src/main/resources/singlefeaturetest.properties
index 4d4867bf22dce391f4b03ef5799d18251eb1a62d..e21655798d9a088f1c85e20cb9238e3c622dcd08 100644 (file)
--- a/features-test/src/main/resources/singlefeaturetest.properties
+++ b/features-test/src/main/resources/singlefeaturetest.properties
@@ -1 +1 @@
-karaf.distro.version=${karaf.version}
+karaf.distro.version=${project.version}

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index 914158498e94c96f1d0161c05275c5e12bb469f1..2e360d66ceb8547666c509561288344b5c5b4e21 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -30,6 +30,13 @@
                 <version>${project.version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>opendaylight-karaf-empty</artifactId>
+                <version>${project.version}</version>
+                <scope>provided</scope>
+                <type>zip</type>
+            </dependency>
 
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>