From: Tony Tkacik Date: Tue, 5 Aug 2014 15:18:02 +0000 (+0000) Subject: Merge "Fix failing IT tests" X-Git-Tag: release/helium~345 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=1bf9f8c060f6adf32f527f6efe82f78f774ffd8d;hp=5f80c9711c1c7990a179f8f9e137c7c97fa1f15c Merge "Fix failing IT tests" --- diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml index b8bb891e79..98515966d9 100644 --- a/opendaylight/md-sal/sal-binding-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-it/pom.xml @@ -39,6 +39,10 @@ org.mockito mockito-all + + org.opendaylight.yangtools + object-cache-guava + org.opendaylight.controller config-manager diff --git a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java index c389618f2e..83a69969b7 100644 --- a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java +++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java @@ -30,6 +30,8 @@ public class TestHelper { mavenBundle(YANGTOOLS, "util").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-binding").versionAsInProject(), // // mavenBundle(YANGTOOLS, "yang-common").versionAsInProject(), // // + mavenBundle(YANGTOOLS, "object-cache-api").versionAsInProject(), // // + mavenBundle(YANGTOOLS, "object-cache-guava").versionAsInProject(), // // mavenBundle(CONTROLLER, "sal-common").versionAsInProject(), // // mavenBundle(CONTROLLER, "sal-common-api").versionAsInProject(), // // mavenBundle(CONTROLLER, "sal-common-impl").versionAsInProject(), // //