Make container fail when bundles are unresolved

Change-Id: Ieaa9ede215b744acd06e0e3cd97a79e654c86040
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 5c538d286dd9646810fba2b26afe83bbf43ea5d7..6252336a47c0cefad59e989326974d00a42db927 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -206,6 +206,12 @@
                 <artifactId>sal-binding-util</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>sal-broker-impl</artifactId>
+                <version>1.0-SNAPSHOT</version>
+                <scope>test</scope>
+            </dependency>
 
             <!-- Models -->
             <dependency>

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 6044e5af7f51026f89b4e6134b0e578e6d5aefd0..de5d6743fba8acd3ddfb3ca589b39eb6b5807f78 100644 (file)
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -37,7 +37,6 @@
     <properties>
         <exam.version>3.3.0</exam.version>
         <url.version>1.6.0</url.version>
-        <felix.version>4.2.1</felix.version>
         <antlr.version>4.0</antlr.version>
         <yang-concepts.version>0.1.1-SNAPSHOT</yang-concepts.version>
         <xtend-lib-osgi.version>2.4.3</xtend-lib-osgi.version>
@@ -294,6 +293,11 @@
             <artifactId>sal-binding-util</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-broker-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>protocol-framework</artifactId>
@@ -356,6 +360,12 @@
             <version>3.8.1.v20120830-144521</version>
             <scope>test</scope>
         </dependency>
+        <!--dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
+            <version>4.2.1</version>
+            <scope>test</scope>
+        </dependency-->
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/AbstractBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/AbstractBundleTest.java
index 007b758bd29d735f1678e1c87ad50165aca1f58a..197b5b6459413cab2196c550abadb0398d2a049d 100644 (file)
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/AbstractBundleTest.java
+++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/AbstractBundleTest.java
@@ -11,6 +11,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -46,6 +47,7 @@ public abstract class AbstractBundleTest {
 
                ret.add(mavenBundle("com.google.guava", "guava").versionAsInProject());
                ret.add(mavenBundle("commons-codec", "commons-codec").versionAsInProject());
+               ret.add(mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject());
 
                ret.add(TestHelper.getNettyBundles());
                ret.add(TestHelper.getLoggingBundles());
@@ -53,6 +55,18 @@ public abstract class AbstractBundleTest {
                ret.add(mavenBundle("org.opendaylight.yangtools", "concepts").versionAsInProject());
                ret.add(mavenBundle("org.opendaylight.yangtools", "yang-binding").versionAsInProject());
                ret.add(mavenBundle("org.opendaylight.yangtools", "yang-common").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.yangtools", "yang-data-api").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.yangtools", "yang-data-impl").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.yangtools", "yang-model-api").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.yangtools", "yang-model-util").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.yangtools", "yang-parser-api").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.yangtools", "yang-parser-impl").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.yangtools", "binding-generator-api").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.yangtools", "binding-generator-spi").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.yangtools", "binding-generator-util").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.yangtools", "binding-generator-impl").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.yangtools", "binding-model-api").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.yangtools", "binding-type-provider").versionAsInProject());
                ret.add(mavenBundle("org.opendaylight.yangtools.model", "ietf-inet-types").versionAsInProject());
                ret.add(mavenBundle("org.opendaylight.yangtools.model", "ietf-topology").versionAsInProject());
 
@@ -60,11 +74,20 @@ public abstract class AbstractBundleTest {
                ret.add(mavenBundle("org.opendaylight.controller", "config-api").versionAsInProject());
                ret.add(mavenBundle("org.opendaylight.controller", "protocol-framework").versionAsInProject());
                ret.add(mavenBundle("org.opendaylight.controller", "sal-common-api").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.controller", "sal-core-api").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.controller", "sal-core-spi").versionAsInProject());
                ret.add(mavenBundle("org.opendaylight.controller", "sal-binding-api").versionAsInProject());
                ret.add(mavenBundle("org.opendaylight.controller", "sal-binding-broker-impl").versionAsInProject());
                ret.add(mavenBundle("org.opendaylight.controller", "sal-binding-config").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.controller", "sal-binding-util").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.controller", "sal-broker-impl").versionAsInProject());
                ret.add(mavenBundle("org.opendaylight.controller", "sal-common").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.controller", "sal-common-impl").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.controller", "sal-common-util").versionAsInProject());
                ret.add(mavenBundle("org.opendaylight.yangtools.thirdparty", "xtend-lib-osgi").versionAsInProject());
+               ret.add(mavenBundle("org.opendaylight.yangtools.thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject());
+
+               ret.add(systemProperty("pax.exam.osgi.unresolved.fail").value("true"));
 
                return ret;
        }