Remove unneeded junit/mockito dependencies

This cleans up pom.xmls to not include unneded dependencies.

Change-Id: I9029bedcba58abaa5f6956a76b3e864650be3d90
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/common/checkstyle-logging/pom.xml b/common/checkstyle-logging/pom.xml
index 7908ba6ea13fd64a3da83e8247c9fbd5c28ad3da..bca02b42d3c4687fd4051b02d1c68b1ebb1e507a 100644 (file)
--- a/common/checkstyle-logging/pom.xml
+++ b/common/checkstyle-logging/pom.xml
@@ -31,11 +31,6 @@
       <artifactId>commons-logging</artifactId>
       <version>1.2</version>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml
index f4c2f158950786a47200d7c6a57c6d5460c6ae9b..a87958cb6e48f773c4962b71715cbc4229c84f88 100644 (file)
--- a/common/concepts/pom.xml
+++ b/common/concepts/pom.xml
@@ -41,10 +41,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>

diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml
index 537e073737c8b81a29984d05b55821a11bf2998b..3175f98ecc388816a1cfb6b694f131491d597e5d 100644 (file)
--- a/common/mockito-configuration/pom.xml
+++ b/common/mockito-configuration/pom.xml
@@ -31,11 +31,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/common/object-cache-api/pom.xml b/common/object-cache-api/pom.xml
index 191cbb0d8ab38d0e7458021ea90add47c29e0b19..aba8ca13e8a72e6045f8b700fa32df120b8ebb28 100644 (file)
--- a/common/object-cache-api/pom.xml
+++ b/common/object-cache-api/pom.xml
@@ -43,12 +43,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/common/object-cache-guava/pom.xml b/common/object-cache-guava/pom.xml
index 0d11445dec6744d05c9d9824ba2ebbad72903502..76f91a1ad79a52aeb4d24853ec74e13fea60b144 100644 (file)
--- a/common/object-cache-guava/pom.xml
+++ b/common/object-cache-guava/pom.xml
@@ -43,13 +43,8 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>

diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml
index 22d58e2974f7634d5e49d3e705bbb5f18fffe910..d0e0c6e37140be0a4790b830b2a144a1fc08c516 100644 (file)
--- a/common/testutils/pom.xml
+++ b/common/testutils/pom.xml
@@ -45,10 +45,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

diff --git a/common/util/pom.xml b/common/util/pom.xml
index 1b4e255cd1ca6dbf87364edd7854b2f2b61e7f09..40d88acc08d37a6d34fa1cfe8348d5b1430949fd 100644 (file)
--- a/common/util/pom.xml
+++ b/common/util/pom.xml
@@ -51,20 +51,14 @@
             <artifactId>value</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava-testlib</artifactId>
-          <scope>test</scope>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava-testlib</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

diff --git a/third-party/triemap/pom.xml b/third-party/triemap/pom.xml
index e507a8ad5e2ae904257258821e3f6df212b2e2d2..55b4485bf2f3be8ef67beec472fc170f6378783c 100644 (file)
--- a/third-party/triemap/pom.xml
+++ b/third-party/triemap/pom.xml
@@ -37,10 +37,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/yang/yang-common/pom.xml b/yang/yang-common/pom.xml
index 759f4f10388fcf79b9bb5459f32a0ae833a831b6..37c1e4f4b7f0645cc00ad41067de3f456edc411a 100644 (file)
--- a/yang/yang-common/pom.xml
+++ b/yang/yang-common/pom.xml
@@ -49,12 +49,6 @@
             <groupId>org.kohsuke.metainf-services</groupId>
             <artifactId>metainf-services</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/yang/yang-data-api/pom.xml b/yang/yang-data-api/pom.xml
index c599ec7ed3150edd892f2f7136bb04d13e83939e..ef36eb7f8ea11daa8c26bba412b239584ce866c9 100644 (file)
--- a/yang/yang-data-api/pom.xml
+++ b/yang/yang-data-api/pom.xml
@@ -57,15 +57,6 @@
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>yang-model-api</artifactId>
         </dependency>
-        <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/yang/yang-data-codec-gson/pom.xml b/yang/yang-data-codec-gson/pom.xml
index b6ff80eb3de355625003fd83d28631e8e160b5ea..97f459f0bb55f5c54837a319f720eeb0d1dbb148 100644 (file)
--- a/yang/yang-data-codec-gson/pom.xml
+++ b/yang/yang-data-codec-gson/pom.xml
@@ -52,6 +52,7 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-util</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-codec-xml</artifactId>
@@ -67,11 +68,6 @@
             <artifactId>yang-test-util</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>

