Declare junit version and use junit dependencyManagement section.

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

diff --git a/opendaylight/appauth/pom.xml b/opendaylight/appauth/pom.xml
index fc6a134882b2eb5a61a0d1fa725697e253fdb259..2cfa45cc8469c09268b2bcf5d2beb02aa87c8c7b 100644 (file)
--- a/opendaylight/appauth/pom.xml
+++ b/opendaylight/appauth/pom.xml
@@ -61,8 +61,6 @@
         <dependency>
           <groupId>junit</groupId>
           <artifactId>junit</artifactId>
         <dependency>
           <groupId>junit</groupId>
           <artifactId>junit</artifactId>

-          <version>4.8.1</version>
-          <scope>test</scope>

         </dependency>
     </dependencies>
 </project>
         </dependency>
     </dependencies>
 </project>

diff --git a/opendaylight/commons/concepts/pom.xml b/opendaylight/commons/concepts/pom.xml
index 1ea37de77ababd5b1bcd21b780b62d6051233060..87fadfe85e28e801f9eaf2a4c0d1b3630ae93441 100644 (file)
--- a/opendaylight/commons/concepts/pom.xml
+++ b/opendaylight/commons/concepts/pom.xml
@@ -56,8 +56,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

-      <version>4.8.1</version>
-      <scope>test</scope>

     </dependency>
   </dependencies>
 </project>
     </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index dfd0ce463a7ad112217254b1651803dc6621d8e6..46ccf33b511ef5ed64fa8af8110f9f5b5ca2c1ce 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -59,8 +59,20 @@
     <jacoco.version>0.5.3.201107060350</jacoco.version>
     <enforcer.version>1.3.1</enforcer.version>
     <bundle.plugin.version>2.3.7</bundle.plugin.version>
     <jacoco.version>0.5.3.201107060350</jacoco.version>
     <enforcer.version>1.3.1</enforcer.version>
     <bundle.plugin.version>2.3.7</bundle.plugin.version>

+    <junit.version>4.8.1</junit.version>

   </properties>
 
   </properties>
 

+ <dependencyManagement>
+     <dependencies>
+         <dependency>
+             <groupId>junit</groupId>
+              <artifactId>junit</artifactId>
+              <version>${junit.version}</version>
+              <scope>test</scope>
+         </dependency>
+     </dependencies>
+ </dependencyManagement>
+

   <pluginRepositories>
     <pluginRepository>
       <id>central</id>
   <pluginRepositories>
     <pluginRepository>
       <id>central</id>

diff --git a/opendaylight/forwarding/staticrouting/pom.xml b/opendaylight/forwarding/staticrouting/pom.xml
index 1e22a7c8e04f35c03ae7074e392b5fd9bd7861f8..bee0da249630ba7e3191b72ad6b101841fdde334 100644 (file)
--- a/opendaylight/forwarding/staticrouting/pom.xml
+++ b/opendaylight/forwarding/staticrouting/pom.xml
@@ -80,8 +80,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

-      <version>4.8.1</version>
-      <scope>test</scope>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/forwardingrulesmanager/api/pom.xml b/opendaylight/forwardingrulesmanager/api/pom.xml
index 94972e9fe37959fb749dfd8628b007c4bff915a7..d46d1d4787498cf1416ce3e83b9554c5769a8f60 100644 (file)
--- a/opendaylight/forwardingrulesmanager/api/pom.xml
+++ b/opendaylight/forwardingrulesmanager/api/pom.xml
@@ -93,8 +93,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

-      <version>4.8.1</version>
-      <scope>test</scope>

     </dependency>
   </dependencies>
 </project>
     </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/forwardingrulesmanager/implementation/pom.xml b/opendaylight/forwardingrulesmanager/implementation/pom.xml
index 6a157b61a37a92a410746eddb40b16b40cf9712a..9009bc30bd1a6a4f409eaf8524d0d1312e0e3e10 100644 (file)
--- a/opendaylight/forwardingrulesmanager/implementation/pom.xml
+++ b/opendaylight/forwardingrulesmanager/implementation/pom.xml
@@ -148,8 +148,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

-      <version>4.8.1</version>
-      <scope>test</scope>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml
index 7ad701a2cd85d33ce4a00f97e2099ecc73d4e84a..37c3a10afba693b3dcf6387cef926fe1adc385e4 100644 (file)
--- a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml
+++ b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml
@@ -121,8 +121,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

-      <version>4.8.1</version>
-      <scope>test</scope>

     </dependency>
   </dependencies>
   <properties>
     </dependency>
   </dependencies>
   <properties>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 33ec9999d680d8177a35cdce0a250358368a9f04..89188fc33f6b4ef5139d5712608db95af6f32947 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -38,6 +38,7 @@
         <releaseplugin.version>2.3.2</releaseplugin.version>
         <guava.version>14.0.1</guava.version>
         <osgi.core.version>5.0.0</osgi.core.version>
         <releaseplugin.version>2.3.2</releaseplugin.version>
         <guava.version>14.0.1</guava.version>
         <osgi.core.version>5.0.0</osgi.core.version>

+        <junit.version>4.8.1</junit.version>

        </properties>
 
     <pluginRepositories>
        </properties>
 
     <pluginRepositories>


@@ -168,7 +169,8 @@
                        <dependency>
                                <groupId>junit</groupId>
                                <artifactId>junit</artifactId>
                        <dependency>
                                <groupId>junit</groupId>
                                <artifactId>junit</artifactId>

