From 3b970425904b55f4faa94ddb47753b389485c0ff Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 6 Aug 2018 16:30:49 +0200 Subject: [PATCH] Remove unneeded junit/mockito dependencies This cleans up pom.xmls to not include unneded dependencies. Change-Id: I9029bedcba58abaa5f6956a76b3e864650be3d90 Signed-off-by: Robert Varga --- common/checkstyle-logging/pom.xml | 5 ----- common/concepts/pom.xml | 4 ---- common/mockito-configuration/pom.xml | 5 ----- common/object-cache-api/pom.xml | 6 ------ common/object-cache-guava/pom.xml | 7 +------ common/testutils/pom.xml | 5 +---- common/util/pom.xml | 12 +++--------- third-party/triemap/pom.xml | 4 ---- yang/yang-common/pom.xml | 6 ------ yang/yang-data-api/pom.xml | 9 --------- yang/yang-data-codec-gson/pom.xml | 6 +----- yang/yang-data-codec-xml/pom.xml | 5 ----- yang/yang-data-impl/pom.xml | 9 --------- yang/yang-data-jaxen/pom.xml | 14 -------------- yang/yang-data-util/pom.xml | 4 ---- yang/yang-maven-plugin/pom.xml | 8 -------- yang/yang-model-export/pom.xml | 14 -------------- yang/yang-model-immutable/pom.xml | 16 ---------------- yang/yang-parser-impl/pom.xml | 23 ++++------------------- yang/yang-parser-reactor/pom.xml | 14 -------------- yang/yang-parser-rfc7950/pom.xml | 10 +--------- yang/yang-xpath-impl/pom.xml | 14 -------------- 22 files changed, 11 insertions(+), 189 deletions(-) diff --git a/common/checkstyle-logging/pom.xml b/common/checkstyle-logging/pom.xml index 7908ba6ea1..bca02b42d3 100644 --- a/common/checkstyle-logging/pom.xml +++ b/common/checkstyle-logging/pom.xml @@ -31,11 +31,6 @@ commons-logging 1.2 - - junit - junit - test - diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml index f4c2f15895..a87958cb6e 100644 --- a/common/concepts/pom.xml +++ b/common/concepts/pom.xml @@ -41,10 +41,6 @@ com.google.guava guava - - junit - junit - org.opendaylight.yangtools mockito-configuration diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml index 537e073737..3175f98ecc 100644 --- a/common/mockito-configuration/pom.xml +++ b/common/mockito-configuration/pom.xml @@ -31,11 +31,6 @@ mockito-core compile - - junit - junit - test - diff --git a/common/object-cache-api/pom.xml b/common/object-cache-api/pom.xml index 191cbb0d8a..aba8ca13e8 100644 --- a/common/object-cache-api/pom.xml +++ b/common/object-cache-api/pom.xml @@ -43,12 +43,6 @@ com.google.guava guava - - - junit - junit - test - diff --git a/common/object-cache-guava/pom.xml b/common/object-cache-guava/pom.xml index 0d11445dec..76f91a1ad7 100644 --- a/common/object-cache-guava/pom.xml +++ b/common/object-cache-guava/pom.xml @@ -43,13 +43,8 @@ com.google.guava guava - - - junit - junit - test - + diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml index 22d58e2974..d0e0c6e371 100644 --- a/common/testutils/pom.xml +++ b/common/testutils/pom.xml @@ -45,10 +45,7 @@ org.slf4j slf4j-simple - - junit - junit - + org.mockito mockito-core diff --git a/common/util/pom.xml b/common/util/pom.xml index 1b4e255cd1..40d88acc08 100644 --- a/common/util/pom.xml +++ b/common/util/pom.xml @@ -51,20 +51,14 @@ value - - junit - junit - test - org.opendaylight.yangtools mockito-configuration - test - com.google.guava - guava-testlib - test + com.google.guava + guava-testlib + test diff --git a/third-party/triemap/pom.xml b/third-party/triemap/pom.xml index e507a8ad5e..55b4485bf2 100644 --- a/third-party/triemap/pom.xml +++ b/third-party/triemap/pom.xml @@ -37,10 +37,6 @@ com.google.guava guava - - junit - junit - diff --git a/yang/yang-common/pom.xml b/yang/yang-common/pom.xml index 759f4f1038..37c1e4f4b7 100644 --- a/yang/yang-common/pom.xml +++ b/yang/yang-common/pom.xml @@ -49,12 +49,6 @@ org.kohsuke.metainf-services metainf-services - - - junit - junit - test - diff --git a/yang/yang-data-api/pom.xml b/yang/yang-data-api/pom.xml index c599ec7ed3..ef36eb7f8e 100644 --- a/yang/yang-data-api/pom.xml +++ b/yang/yang-data-api/pom.xml @@ -57,15 +57,6 @@ org.opendaylight.yangtools yang-model-api - - junit - junit - test - - - org.mockito - mockito-core - diff --git a/yang/yang-data-codec-gson/pom.xml b/yang/yang-data-codec-gson/pom.xml index b6ff80eb3d..97f459f0bb 100644 --- a/yang/yang-data-codec-gson/pom.xml +++ b/yang/yang-data-codec-gson/pom.xml @@ -52,6 +52,7 @@ org.opendaylight.yangtools yang-data-util + org.opendaylight.yangtools yang-data-codec-xml @@ -67,11 +68,6 @@ yang-test-util test - - junit - junit - test - org.opendaylight.yangtools mockito-configuration diff --git a/yang/yang-data-codec-xml/pom.xml b/yang/yang-data-codec-xml/pom.xml index 358bcdbc31..be74e7590f 100644 --- a/yang/yang-data-codec-xml/pom.xml +++ b/yang/yang-data-codec-xml/pom.xml @@ -62,11 +62,6 @@ yang-test-util test - - junit - junit - test - xmlunit xmlunit diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml index 748347e946..955654c30f 100644 --- a/yang/yang-data-impl/pom.xml +++ b/yang/yang-data-impl/pom.xml @@ -158,15 +158,6 @@ org.osgi.core - - junit - junit - test - - - org.mockito - mockito-core - org.slf4j slf4j-log4j12 diff --git a/yang/yang-data-jaxen/pom.xml b/yang/yang-data-jaxen/pom.xml index 294d4a62b8..7ce65be012 100644 --- a/yang/yang-data-jaxen/pom.xml +++ b/yang/yang-data-jaxen/pom.xml @@ -83,20 +83,6 @@ yang-data-impl test - - junit - junit - test - - - org.mockito - mockito-core - - - org.slf4j - slf4j-log4j12 - test - diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml index aa2056db19..73a1c8e876 100644 --- a/yang/yang-data-util/pom.xml +++ b/yang/yang-data-util/pom.xml @@ -55,10 +55,6 @@ - - org.mockito - mockito-core - ${project.groupId} yang-test-util diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml index 2ce78149db..697f9eb169 100644 --- a/yang/yang-maven-plugin/pom.xml +++ b/yang/yang-maven-plugin/pom.xml @@ -90,14 +90,6 @@ test-jar test - - org.mockito - mockito-core - - - junit - junit - diff --git a/yang/yang-model-export/pom.xml b/yang/yang-model-export/pom.xml index cdf84fa035..35a29ed24d 100644 --- a/yang/yang-model-export/pom.xml +++ b/yang/yang-model-export/pom.xml @@ -45,11 +45,6 @@ ${project.groupId} yang-model-util - - junit - junit - test - ${project.groupId} yang-parser-impl @@ -60,15 +55,6 @@ yang-test-util test - - org.mockito - mockito-core - - - ch.qos.logback - logback-classic - test - xmlunit xmlunit diff --git a/yang/yang-model-immutable/pom.xml b/yang/yang-model-immutable/pom.xml index c544abe244..17b5cfbef4 100644 --- a/yang/yang-model-immutable/pom.xml +++ b/yang/yang-model-immutable/pom.xml @@ -46,21 +46,5 @@ org.immutables value - - - junit - junit - test - - - org.mockito - mockito-core - - - ch.qos.logback - logback-classic - test - - diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml index 9d707d2b47..2036a28338 100644 --- a/yang/yang-parser-impl/pom.xml +++ b/yang/yang-parser-impl/pom.xml @@ -114,32 +114,17 @@ rfc8040-parser-support - - org.kohsuke.metainf-services - metainf-services - - - org.osgi - org.osgi.core - - - - org.mockito - mockito-core - com.google.guava guava - junit - junit - test + org.kohsuke.metainf-services + metainf-services - ch.qos.logback - logback-classic - test + org.osgi + org.osgi.core diff --git a/yang/yang-parser-reactor/pom.xml b/yang/yang-parser-reactor/pom.xml index 7c625e5520..28140b84c2 100644 --- a/yang/yang-parser-reactor/pom.xml +++ b/yang/yang-parser-reactor/pom.xml @@ -65,20 +65,6 @@ ${project.groupId} yang-model-util - - org.mockito - mockito-core - - - junit - junit - test - - - ch.qos.logback - logback-classic - test - diff --git a/yang/yang-parser-rfc7950/pom.xml b/yang/yang-parser-rfc7950/pom.xml index 2574ba4e15..becec0fb96 100644 --- a/yang/yang-parser-rfc7950/pom.xml +++ b/yang/yang-parser-rfc7950/pom.xml @@ -78,15 +78,7 @@ org.antlr antlr4-runtime - - org.mockito - mockito-core - - - junit - junit - test - + ch.qos.logback logback-classic diff --git a/yang/yang-xpath-impl/pom.xml b/yang/yang-xpath-impl/pom.xml index da363b8f38..91bff1b919 100644 --- a/yang/yang-xpath-impl/pom.xml +++ b/yang/yang-xpath-impl/pom.xml @@ -58,20 +58,6 @@ org.antlr antlr4-runtime - - org.mockito - mockito-core - - - junit - junit - test - - - ch.qos.logback - logback-classic - test - -- 2.36.6