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 <rovarga@cisco.com>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 24b1ed9cbcb0e6b32132d3433c55de5012345592..67da0228fe3ede4c317ae558ae5e7bdf1f2cb885 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -656,6 +656,17 @@
         <artifactId>ganymed</artifactId>
         <version>1.0-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>2.0.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>mockito-configuration</artifactId>
+        <version>0.6.0-SNAPSHOT</version>
+        <scope>test</scope>
+      </dependency>
       <!-- yang model dependencies -->
       <dependency>
        <groupId>org.opendaylight.yangtools.model</groupId>

diff --git a/opendaylight/config/config-manager/pom.xml b/opendaylight/config/config-manager/pom.xml
index 32f14daaede35d534d758958767bcd47e05f8bc8..7f3b88c0692f318ab6c681f00884c6c60b381e67 100644 (file)
--- a/opendaylight/config/config-manager/pom.xml
+++ b/opendaylight/config/config-manager/pom.xml
@@ -44,9 +44,8 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/opendaylight/config/config-persister-directory-adapter/pom.xml b/opendaylight/config/config-persister-directory-adapter/pom.xml
index c67a08c7af86ac341086f59e7b16eeaf0495c915..04c0b952949f047fcdc96f280333392cb1e9af77 100644 (file)
--- a/opendaylight/config/config-persister-directory-adapter/pom.xml
+++ b/opendaylight/config/config-persister-directory-adapter/pom.xml
@@ -38,9 +38,8 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml b/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml
index 0ec7726e3a03167856d742a45d3f812b106fa6f3..aaf60dd2c8e5d17494ccdd9c9aa93ac183d189a7 100644 (file)
--- a/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml
+++ b/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml
@@ -49,9 +49,8 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
 
     </dependencies>

diff --git a/opendaylight/config/config-persister-directory-xml-adapter/pom.xml b/opendaylight/config/config-persister-directory-xml-adapter/pom.xml
index 96d3a71c30bc3903ede0e872e11885b0f82587eb..5ebb6154be75a775f332ac39d18f95391bead36d 100644 (file)
--- a/opendaylight/config/config-persister-directory-xml-adapter/pom.xml
+++ b/opendaylight/config/config-persister-directory-xml-adapter/pom.xml
@@ -53,9 +53,8 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/opendaylight/config/config-persister-file-adapter/pom.xml b/opendaylight/config/config-persister-file-adapter/pom.xml
index 3cd3e907b3a63682e5bcb0f87df23df038e96a11..e892829ee09899693026342ced01c096770d990f 100644 (file)
--- a/opendaylight/config/config-persister-file-adapter/pom.xml
+++ b/opendaylight/config/config-persister-file-adapter/pom.xml
@@ -34,9 +34,8 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/opendaylight/config/config-persister-file-xml-adapter/pom.xml b/opendaylight/config/config-persister-file-xml-adapter/pom.xml
index d08a93e1148b4c00c2f1e794a62aa5846ceb0669..29c21069a3696621cfe3bc3e499a2b5f47178e17 100644 (file)
--- a/opendaylight/config/config-persister-file-xml-adapter/pom.xml
+++ b/opendaylight/config/config-persister-file-xml-adapter/pom.xml
@@ -43,9 +43,8 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/opendaylight/config/logback-config/pom.xml b/opendaylight/config/logback-config/pom.xml
index 7d01d288ed6a58b6bd1f18b31320a4ff0046ed74..c9a94c13aed9aea593d8658e66a45d039ca08931 100644 (file)
--- a/opendaylight/config/logback-config/pom.xml
+++ b/opendaylight/config/logback-config/pom.xml
@@ -63,9 +63,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
           <groupId>org.apache.commons</groupId>

diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml
index 2fce3596d4ad6d082b94d2a04c7f6960339da23c..30562a4570229250044b044c683f2f53163e1e45 100644 (file)
--- a/opendaylight/config/netty-event-executor-config/pom.xml
+++ b/opendaylight/config/netty-event-executor-config/pom.xml
@@ -55,9 +55,8 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.opendaylight.bgpcep</groupId>
+         <groupId>org.opendaylight.yangtools</groupId>
          <artifactId>mockito-configuration</artifactId>
-         <scope>test</scope>
       </dependency>
 
    </dependencies>

diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml
index d35067af093fcba04d22ef13c831bc63e4cb300d..06677ff670d97b3d93f8f4d11ed3985ce159cb40 100644 (file)
--- a/opendaylight/config/netty-threadgroup-config/pom.xml
+++ b/opendaylight/config/netty-threadgroup-config/pom.xml
@@ -57,9 +57,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
 
     </dependencies>

diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml
index 161d39278aef9e1a112b3227499fd8b5d431424a..ceb3cd9cc649c4418d71e1cffdd10c4953820819 100644 (file)
--- a/opendaylight/config/netty-timer-config/pom.xml
+++ b/opendaylight/config/netty-timer-config/pom.xml
@@ -60,9 +60,8 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.opendaylight.bgpcep</groupId>
+         <groupId>org.opendaylight.yangtools</groupId>
          <artifactId>mockito-configuration</artifactId>
-         <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index acd4916a4b8e8fb9f0905ceb59c6cb1ce5cf75fa..4a9d37623c5785fcf15f840030f492aac717be7b 100644 (file)
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -165,11 +165,6 @@
                 <version>${config.version}</version>
                 <type>test-jar</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>mockito-configuration</artifactId>
