Workaround for busted controller opendaylight-karaf-empty

Somehow the controller opendaylight-karaf-empty is busted with all the recent karaf 3.0.3 migration. Luckily we will a local distribution that doesn't seem to have the same issues.

Change-Id: I8f90981ba684dd68c17cadf6513ef4046a5b9cfb
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/southbound/southbound-it/pom.xml b/southbound/southbound-it/pom.xml
index a72a50c5ce82664ce57d319b7f59b40b0598f8d7..61e41740270472de217aa36dcbba7a9d02d194a3 100644 (file)
--- a/southbound/southbound-it/pom.xml
+++ b/southbound/southbound-it/pom.xml
@@ -110,9 +110,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.karaf.tooling</groupId>
-      <artifactId>karaf-maven-plugin</artifactId>
-      <version>${karaf.version}</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>

diff --git a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
index ce4812929ed9404504e7b3420e9778b7a95f351f..fb50e47147337a972ab5c356884eb328b4efdf4b 100644 (file)
--- a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
+++ b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
@@ -9,7 +9,7 @@ package org.opendaylight.ovsdb.southbound.it;
 
 import static org.ops4j.pax.exam.CoreOptions.maven;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
+//import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
 
@@ -73,10 +73,15 @@ public abstract class AbstractConfigTestBase {
     }
 
     public MavenArtifactUrlReference getKarafDistro() {
-        MavenArtifactUrlReference karafUrl = maven()
+        /*MavenArtifactUrlReference karafUrl = maven()
                 .groupId("org.opendaylight.controller")
                 .artifactId("opendaylight-karaf-empty")
                 .version("1.5.0-SNAPSHOT")
+                .type("zip");*/
+        MavenArtifactUrlReference karafUrl = maven()
+                .groupId("org.opendaylight.ovsdb")
+                .artifactId("southbound-karaf")
+                .version("1.1.0-SNAPSHOT")
                 .type("zip");
         return karafUrl;
     }
@@ -90,7 +95,7 @@ public abstract class AbstractConfigTestBase {
                         .unpackDirectory(new File("target/exam"))
                         .useDeployFolder(false),
                 keepRuntimeFolder(),
-                features(getFeatureRepo() , getFeatureName())
+                //features(getFeatureRepo() , getFeatureName())
         };
         options = ObjectArrays.concat(options, getFeaturesOptions(), Option.class);
         options = ObjectArrays.concat(options, getLoggingOptions(), Option.class);