From 787e73665b11cd1040a1fb078c7a08d8edfa246b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 16 Jan 2014 16:51:42 +0100 Subject: [PATCH] Switch to using yangtools version of mockito-configuration This commit switches to use the artifact from yangtools repository introduced in https://git.opendaylight.org/gerrit/#/c/4316/, completing purge of bgpcep dependencies. Change-Id: I000ddbb237a8a6c6cf9e9a44baa9a6dd93badc0f Signed-off-by: Robert Varga --- opendaylight/commons/opendaylight/pom.xml | 11 +++++++++++ opendaylight/config/config-manager/pom.xml | 3 +-- .../config/config-persister-directory-adapter/pom.xml | 3 +-- .../pom.xml | 3 +-- .../config-persister-directory-xml-adapter/pom.xml | 3 +-- .../config/config-persister-file-adapter/pom.xml | 3 +-- .../config/config-persister-file-xml-adapter/pom.xml | 3 +-- opendaylight/config/logback-config/pom.xml | 3 +-- .../config/netty-event-executor-config/pom.xml | 3 +-- opendaylight/config/netty-threadgroup-config/pom.xml | 3 +-- opendaylight/config/netty-timer-config/pom.xml | 3 +-- opendaylight/config/pom.xml | 5 ----- opendaylight/config/shutdown-impl/pom.xml | 3 +-- opendaylight/config/threadpool-config-impl/pom.xml | 3 +-- opendaylight/config/yang-jmx-generator-it/pom.xml | 3 +-- opendaylight/config/yang-jmx-generator-plugin/pom.xml | 3 +-- opendaylight/config/yang-jmx-generator/pom.xml | 3 +-- opendaylight/config/yang-store-impl/pom.xml | 3 +-- opendaylight/config/yang-test/pom.xml | 3 +-- opendaylight/netconf/config-netconf-connector/pom.xml | 4 +--- opendaylight/netconf/config-persister-impl/pom.xml | 4 +--- opendaylight/netconf/netconf-impl/pom.xml | 4 +--- opendaylight/netconf/netconf-it/pom.xml | 3 +-- opendaylight/netconf/netconf-monitoring/pom.xml | 6 ++---- 24 files changed, 34 insertions(+), 54 deletions(-) diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 24b1ed9cbc..67da0228fe 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -656,6 +656,17 @@ ganymed 1.0-SNAPSHOT + + com.google.code.findbugs + jsr305 + 2.0.1 + + + org.opendaylight.yangtools + mockito-configuration + 0.6.0-SNAPSHOT + test + org.opendaylight.yangtools.model diff --git a/opendaylight/config/config-manager/pom.xml b/opendaylight/config/config-manager/pom.xml index 32f14daaed..7f3b88c069 100644 --- a/opendaylight/config/config-manager/pom.xml +++ b/opendaylight/config/config-manager/pom.xml @@ -44,9 +44,8 @@ - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test ${project.groupId} diff --git a/opendaylight/config/config-persister-directory-adapter/pom.xml b/opendaylight/config/config-persister-directory-adapter/pom.xml index c67a08c7af..04c0b95294 100644 --- a/opendaylight/config/config-persister-directory-adapter/pom.xml +++ b/opendaylight/config/config-persister-directory-adapter/pom.xml @@ -38,9 +38,8 @@ - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test ${project.groupId} diff --git a/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml b/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml index 0ec7726e3a..aaf60dd2c8 100644 --- a/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml +++ b/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml @@ -49,9 +49,8 @@ - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test diff --git a/opendaylight/config/config-persister-directory-xml-adapter/pom.xml b/opendaylight/config/config-persister-directory-xml-adapter/pom.xml index 96d3a71c30..5ebb6154be 100644 --- a/opendaylight/config/config-persister-directory-xml-adapter/pom.xml +++ b/opendaylight/config/config-persister-directory-xml-adapter/pom.xml @@ -53,9 +53,8 @@ - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test ${project.groupId} diff --git a/opendaylight/config/config-persister-file-adapter/pom.xml b/opendaylight/config/config-persister-file-adapter/pom.xml index 3cd3e907b3..e892829ee0 100644 --- a/opendaylight/config/config-persister-file-adapter/pom.xml +++ b/opendaylight/config/config-persister-file-adapter/pom.xml @@ -34,9 +34,8 @@ - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test ${project.groupId} diff --git a/opendaylight/config/config-persister-file-xml-adapter/pom.xml b/opendaylight/config/config-persister-file-xml-adapter/pom.xml index d08a93e114..29c21069a3 100644 --- a/opendaylight/config/config-persister-file-xml-adapter/pom.xml +++ b/opendaylight/config/config-persister-file-xml-adapter/pom.xml @@ -43,9 +43,8 @@ - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test ${project.groupId} diff --git a/opendaylight/config/logback-config/pom.xml b/opendaylight/config/logback-config/pom.xml index 7d01d288ed..c9a94c13ae 100644 --- a/opendaylight/config/logback-config/pom.xml +++ b/opendaylight/config/logback-config/pom.xml @@ -63,9 +63,8 @@ test - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test org.apache.commons diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml index 2fce3596d4..30562a4570 100644 --- a/opendaylight/config/netty-event-executor-config/pom.xml +++ b/opendaylight/config/netty-event-executor-config/pom.xml @@ -55,9 +55,8 @@ test - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml index d35067af09..06677ff670 100644 --- a/opendaylight/config/netty-threadgroup-config/pom.xml +++ b/opendaylight/config/netty-threadgroup-config/pom.xml @@ -57,9 +57,8 @@ test - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml index 161d39278a..ceb3cd9cc6 100644 --- a/opendaylight/config/netty-timer-config/pom.xml +++ b/opendaylight/config/netty-timer-config/pom.xml @@ -60,9 +60,8 @@ test - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test org.opendaylight.controller diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index acd4916a4b..4a9d37623c 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -165,11 +165,6 @@ ${config.version} test-jar - - org.opendaylight.bgpcep - mockito-configuration - ${bgpcep.version} - org.opendaylight.yangtools binding-generator-spi diff --git a/opendaylight/config/shutdown-impl/pom.xml b/opendaylight/config/shutdown-impl/pom.xml index 4fcb0c89f0..10e21e558e 100644 --- a/opendaylight/config/shutdown-impl/pom.xml +++ b/opendaylight/config/shutdown-impl/pom.xml @@ -42,9 +42,8 @@ test - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test diff --git a/opendaylight/config/threadpool-config-impl/pom.xml b/opendaylight/config/threadpool-config-impl/pom.xml index 53b8b2b53c..cb29796f73 100644 --- a/opendaylight/config/threadpool-config-impl/pom.xml +++ b/opendaylight/config/threadpool-config-impl/pom.xml @@ -53,9 +53,8 @@ test - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test diff --git a/opendaylight/config/yang-jmx-generator-it/pom.xml b/opendaylight/config/yang-jmx-generator-it/pom.xml index bcec65f2e7..ce4700ce20 100644 --- a/opendaylight/config/yang-jmx-generator-it/pom.xml +++ b/opendaylight/config/yang-jmx-generator-it/pom.xml @@ -40,9 +40,8 @@ test - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test diff --git a/opendaylight/config/yang-jmx-generator-plugin/pom.xml b/opendaylight/config/yang-jmx-generator-plugin/pom.xml index f06c7bdad8..21e728c41f 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/pom.xml +++ b/opendaylight/config/yang-jmx-generator-plugin/pom.xml @@ -103,9 +103,8 @@ - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test diff --git a/opendaylight/config/yang-jmx-generator/pom.xml b/opendaylight/config/yang-jmx-generator/pom.xml index c66b112566..b5069a1661 100644 --- a/opendaylight/config/yang-jmx-generator/pom.xml +++ b/opendaylight/config/yang-jmx-generator/pom.xml @@ -33,9 +33,8 @@ - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test org.opendaylight.yangtools diff --git a/opendaylight/config/yang-store-impl/pom.xml b/opendaylight/config/yang-store-impl/pom.xml index 3b0d58a32f..b0b88e6e59 100644 --- a/opendaylight/config/yang-store-impl/pom.xml +++ b/opendaylight/config/yang-store-impl/pom.xml @@ -41,9 +41,8 @@ guava - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test com.google.code.findbugs diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml index b1f7013abe..235e466089 100644 --- a/opendaylight/config/yang-test/pom.xml +++ b/opendaylight/config/yang-test/pom.xml @@ -34,9 +34,8 @@ ietf-inet-types - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test ${project.groupId} diff --git a/opendaylight/netconf/config-netconf-connector/pom.xml b/opendaylight/netconf/config-netconf-connector/pom.xml index 888f13c8fe..023856464f 100644 --- a/opendaylight/netconf/config-netconf-connector/pom.xml +++ b/opendaylight/netconf/config-netconf-connector/pom.xml @@ -88,10 +88,8 @@ test - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - ${bgpcep.version} - test org.opendaylight.controller diff --git a/opendaylight/netconf/config-persister-impl/pom.xml b/opendaylight/netconf/config-persister-impl/pom.xml index 20bd386063..30215318d9 100644 --- a/opendaylight/netconf/config-persister-impl/pom.xml +++ b/opendaylight/netconf/config-persister-impl/pom.xml @@ -50,10 +50,8 @@ - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - ${bgpcep.version} - test commons-io diff --git a/opendaylight/netconf/netconf-impl/pom.xml b/opendaylight/netconf/netconf-impl/pom.xml index b056f9be87..27db4729ae 100644 --- a/opendaylight/netconf/netconf-impl/pom.xml +++ b/opendaylight/netconf/netconf-impl/pom.xml @@ -70,10 +70,8 @@ - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - ${bgpcep.version} - test commons-io diff --git a/opendaylight/netconf/netconf-it/pom.xml b/opendaylight/netconf/netconf-it/pom.xml index 31248137e8..504c5220c6 100644 --- a/opendaylight/netconf/netconf-it/pom.xml +++ b/opendaylight/netconf/netconf-it/pom.xml @@ -123,9 +123,8 @@ slf4j-api - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - test org.opendaylight.controller diff --git a/opendaylight/netconf/netconf-monitoring/pom.xml b/opendaylight/netconf/netconf-monitoring/pom.xml index 8e1e599c71..fa0aae5236 100644 --- a/opendaylight/netconf/netconf-monitoring/pom.xml +++ b/opendaylight/netconf/netconf-monitoring/pom.xml @@ -42,10 +42,8 @@ - org.opendaylight.bgpcep + org.opendaylight.yangtools mockito-configuration - ${bgpcep.version} - test @@ -93,4 +91,4 @@ - \ No newline at end of file + -- 2.36.6