From 7d99afc39a7ce0ceffbc066aa31412c8e3e68d53 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 9 Oct 2018 16:49:10 +0200 Subject: [PATCH] Remove unneeded dependencies odlparent is declaring test dependencies for us, and also declares osg.core correctly. yangtools also declares test utils with proper scope, hence we can remove those overrides, too. Change-Id: I7c4f18313b32123043242b36b573263afde40962 Signed-off-by: Robert Varga --- binding/maven-sal-api-gen-plugin/pom.xml | 5 ----- binding/mdsal-binding-api/pom.xml | 11 ----------- binding/mdsal-binding-dom-adapter/pom.xml | 17 ----------------- binding/mdsal-binding-dom-codec-osgi/pom.xml | 5 ----- binding/mdsal-binding-dom-codec/pom.xml | 6 ------ binding/mdsal-binding-generator-impl/pom.xml | 5 ----- binding/mdsal-binding-generator-util/pom.xml | 5 ----- .../mdsal-binding-java-api-generator/pom.xml | 9 --------- binding/yang-binding/pom.xml | 10 ---------- binding2/mdsal-binding2-api/pom.xml | 11 ----------- binding2/mdsal-binding2-dom-adapter/pom.xml | 17 ----------------- binding2/mdsal-binding2-dom-codec/pom.xml | 5 ----- binding2/mdsal-binding2-generator-impl/pom.xml | 10 ---------- .../mdsal-binding2-java-api-generator/pom.xml | 10 ---------- .../mdsal-binding2-maven-api-gen-plugin/pom.xml | 6 ------ binding2/mdsal-binding2-runtime/pom.xml | 11 ----------- binding2/mdsal-binding2-spec/pom.xml | 10 ---------- common/mdsal-common-api/pom.xml | 6 ------ dom/mdsal-dom-api/pom.xml | 9 --------- dom/mdsal-dom-broker/pom.xml | 14 ++++---------- dom/mdsal-dom-inmemory-datastore/pom.xml | 6 ------ dom/mdsal-dom-schema-service-osgi/pom.xml | 6 ------ dom/mdsal-dom-spi/pom.xml | 11 ----------- .../mdsal-eos-binding-adapter/pom.xml | 11 ----------- entityownership/mdsal-eos-binding-api/pom.xml | 6 ------ entityownership/mdsal-eos-common-api/pom.xml | 6 ------ entityownership/mdsal-eos-common-spi/pom.xml | 6 ------ entityownership/mdsal-eos-dom-api/pom.xml | 4 ---- model/ietf/ietf-restconf/pom.xml | 5 ----- model/ietf/ietf-type-util/pom.xml | 6 ------ model/ietf/rfc6991-ietf-inet-types/pom.xml | 5 ----- .../mdsal-singleton-common-api/pom.xml | 6 ------ .../mdsal-singleton-dom-impl/pom.xml | 9 --------- 33 files changed, 4 insertions(+), 265 deletions(-) diff --git a/binding/maven-sal-api-gen-plugin/pom.xml b/binding/maven-sal-api-gen-plugin/pom.xml index ff9a407a01..3a0eb477d1 100644 --- a/binding/maven-sal-api-gen-plugin/pom.xml +++ b/binding/maven-sal-api-gen-plugin/pom.xml @@ -75,11 +75,6 @@ plexus-build-api provided - - junit - junit - test - org.opendaylight.yangtools yang-test-util diff --git a/binding/mdsal-binding-api/pom.xml b/binding/mdsal-binding-api/pom.xml index 5e1ac0060d..ea4dfb0e5e 100644 --- a/binding/mdsal-binding-api/pom.xml +++ b/binding/mdsal-binding-api/pom.xml @@ -51,23 +51,12 @@ org.osgi org.osgi.core - provided org.apache.commons commons-lang3 test - - org.mockito - mockito-core - test - - - junit - junit - test - diff --git a/binding/mdsal-binding-dom-adapter/pom.xml b/binding/mdsal-binding-dom-adapter/pom.xml index 03d592a1d0..be7f48dee7 100644 --- a/binding/mdsal-binding-dom-adapter/pom.xml +++ b/binding/mdsal-binding-dom-adapter/pom.xml @@ -72,19 +72,8 @@ org.osgi org.osgi.core - provided - - junit - junit - test - - - org.mockito - mockito-core - test - org.opendaylight.yangtools yang-parser-impl @@ -93,12 +82,6 @@ org.opendaylight.mdsal mdsal-binding-test-model - test - - - org.slf4j - slf4j-simple - test org.opendaylight.mdsal diff --git a/binding/mdsal-binding-dom-codec-osgi/pom.xml b/binding/mdsal-binding-dom-codec-osgi/pom.xml index fadd20571c..251cea3989 100644 --- a/binding/mdsal-binding-dom-codec-osgi/pom.xml +++ b/binding/mdsal-binding-dom-codec-osgi/pom.xml @@ -29,14 +29,9 @@ org.osgi.core - - junit - junit - org.opendaylight.yangtools mockito-configuration - test org.opendaylight.yangtools diff --git a/binding/mdsal-binding-dom-codec/pom.xml b/binding/mdsal-binding-dom-codec/pom.xml index 98efa64c24..27c29d04e4 100644 --- a/binding/mdsal-binding-dom-codec/pom.xml +++ b/binding/mdsal-binding-dom-codec/pom.xml @@ -39,7 +39,6 @@ org.opendaylight.mdsal mdsal-binding-test-model - test @@ -49,15 +48,10 @@ com.google.guava guava - - junit - junit - test org.opendaylight.yangtools mockito-configuration - test diff --git a/binding/mdsal-binding-generator-impl/pom.xml b/binding/mdsal-binding-generator-impl/pom.xml index 041a677674..ff44717198 100644 --- a/binding/mdsal-binding-generator-impl/pom.xml +++ b/binding/mdsal-binding-generator-impl/pom.xml @@ -43,14 +43,9 @@ mdsal-binding-generator-util - - junit - junit - org.opendaylight.yangtools mockito-configuration - test diff --git a/binding/mdsal-binding-generator-util/pom.xml b/binding/mdsal-binding-generator-util/pom.xml index af38094c49..3ea3a64983 100644 --- a/binding/mdsal-binding-generator-util/pom.xml +++ b/binding/mdsal-binding-generator-util/pom.xml @@ -42,14 +42,9 @@ mdsal-binding-spec-util - - junit - junit - org.opendaylight.yangtools mockito-configuration - test org.opendaylight.yangtools diff --git a/binding/mdsal-binding-java-api-generator/pom.xml b/binding/mdsal-binding-java-api-generator/pom.xml index 7baff2dbd4..b6d46d3ab4 100644 --- a/binding/mdsal-binding-java-api-generator/pom.xml +++ b/binding/mdsal-binding-java-api-generator/pom.xml @@ -42,15 +42,6 @@ commons-text - - junit - junit - test - - - org.mockito - mockito-core - org.opendaylight.yangtools yang-test-util diff --git a/binding/yang-binding/pom.xml b/binding/yang-binding/pom.xml index 15c9f0c7c2..bdadde93b3 100644 --- a/binding/yang-binding/pom.xml +++ b/binding/yang-binding/pom.xml @@ -39,16 +39,6 @@ com.google.guava guava - - junit - junit - test - - - org.mockito - mockito-core - test - diff --git a/binding2/mdsal-binding2-api/pom.xml b/binding2/mdsal-binding2-api/pom.xml index c1693b4e04..a7df931f9d 100644 --- a/binding2/mdsal-binding2-api/pom.xml +++ b/binding2/mdsal-binding2-api/pom.xml @@ -55,23 +55,12 @@ org.osgi org.osgi.core - provided org.apache.commons commons-lang3 test - - org.mockito - mockito-core - test - - - junit - junit - test - diff --git a/binding2/mdsal-binding2-dom-adapter/pom.xml b/binding2/mdsal-binding2-dom-adapter/pom.xml index a7d87b2fd6..548cebdeaf 100644 --- a/binding2/mdsal-binding2-dom-adapter/pom.xml +++ b/binding2/mdsal-binding2-dom-adapter/pom.xml @@ -72,17 +72,6 @@ org.osgi org.osgi.core - provided - - - junit - junit - test - - - org.mockito - mockito-core - test org.opendaylight.yangtools @@ -92,18 +81,12 @@ org.opendaylight.mdsal mdsal-binding2-test-model - test org.opendaylight.mdsal mdsal-dom-inmemory-datastore test - - org.slf4j - slf4j-simple - test - diff --git a/binding2/mdsal-binding2-dom-codec/pom.xml b/binding2/mdsal-binding2-dom-codec/pom.xml index c4ba542e06..8a9b316072 100644 --- a/binding2/mdsal-binding2-dom-codec/pom.xml +++ b/binding2/mdsal-binding2-dom-codec/pom.xml @@ -61,14 +61,9 @@ com.google.guava guava - junit - junit - test - org.opendaylight.yangtools mockito-configuration - test diff --git a/binding2/mdsal-binding2-generator-impl/pom.xml b/binding2/mdsal-binding2-generator-impl/pom.xml index b838659b86..8dbad63f1b 100644 --- a/binding2/mdsal-binding2-generator-impl/pom.xml +++ b/binding2/mdsal-binding2-generator-impl/pom.xml @@ -50,16 +50,6 @@ org.opendaylight.mdsal mdsal-binding2-util - - - junit - junit - - - org.mockito - mockito-core - - com.google.guava guava diff --git a/binding2/mdsal-binding2-java-api-generator/pom.xml b/binding2/mdsal-binding2-java-api-generator/pom.xml index d010a4b1d7..60a44f67c0 100644 --- a/binding2/mdsal-binding2-java-api-generator/pom.xml +++ b/binding2/mdsal-binding2-java-api-generator/pom.xml @@ -42,11 +42,6 @@ org.opendaylight.yangtools yang-test-util - - junit - junit - test - com.typesafe.play twirl-api_2.12 @@ -78,11 +73,6 @@ - - - org.mockito - mockito-core - diff --git a/binding2/mdsal-binding2-maven-api-gen-plugin/pom.xml b/binding2/mdsal-binding2-maven-api-gen-plugin/pom.xml index b0c1311129..6098755a22 100644 --- a/binding2/mdsal-binding2-maven-api-gen-plugin/pom.xml +++ b/binding2/mdsal-binding2-maven-api-gen-plugin/pom.xml @@ -75,11 +75,5 @@ plexus-build-api provided - - - junit - junit - test - diff --git a/binding2/mdsal-binding2-runtime/pom.xml b/binding2/mdsal-binding2-runtime/pom.xml index 7be1ba620d..cdc16c21b8 100644 --- a/binding2/mdsal-binding2-runtime/pom.xml +++ b/binding2/mdsal-binding2-runtime/pom.xml @@ -24,24 +24,13 @@ org.opendaylight.mdsal mdsal-binding2-generator-impl - junit - junit - test - - - org.mockito - mockito-core - test - org.opendaylight.yangtools yang-test-util - test org.opendaylight.mdsal mdsal-binding2-test-model - test diff --git a/binding2/mdsal-binding2-spec/pom.xml b/binding2/mdsal-binding2-spec/pom.xml index 85bb019ffa..01ea5ab3ca 100644 --- a/binding2/mdsal-binding2-spec/pom.xml +++ b/binding2/mdsal-binding2-spec/pom.xml @@ -43,15 +43,5 @@ com.google.guava guava - - junit - junit - test - - - org.mockito - mockito-core - test - diff --git a/common/mdsal-common-api/pom.xml b/common/mdsal-common-api/pom.xml index 34a21ea9d8..6d15a53736 100644 --- a/common/mdsal-common-api/pom.xml +++ b/common/mdsal-common-api/pom.xml @@ -37,15 +37,9 @@ org.opendaylight.yangtools yang-common - - junit - junit - test - org.opendaylight.yangtools mockito-configuration - test diff --git a/dom/mdsal-dom-api/pom.xml b/dom/mdsal-dom-api/pom.xml index 276871fa44..b344cc5cf7 100644 --- a/dom/mdsal-dom-api/pom.xml +++ b/dom/mdsal-dom-api/pom.xml @@ -38,20 +38,11 @@ org.osgi.core - - junit - junit - org.opendaylight.yangtools yang-data-impl test - - org.mockito - mockito-core - test - diff --git a/dom/mdsal-dom-broker/pom.xml b/dom/mdsal-dom-broker/pom.xml index 80de6c1e19..2ef75c0ad4 100644 --- a/dom/mdsal-dom-broker/pom.xml +++ b/dom/mdsal-dom-broker/pom.xml @@ -37,11 +37,6 @@ org.opendaylight.mdsal mdsal-dom-spi - - org.opendaylight.mdsal - mdsal-dom-inmemory-datastore - test - org.opendaylight.yangtools @@ -60,14 +55,13 @@ yang-model-api - - junit - junit - - org.opendaylight.yangtools mockito-configuration + + + org.opendaylight.mdsal + mdsal-dom-inmemory-datastore test diff --git a/dom/mdsal-dom-inmemory-datastore/pom.xml b/dom/mdsal-dom-inmemory-datastore/pom.xml index 346e0a2dc0..ac9de4f4b0 100644 --- a/dom/mdsal-dom-inmemory-datastore/pom.xml +++ b/dom/mdsal-dom-inmemory-datastore/pom.xml @@ -69,15 +69,9 @@ - - junit - junit - test - org.opendaylight.yangtools mockito-configuration - test org.opendaylight.yangtools diff --git a/dom/mdsal-dom-schema-service-osgi/pom.xml b/dom/mdsal-dom-schema-service-osgi/pom.xml index bb3e12ee3a..a819898993 100644 --- a/dom/mdsal-dom-schema-service-osgi/pom.xml +++ b/dom/mdsal-dom-schema-service-osgi/pom.xml @@ -55,18 +55,12 @@ yang-test-util - - junit - junit - org.opendaylight.yangtools mockito-configuration - test - diff --git a/dom/mdsal-dom-spi/pom.xml b/dom/mdsal-dom-spi/pom.xml index e0abfad193..ec44ad5645 100644 --- a/dom/mdsal-dom-spi/pom.xml +++ b/dom/mdsal-dom-spi/pom.xml @@ -26,20 +26,9 @@ - - junit - junit - test - - - org.slf4j - slf4j-simple - test - org.opendaylight.yangtools mockito-configuration - test diff --git a/entityownership/mdsal-eos-binding-adapter/pom.xml b/entityownership/mdsal-eos-binding-adapter/pom.xml index e57b4e42fa..ba32c533c0 100644 --- a/entityownership/mdsal-eos-binding-adapter/pom.xml +++ b/entityownership/mdsal-eos-binding-adapter/pom.xml @@ -54,23 +54,12 @@ org.osgi org.osgi.core - provided org.apache.commons commons-lang3 test - - org.mockito - mockito-core - test - - - junit - junit - test - diff --git a/entityownership/mdsal-eos-binding-api/pom.xml b/entityownership/mdsal-eos-binding-api/pom.xml index b64699eec1..04fbb1c2a1 100644 --- a/entityownership/mdsal-eos-binding-api/pom.xml +++ b/entityownership/mdsal-eos-binding-api/pom.xml @@ -50,18 +50,12 @@ org.osgi org.osgi.core - provided org.apache.commons commons-lang3 test - - junit - junit - test - diff --git a/entityownership/mdsal-eos-common-api/pom.xml b/entityownership/mdsal-eos-common-api/pom.xml index d6edbdf638..a0f4f97d48 100644 --- a/entityownership/mdsal-eos-common-api/pom.xml +++ b/entityownership/mdsal-eos-common-api/pom.xml @@ -35,15 +35,9 @@ org.opendaylight.yangtools yang-common - - junit - junit - test - org.opendaylight.yangtools mockito-configuration - test diff --git a/entityownership/mdsal-eos-common-spi/pom.xml b/entityownership/mdsal-eos-common-spi/pom.xml index 3d7c88aacd..9ca41c58bc 100644 --- a/entityownership/mdsal-eos-common-spi/pom.xml +++ b/entityownership/mdsal-eos-common-spi/pom.xml @@ -39,15 +39,9 @@ org.opendaylight.yangtools yang-common - - junit - junit - test - org.opendaylight.yangtools mockito-configuration - test diff --git a/entityownership/mdsal-eos-dom-api/pom.xml b/entityownership/mdsal-eos-dom-api/pom.xml index 3ef3ea25fc..0d60abcb6a 100644 --- a/entityownership/mdsal-eos-dom-api/pom.xml +++ b/entityownership/mdsal-eos-dom-api/pom.xml @@ -35,10 +35,6 @@ org.osgi org.osgi.core - - junit - junit - org.opendaylight.yangtools yang-data-impl diff --git a/model/ietf/ietf-restconf/pom.xml b/model/ietf/ietf-restconf/pom.xml index 9c5fcf6ac2..6705bdd84a 100644 --- a/model/ietf/ietf-restconf/pom.xml +++ b/model/ietf/ietf-restconf/pom.xml @@ -30,10 +30,5 @@ org.opendaylight.mdsal.binding.model.ietf rfc6991 - - - junit - junit - diff --git a/model/ietf/ietf-type-util/pom.xml b/model/ietf/ietf-type-util/pom.xml index 8c5c7911ef..cdbd1c0782 100644 --- a/model/ietf/ietf-type-util/pom.xml +++ b/model/ietf/ietf-type-util/pom.xml @@ -30,15 +30,9 @@ org.opendaylight.mdsal mdsal-binding-spec-util - - org.slf4j - slf4j-simple - test - org.opendaylight.yangtools mockito-configuration - test diff --git a/model/ietf/rfc6991-ietf-inet-types/pom.xml b/model/ietf/rfc6991-ietf-inet-types/pom.xml index ee946e875b..17fba082f6 100644 --- a/model/ietf/rfc6991-ietf-inet-types/pom.xml +++ b/model/ietf/rfc6991-ietf-inet-types/pom.xml @@ -32,10 +32,5 @@ org.opendaylight.mdsal.model ietf-type-util - - junit - junit - test - diff --git a/singleton-service/mdsal-singleton-common-api/pom.xml b/singleton-service/mdsal-singleton-common-api/pom.xml index a8e57631ee..a987559d73 100644 --- a/singleton-service/mdsal-singleton-common-api/pom.xml +++ b/singleton-service/mdsal-singleton-common-api/pom.xml @@ -40,15 +40,9 @@ org.opendaylight.yangtools yang-common - - junit - junit - test - org.opendaylight.yangtools mockito-configuration - test diff --git a/singleton-service/mdsal-singleton-dom-impl/pom.xml b/singleton-service/mdsal-singleton-dom-impl/pom.xml index b8de6d7510..68bb084118 100644 --- a/singleton-service/mdsal-singleton-dom-impl/pom.xml +++ b/singleton-service/mdsal-singleton-dom-impl/pom.xml @@ -45,20 +45,11 @@ org.osgi.core - - junit - junit - org.opendaylight.yangtools yang-data-impl test - - org.mockito - mockito-core - test - -- 2.36.6