Fix junit dependencies in poms. Reuse existing from parent,

add missing ones.

Change-Id: Ie40ee5b254adfe3148d6af9d6f141b152b728cd7
Signed-off-by: Alissa Bonas <abonas@redhat.com>

diff --git a/bgp/concepts/pom.xml b/bgp/concepts/pom.xml
index 860526ecf62a7a8ecef8a17996214abfe8477ad4..b97b8a3ab5956cb9c0ab52aa2ce5c88b3feb0275 100644 (file)
--- a/bgp/concepts/pom.xml
+++ b/bgp/concepts/pom.xml
@@ -54,6 +54,10 @@
             <artifactId>ietf-inet-types</artifactId>
             <version>${ietf.types.version}</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/bgp/linkstate/pom.xml b/bgp/linkstate/pom.xml
index d097325e86b9552bb9552fcbb63ae78b5717e063..526f4bd8c0255d841323ade94ebade9975b84b58 100644 (file)
--- a/bgp/linkstate/pom.xml
+++ b/bgp/linkstate/pom.xml
@@ -76,6 +76,10 @@
             <version>${osgi.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+         </dependency>
        </dependencies>
 
        <build>

diff --git a/bgp/parser-api/pom.xml b/bgp/parser-api/pom.xml
index 910b45312d57da4ba5c427bd4c2516405a5764f3..8eee7bc3fe1e9496dd232762567369c76a1695f9 100644 (file)
--- a/bgp/parser-api/pom.xml
+++ b/bgp/parser-api/pom.xml
@@ -66,6 +66,10 @@
             <artifactId>ietf-inet-types</artifactId>
             <version>${ietf.types.version}</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/bgp/parser-impl/pom.xml b/bgp/parser-impl/pom.xml
index de615fc472b8756a0d4c50c26de19cbc27b78628..959ff937d4182f671616fe8321af77f91f5e51a9 100644 (file)
--- a/bgp/parser-impl/pom.xml
+++ b/bgp/parser-impl/pom.xml
@@ -89,8 +89,6 @@
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
-                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>

diff --git a/bgp/parser-mock/pom.xml b/bgp/parser-mock/pom.xml
index ffa7981f8a3c08474e71f6de5aa583674b6354db..4a494b3ad4c4d34ee8bb9fe18faa71eb1c8299ce 100644 (file)
--- a/bgp/parser-mock/pom.xml
+++ b/bgp/parser-mock/pom.xml
@@ -66,6 +66,10 @@
             <version>2010.09.24-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/bgp/rib-impl/pom.xml b/bgp/rib-impl/pom.xml
index a9e4d166f4938871167b0f1bbfda4fd2af3004c8..89b4ff086b234b9285111b7b5330eb922ece98d1 100644 (file)
--- a/bgp/rib-impl/pom.xml
+++ b/bgp/rib-impl/pom.xml
@@ -125,8 +125,6 @@
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
-                       <scope>test</scope>
                </dependency>
        </dependencies>
 

diff --git a/bgp/rib-spi/pom.xml b/bgp/rib-spi/pom.xml
index 342c5988231f313736b138b6a4d44f2078c2d0df..dc4150cc90d7d2c337253f2008285093e884dc63 100644 (file)
--- a/bgp/rib-spi/pom.xml
+++ b/bgp/rib-spi/pom.xml
@@ -55,8 +55,6 @@
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
-                       <scope>test</scope>
                </dependency>
        </dependencies>
 

diff --git a/bgp/util/pom.xml b/bgp/util/pom.xml
index bc13fe58201326d1418f3bb1f72a85947c5b1e91..88cb758549f5d0e3359524c473f1f821c96c8aae 100644 (file)
--- a/bgp/util/pom.xml
+++ b/bgp/util/pom.xml
@@ -65,6 +65,10 @@
             <version>2010.09.24-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/concepts/pom.xml b/concepts/pom.xml
index 8df83d8bf9fac123e154c346b5a37369bee728be..5ad34644d1d32884f6338a22bf70c17252cd71d5 100644 (file)
--- a/concepts/pom.xml
+++ b/concepts/pom.xml
@@ -59,6 +59,10 @@
             <artifactId>ietf-inet-types</artifactId>
             <version>${ietf.types.version}</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/framework/pom.xml b/framework/pom.xml
index d841a3ca26c541870094dbca2ad85582e0d0274d..31dbce711d22552b7f79a221f01cf661853a88b6 100644 (file)
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -60,6 +60,10 @@
             <version>${project.version}</version>
                        <scope>test</scope>
                </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/mockito-configuration/pom.xml b/mockito-configuration/pom.xml
index f9dd49c24fc8c740d6481197e6b8f95ede5dc2cb..bc6ace6d6f9fe6fee2a1125643c595789147acbe 100644 (file)
--- a/mockito-configuration/pom.xml
+++ b/mockito-configuration/pom.xml
@@ -28,7 +28,6 @@
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
                </dependency>
        </dependencies>
 

diff --git a/pcep/api/pom.xml b/pcep/api/pom.xml
index 6f67c89e003e61d86636f5ccb5e8589847702ab0..692426b306ccc88bbd188ae1728e66c031a8f466 100644 (file)
--- a/pcep/api/pom.xml
+++ b/pcep/api/pom.xml
@@ -86,6 +86,10 @@
             <artifactId>ietf-inet-types</artifactId>
             <version>${ietf.types.version}</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/pcep/impl/pom.xml b/pcep/impl/pom.xml
index 39aa9f233bd0bbf23f2dd1f6fcfddb2eaf9e56ac..743a97b97bffbd6fce73cc7e49bb8ae51e23ad10 100644 (file)
--- a/pcep/impl/pom.xml
+++ b/pcep/impl/pom.xml
@@ -98,6 +98,10 @@
                        <scope>test</scope>
                        <type>test-jar</type>
                </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/pcep/testtool/pom.xml b/pcep/testtool/pom.xml
index a18b9fa56c2d62b506fc4775acbbdbaa15187d67..a3c6ffdbdc777703b79166e6a86545a7ffb41c53 100644 (file)
--- a/pcep/testtool/pom.xml
+++ b/pcep/testtool/pom.xml
@@ -65,6 +65,10 @@
                        <version>${logback.version}</version>
                        <scope>runtime</scope>
                </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/pom.xml b/pom.xml
index 1bbcb890c570869057e153c339586d685fd069bf..6bef8f9d83cbf5d70b6669ba600d4024996e9519 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -52,13 +52,18 @@
                <module>util</module>
        </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
        <dependencies>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
-                       <scope>test</scope>
-               </dependency>
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-classic</artifactId>

diff --git a/util/pom.xml b/util/pom.xml
index e6a2c1c44d4607a379419fa57cd0846b9960cdab..8395a606d8fb7343b7e07c245c71136874888718 100644 (file)
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -29,6 +29,10 @@
                        <artifactId>commons-codec</artifactId>
                        <version>${commonscodec.version}</version>
                </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
     </dependencies>
 
        <build>