diff --git a/yang/yang-data-codec-xml/pom.xml b/yang/yang-data-codec-xml/pom.xml
index 358bcdbc314399866b8d8a1f3014e1eba2537b6b..be74e7590feb4a52bae0297662b54239ffc57823 100644 (file)
--- a/yang/yang-data-codec-xml/pom.xml
+++ b/yang/yang-data-codec-xml/pom.xml
@@ -62,11 +62,6 @@
             <artifactId>yang-test-util</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>xmlunit</groupId>
             <artifactId>xmlunit</artifactId>

diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml
index 748347e94637741c1373b33b9550e36fdaf22040..955654c30f8119326c1de3f96de6f8c461b95c23 100644 (file)
--- a/yang/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -158,15 +158,6 @@
             <artifactId>org.osgi.core</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>

diff --git a/yang/yang-data-jaxen/pom.xml b/yang/yang-data-jaxen/pom.xml
index 294d4a62b85c270264d41e948dc523f4ef80d3e6..7ce65be012f099c42014809f4485d430bea646f4 100644 (file)
--- a/yang/yang-data-jaxen/pom.xml
+++ b/yang/yang-data-jaxen/pom.xml
@@ -83,20 +83,6 @@
             <artifactId>yang-data-impl</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml
index aa2056db199706faa2d96f521e790a166cc97142..73a1c8e8760bd67dbe6eff7b90632c395bd817fe 100644 (file)
--- a/yang/yang-data-util/pom.xml
+++ b/yang/yang-data-util/pom.xml
@@ -55,10 +55,6 @@
         </dependency>
 
         <!-- Test dependencies -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-test-util</artifactId>

diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml
index 2ce78149db244783f046ee5fafb0e5d94eec994d..697f9eb16937219c82bf0731096ea51049b81228 100644 (file)
--- a/yang/yang-maven-plugin/pom.xml
+++ b/yang/yang-maven-plugin/pom.xml
@@ -90,14 +90,6 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
     </dependencies>
 
     <reporting>

diff --git a/yang/yang-model-export/pom.xml b/yang/yang-model-export/pom.xml
index cdf84fa03534205641d414b430b807d8faf8ec5a..35a29ed24de0c15f08835be7a6b383872e1d7f64 100644 (file)
--- a/yang/yang-model-export/pom.xml
+++ b/yang/yang-model-export/pom.xml
@@ -45,11 +45,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-model-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-parser-impl</artifactId>
@@ -60,15 +55,6 @@
             <artifactId>yang-test-util</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>xmlunit</groupId>
             <artifactId>xmlunit</artifactId>

diff --git a/yang/yang-model-immutable/pom.xml b/yang/yang-model-immutable/pom.xml
index c544abe2449f672e1831c05308b8e8200d5ec122..17b5cfbef4f8877c0a1782bb9aa41d1bcbb25ca3 100644 (file)
--- a/yang/yang-model-immutable/pom.xml
+++ b/yang/yang-model-immutable/pom.xml
@@ -46,21 +46,5 @@
           <groupId>org.immutables</groupId>
           <artifactId>value</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
-
 </project>

diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml
index 9d707d2b4789a8640ce0432567edff46bae46f23..2036a28338c96e4331acdceb882ca566a8673490 100644 (file)
--- a/yang/yang-parser-impl/pom.xml
+++ b/yang/yang-parser-impl/pom.xml
@@ -114,32 +114,17 @@
             <artifactId>rfc8040-parser-support</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.kohsuke.metainf-services</groupId>
-            <artifactId>metainf-services</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
         </dependency>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/yang/yang-parser-reactor/pom.xml b/yang/yang-parser-reactor/pom.xml
index 7c625e5520d332134da36560ddac5727eba16dbc..28140b84c2534f84cb91793cc775b73a2b457b6b 100644 (file)
--- a/yang/yang-parser-reactor/pom.xml
+++ b/yang/yang-parser-reactor/pom.xml
@@ -65,20 +65,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-model-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/yang/yang-parser-rfc7950/pom.xml b/yang/yang-parser-rfc7950/pom.xml
index 2574ba4e15a780b17efe304531189b021964f158..becec0fb9686c8cc3195e5a1a762b8e302448cb6 100644 (file)
--- a/yang/yang-parser-rfc7950/pom.xml
+++ b/yang/yang-parser-rfc7950/pom.xml
@@ -78,15 +78,7 @@
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

diff --git a/yang/yang-xpath-impl/pom.xml b/yang/yang-xpath-impl/pom.xml
index da363b8f38aae6a20e0fb8fab3935b7e9741a622..91bff1b9196307d942691c3de57f4df196505a70 100644 (file)
--- a/yang/yang-xpath-impl/pom.xml
+++ b/yang/yang-xpath-impl/pom.xml
@@ -58,20 +58,6 @@
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>