Declare junit version and use junit dependencyManagement section. 81/1481/3
authorAlissa Bonas <abonas@redhat.com>
Sun, 29 Sep 2013 11:52:50 +0000 (14:52 +0300)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 30 Sep 2013 10:44:28 +0000 (10:44 +0000)
Change-Id: Ic290c0055ea0b3385d92a493ddc42decc0a4b12f
Signed-off-by: Alissa Bonas <abonas@redhat.com>
17 files changed:
opendaylight/appauth/pom.xml
opendaylight/commons/concepts/pom.xml
opendaylight/commons/opendaylight/pom.xml
opendaylight/forwarding/staticrouting/pom.xml
opendaylight/forwardingrulesmanager/api/pom.xml
opendaylight/forwardingrulesmanager/implementation/pom.xml
opendaylight/forwardingrulesmanager/integrationtest/pom.xml
opendaylight/md-sal/pom.xml
opendaylight/md-sal/sal-binding-broker/pom.xml
opendaylight/md-sal/sal-compability/pom.xml
opendaylight/protocol_plugins/openflow/pom.xml
opendaylight/protocol_plugins/stub/pom.xml
opendaylight/routing/dijkstra_implementation/pom.xml
opendaylight/sal/api/pom.xml
opendaylight/sal/connection/api/pom.xml
opendaylight/samples/simpleforwarding/pom.xml
opendaylight/web/root/pom.xml

index fc6a134..2cfa45c 100644 (file)
@@ -61,8 +61,6 @@
         <dependency>
           <groupId>junit</groupId>
           <artifactId>junit</artifactId>
-          <version>4.8.1</version>
-          <scope>test</scope>
         </dependency>
     </dependencies>
 </project>
index 1ea37de..87fadfe 100644 (file)
@@ -56,8 +56,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
index dfd0ce4..46ccf33 100644 (file)
     <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>
 
+ <dependencyManagement>
+     <dependencies>
+         <dependency>
+             <groupId>junit</groupId>
+              <artifactId>junit</artifactId>
+              <version>${junit.version}</version>
+              <scope>test</scope>
+         </dependency>
+     </dependencies>
+ </dependencyManagement>
+
   <pluginRepositories>
     <pluginRepository>
       <id>central</id>
index 1e22a7c..bee0da2 100644 (file)
@@ -80,8 +80,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
index 94972e9..d46d1d4 100644 (file)
@@ -93,8 +93,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
index 6a157b6..9009bc3 100644 (file)
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
index 7ad701a..37c3a10 100644 (file)
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
   <properties>
index 33ec999..89188fc 100644 (file)
@@ -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>
+        <junit.version>4.8.1</junit.version>
        </properties>
 
     <pluginRepositories>
                        <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>
 
        </dependencyManagement>
 
-       <dependencies>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-                       <optional>true</optional>
-               </dependency>
-       </dependencies>
        <build>
         <pluginManagement>
           <plugins>
index 29ba03b..5975999 100644 (file)
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
         </dependency>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </dependency>
     </dependencies>
 </project>
index edb3b19..172e81f 100644 (file)
@@ -44,5 +44,9 @@
                        <artifactId>guava</artifactId>
                        <version>14.0.1</version>
                </dependency>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </dependency>
        </dependencies>
 </project>
index f3bdacc..d52b721 100644 (file)
@@ -84,8 +84,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
index 2c501ac..2457dde 100644 (file)
@@ -62,8 +62,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
index ee419b7..1c710e7 100644 (file)
@@ -79,8 +79,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
index fcb6d16..8705953 100644 (file)
@@ -61,8 +61,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
index d66042c..d60e7ab 100644 (file)
@@ -55,8 +55,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
index f6dd2bc..ac9d20b 100644 (file)
@@ -82,8 +82,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
index 6bc2029..5024dee 100644 (file)
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.thirdparty</groupId>