From 0674a67e81d5e3ca8a33a6cb901e681d0f9411bc Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Mon, 23 Jan 2017 19:58:42 +0100 Subject: [PATCH] Replace mockito-all by mockito-core (see Bug 7662) The change req. to includeArtifactIds is kinda similar to https://github.com/vorburger/xtendbeans/commit/78aa690f1b67240d4b36064cf49de104a84de058#diff-56e3a9b90e7a05e37996cc31c4798ae0 Funky - this was the ONLY one of almost 40 changes made in bulk re. Bug 7662 which required additional manual analysis and intervention... ;-) Bug: 7662 Change-Id: Ibd14dd061024056392a020364647a70a87f2461d Signed-off-by: Michael Vorburger --- .../src/main/resources/archetype-resources/impl/pom.xml | 2 +- opendaylight/md-sal/cds-access-client/pom.xml | 2 +- opendaylight/md-sal/mdsal-it-parent/pom.xml | 2 +- opendaylight/md-sal/messagebus-impl/pom.xml | 2 +- opendaylight/md-sal/messagebus-util/pom.xml | 2 +- opendaylight/md-sal/sal-akka-raft/pom.xml | 2 +- opendaylight/md-sal/sal-binding-broker/pom.xml | 2 +- opendaylight/md-sal/sal-binding-it/pom.xml | 2 +- opendaylight/md-sal/sal-cluster-admin-impl/pom.xml | 2 +- opendaylight/md-sal/sal-clustering-commons/pom.xml | 2 +- opendaylight/md-sal/sal-common-impl/pom.xml | 2 +- opendaylight/md-sal/sal-distributed-datastore/pom.xml | 2 +- opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml | 2 +- opendaylight/md-sal/sal-remoterpc-connector/pom.xml | 2 +- opendaylight/md-sal/samples/toaster-provider/pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml index 27c1ef090c..a4ede263f7 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml @@ -41,7 +41,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.mockito - mockito-all + mockito-core test diff --git a/opendaylight/md-sal/cds-access-client/pom.xml b/opendaylight/md-sal/cds-access-client/pom.xml index e229b4114a..10f8fe7240 100644 --- a/opendaylight/md-sal/cds-access-client/pom.xml +++ b/opendaylight/md-sal/cds-access-client/pom.xml @@ -58,7 +58,7 @@ org.mockito - mockito-all + mockito-core com.typesafe.akka diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml index 72e0dbaba6..eaa3d6b8b5 100644 --- a/opendaylight/md-sal/mdsal-it-parent/pom.xml +++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml @@ -83,7 +83,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.mockito - mockito-all + mockito-core test diff --git a/opendaylight/md-sal/messagebus-impl/pom.xml b/opendaylight/md-sal/messagebus-impl/pom.xml index 19fcf0616c..aeae06aa7c 100644 --- a/opendaylight/md-sal/messagebus-impl/pom.xml +++ b/opendaylight/md-sal/messagebus-impl/pom.xml @@ -76,7 +76,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.mockito - mockito-all + mockito-core test diff --git a/opendaylight/md-sal/messagebus-util/pom.xml b/opendaylight/md-sal/messagebus-util/pom.xml index 3da6b70d1d..bb40768318 100644 --- a/opendaylight/md-sal/messagebus-util/pom.xml +++ b/opendaylight/md-sal/messagebus-util/pom.xml @@ -53,7 +53,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.mockito - mockito-all + mockito-core test diff --git a/opendaylight/md-sal/sal-akka-raft/pom.xml b/opendaylight/md-sal/sal-akka-raft/pom.xml index 6f106159fa..ad8a7367a0 100644 --- a/opendaylight/md-sal/sal-akka-raft/pom.xml +++ b/opendaylight/md-sal/sal-akka-raft/pom.xml @@ -79,7 +79,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml index 98bd4906d7..f83f4d7000 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -75,7 +75,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml index 6a2ac4984c..91ffdf6586 100644 --- a/opendaylight/md-sal/sal-binding-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-it/pom.xml @@ -45,7 +45,7 @@ ${project.build.directory}/test-classes org.opendaylight.controller - mockito-all,config-it-base,mdsal-it-base + mockito-core,objenesis,config-it-base,mdsal-it-base META-INF\/** false diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml index 8289b84cdc..b8f6e1efee 100644 --- a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml +++ b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml @@ -22,7 +22,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml index c1cb2d1db6..1d866a12fc 100644 --- a/opendaylight/md-sal/sal-clustering-commons/pom.xml +++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml @@ -25,7 +25,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/opendaylight/md-sal/sal-common-impl/pom.xml b/opendaylight/md-sal/sal-common-impl/pom.xml index 8dbccb1f1a..6c8cdbe23d 100644 --- a/opendaylight/md-sal/sal-common-impl/pom.xml +++ b/opendaylight/md-sal/sal-common-impl/pom.xml @@ -37,7 +37,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml index b32f042865..e8c927f3fd 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml @@ -18,7 +18,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml index 968a66c182..74e45255f6 100644 --- a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml @@ -74,7 +74,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml index 260aa36daa..7563d06c4f 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml +++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml @@ -134,7 +134,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/opendaylight/md-sal/samples/toaster-provider/pom.xml b/opendaylight/md-sal/samples/toaster-provider/pom.xml index de81d9f789..a413061d83 100644 --- a/opendaylight/md-sal/samples/toaster-provider/pom.xml +++ b/opendaylight/md-sal/samples/toaster-provider/pom.xml @@ -56,7 +56,7 @@ org.mockito - mockito-all + mockito-core test -- 2.36.6