-                               <version>4.10</version>
+                               <version>${junit.version}</version>
+                <scope>test</scope>

                        </dependency>
                        <dependency>
                                <groupId>org.opendaylight.yangtools</groupId>
                        </dependency>
                        <dependency>
                                <groupId>org.opendaylight.yangtools</groupId>


@@ -205,14 +207,6 @@
 
        </dependencyManagement>
 
 
        </dependencyManagement>
 

-       <dependencies>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-                       <optional>true</optional>
-               </dependency>
-       </dependencies>

        <build>
         <pluginManagement>
           <plugins>
        <build>
         <pluginManagement>
           <plugins>

diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml
index 29ba03be625399c45d7af52ed631e31dfc9abc20..5975999e1a8d77c2daf5b9e61e40b04577471da7 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -114,5 +114,9 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
         </dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
         </dependency>

+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </dependency>

     </dependencies>
 </project>
     </dependencies>
 </project>

diff --git a/opendaylight/md-sal/sal-compability/pom.xml b/opendaylight/md-sal/sal-compability/pom.xml
index edb3b19f0c9b4da2960fb744368a898d194a4d51..172e81fa825215570cbad3ad947164b4909f4baa 100644 (file)
--- a/opendaylight/md-sal/sal-compability/pom.xml
+++ b/opendaylight/md-sal/sal-compability/pom.xml
@@ -44,5 +44,9 @@
                        <artifactId>guava</artifactId>
                        <version>14.0.1</version>
                </dependency>
                        <artifactId>guava</artifactId>
                        <version>14.0.1</version>
                </dependency>

+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </dependency>

        </dependencies>
 </project>
        </dependencies>
 </project>

diff --git a/opendaylight/protocol_plugins/openflow/pom.xml b/opendaylight/protocol_plugins/openflow/pom.xml
index f3bdacc09cc2b55d0f1bba64a040f7c91ab7468d..d52b7211e817834f90a8e57d74fdeae271aeec87 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/pom.xml
+++ b/opendaylight/protocol_plugins/openflow/pom.xml
@@ -84,8 +84,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

-      <version>4.8.1</version>
-      <scope>test</scope>

     </dependency>
   </dependencies>
 </project>
     </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/protocol_plugins/stub/pom.xml b/opendaylight/protocol_plugins/stub/pom.xml
index 2c501ac4801cefad4ae748a4c0b8651b0a7ef840..2457ddeb67d779fbb171553371a341e1e5617c8d 100644 (file)
--- a/opendaylight/protocol_plugins/stub/pom.xml
+++ b/opendaylight/protocol_plugins/stub/pom.xml
@@ -62,8 +62,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

-      <version>4.8.1</version>
-      <scope>test</scope>

     </dependency>
   </dependencies>
 </project>
     </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/routing/dijkstra_implementation/pom.xml b/opendaylight/routing/dijkstra_implementation/pom.xml
index ee419b71b05706db16755e99e297fe03cd81dd3e..1c710e7be78d28dc90eb40df860ad20cc251fb96 100644 (file)
--- a/opendaylight/routing/dijkstra_implementation/pom.xml
+++ b/opendaylight/routing/dijkstra_implementation/pom.xml
@@ -79,8 +79,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

-      <version>4.8.1</version>
-      <scope>test</scope>

     </dependency>
   </dependencies>
 </project>
     </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/sal/api/pom.xml b/opendaylight/sal/api/pom.xml
index fcb6d16c20d3a65de42a0f316441c6b165da2f20..87059531d294130d090cdd9188ace90ccecadc20 100644 (file)
--- a/opendaylight/sal/api/pom.xml
+++ b/opendaylight/sal/api/pom.xml
@@ -61,8 +61,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

-      <version>4.8.1</version>
-      <scope>test</scope>

     </dependency>
   </dependencies>
 </project>
     </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/sal/connection/api/pom.xml b/opendaylight/sal/connection/api/pom.xml
index d66042cc7124753bc5fb946e889b2bdb498fa87e..d60e7abe70874e75f582aa9b672c0fa23758415c 100644 (file)
--- a/opendaylight/sal/connection/api/pom.xml
+++ b/opendaylight/sal/connection/api/pom.xml
@@ -55,8 +55,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

-      <version>4.8.1</version>
-      <scope>test</scope>

     </dependency>
   </dependencies>
 </project>
     </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/samples/simpleforwarding/pom.xml b/opendaylight/samples/simpleforwarding/pom.xml
index f6dd2bc1466732806757fa55e9b45a20beb54bd2..ac9d20b031c091b0d79f717a1f96c32067e8ea00 100644 (file)
--- a/opendaylight/samples/simpleforwarding/pom.xml
+++ b/opendaylight/samples/simpleforwarding/pom.xml
@@ -82,8 +82,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

-      <version>4.8.1</version>
-      <scope>test</scope>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/web/root/pom.xml b/opendaylight/web/root/pom.xml
index 6bc2029426cbc3b996b771361d8d8bbb924d6ff6..5024deea9360d104f26bcc0c7ff9492df9e1d31b 100644 (file)
--- a/opendaylight/web/root/pom.xml
+++ b/opendaylight/web/root/pom.xml
@@ -133,8 +133,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

-      <version>4.8.1</version>
-      <scope>test</scope>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.thirdparty</groupId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.thirdparty</groupId>