-                <version>${bgpcep.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-spi</artifactId>

diff --git a/opendaylight/config/shutdown-impl/pom.xml b/opendaylight/config/shutdown-impl/pom.xml
index 4fcb0c89f046e09a1db9bc645ad536ad6d0a3b05..10e21e558e8687beeb93d5f76877f200f5cdd83c 100644 (file)
--- a/opendaylight/config/shutdown-impl/pom.xml
+++ b/opendaylight/config/shutdown-impl/pom.xml
@@ -42,9 +42,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 

diff --git a/opendaylight/config/threadpool-config-impl/pom.xml b/opendaylight/config/threadpool-config-impl/pom.xml
index 53b8b2b53ceab9ea205d964b3416249a31c9777b..cb29796f73733e79d36d9da6e47099b167bcb72f 100644 (file)
--- a/opendaylight/config/threadpool-config-impl/pom.xml
+++ b/opendaylight/config/threadpool-config-impl/pom.xml
@@ -53,9 +53,8 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.opendaylight.bgpcep</groupId>
+         <groupId>org.opendaylight.yangtools</groupId>
          <artifactId>mockito-configuration</artifactId>
-         <scope>test</scope>
       </dependency>
    </dependencies>
 

diff --git a/opendaylight/config/yang-jmx-generator-it/pom.xml b/opendaylight/config/yang-jmx-generator-it/pom.xml
index bcec65f2e7db58d613dccedf500afb02d818adfb..ce4700ce204304d2dd6c73ebabb4dfbac7c23d25 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-it/pom.xml
+++ b/opendaylight/config/yang-jmx-generator-it/pom.xml
@@ -40,9 +40,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 

diff --git a/opendaylight/config/yang-jmx-generator-plugin/pom.xml b/opendaylight/config/yang-jmx-generator-plugin/pom.xml
index f06c7bdad8a65a31345e4c615284cfc8fc564490..21e728c41f4fbd4f16eb7af3b5145fecfa2d9c5e 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-plugin/pom.xml
+++ b/opendaylight/config/yang-jmx-generator-plugin/pom.xml
@@ -103,9 +103,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
 
         <dependency>

diff --git a/opendaylight/config/yang-jmx-generator/pom.xml b/opendaylight/config/yang-jmx-generator/pom.xml
index c66b11256601125e4ef84980756780fc9bc20376..b5069a1661bfa801a00349a194ba30a5fecb19a4 100644 (file)
--- a/opendaylight/config/yang-jmx-generator/pom.xml
+++ b/opendaylight/config/yang-jmx-generator/pom.xml
@@ -33,9 +33,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/opendaylight/config/yang-store-impl/pom.xml b/opendaylight/config/yang-store-impl/pom.xml
index 3b0d58a32f28cb329b35e4ea33816d7624076082..b0b88e6e590ff266bef47b3009c5cbed0078d59b 100644 (file)
--- a/opendaylight/config/yang-store-impl/pom.xml
+++ b/opendaylight/config/yang-store-impl/pom.xml
@@ -41,9 +41,8 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>

diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml
index b1f7013abef241620ff02d393751133270e78bcb..235e466089b14a8a194b2f15067487721dd4e982 100644 (file)
--- a/opendaylight/config/yang-test/pom.xml
+++ b/opendaylight/config/yang-test/pom.xml
@@ -34,9 +34,8 @@
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/opendaylight/netconf/config-netconf-connector/pom.xml b/opendaylight/netconf/config-netconf-connector/pom.xml
index 888f13c8fee1750bdd402b5e104a5798ea5730b1..023856464f5c18b7074234d8d46bac04063f832c 100644 (file)
--- a/opendaylight/netconf/config-netconf-connector/pom.xml
+++ b/opendaylight/netconf/config-netconf-connector/pom.xml
@@ -88,10 +88,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <version>${bgpcep.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/netconf/config-persister-impl/pom.xml b/opendaylight/netconf/config-persister-impl/pom.xml
index 20bd386063419523d439dcb46102851208b6a7db..30215318d9d4a301b172c06b9ab4f584b5f8f83c 100644 (file)
--- a/opendaylight/netconf/config-persister-impl/pom.xml
+++ b/opendaylight/netconf/config-persister-impl/pom.xml
@@ -50,10 +50,8 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <version>${bgpcep.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

diff --git a/opendaylight/netconf/netconf-impl/pom.xml b/opendaylight/netconf/netconf-impl/pom.xml
index b056f9be873feff65d2b731d66b6ef8fe0d8c4cd..27db4729aebb53b6608c7ebc3e8c42dd81212f3d 100644 (file)
--- a/opendaylight/netconf/netconf-impl/pom.xml
+++ b/opendaylight/netconf/netconf-impl/pom.xml
@@ -70,10 +70,8 @@
         </dependency>
         <!-- test dependencies -->
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <version>${bgpcep.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

diff --git a/opendaylight/netconf/netconf-it/pom.xml b/opendaylight/netconf/netconf-it/pom.xml
index 31248137e8fef8f741d9473b71322b777b00f3e5..504c5220c6929504abba2503e5c5f2f95edacc31 100644 (file)
--- a/opendaylight/netconf/netconf-it/pom.xml
+++ b/opendaylight/netconf/netconf-it/pom.xml
@@ -123,9 +123,8 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/netconf/netconf-monitoring/pom.xml b/opendaylight/netconf/netconf-monitoring/pom.xml
index 8e1e599c719a6794d17b91b2792efbf27f85e458..fa0aae52362347870a7d9cc9b4d28692f3b6391b 100644 (file)
--- a/opendaylight/netconf/netconf-monitoring/pom.xml
+++ b/opendaylight/netconf/netconf-monitoring/pom.xml
@@ -42,10 +42,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <version>${bgpcep.version}</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 
@@ -93,4 +91,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>