From 77cbb9cd1fc983b6b2c6cb6bf17e16a964c987d3 Mon Sep 17 00:00:00 2001 From: Alissa Bonas Date: Sun, 29 Sep 2013 14:52:50 +0300 Subject: [PATCH] Declare junit version and use junit dependencyManagement section. Change-Id: Ic290c0055ea0b3385d92a493ddc42decc0a4b12f Signed-off-by: Alissa Bonas --- opendaylight/appauth/pom.xml | 2 -- opendaylight/commons/concepts/pom.xml | 2 -- opendaylight/commons/opendaylight/pom.xml | 12 ++++++++++++ opendaylight/forwarding/staticrouting/pom.xml | 2 -- opendaylight/forwardingrulesmanager/api/pom.xml | 2 -- .../forwardingrulesmanager/implementation/pom.xml | 2 -- .../forwardingrulesmanager/integrationtest/pom.xml | 2 -- opendaylight/md-sal/pom.xml | 12 +++--------- opendaylight/md-sal/sal-binding-broker/pom.xml | 4 ++++ opendaylight/md-sal/sal-compability/pom.xml | 4 ++++ opendaylight/protocol_plugins/openflow/pom.xml | 2 -- opendaylight/protocol_plugins/stub/pom.xml | 2 -- opendaylight/routing/dijkstra_implementation/pom.xml | 2 -- opendaylight/sal/api/pom.xml | 2 -- opendaylight/sal/connection/api/pom.xml | 2 -- opendaylight/samples/simpleforwarding/pom.xml | 2 -- opendaylight/web/root/pom.xml | 2 -- 17 files changed, 23 insertions(+), 35 deletions(-) diff --git a/opendaylight/appauth/pom.xml b/opendaylight/appauth/pom.xml index fc6a134882..2cfa45cc84 100644 --- a/opendaylight/appauth/pom.xml +++ b/opendaylight/appauth/pom.xml @@ -61,8 +61,6 @@ junit junit - 4.8.1 - test diff --git a/opendaylight/commons/concepts/pom.xml b/opendaylight/commons/concepts/pom.xml index 1ea37de77a..87fadfe85e 100644 --- a/opendaylight/commons/concepts/pom.xml +++ b/opendaylight/commons/concepts/pom.xml @@ -56,8 +56,6 @@ junit junit - 4.8.1 - test diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index dfd0ce463a..46ccf33b51 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -59,8 +59,20 @@ 0.5.3.201107060350 1.3.1 2.3.7 + 4.8.1 + + + + junit + junit + ${junit.version} + test + + + + central diff --git a/opendaylight/forwarding/staticrouting/pom.xml b/opendaylight/forwarding/staticrouting/pom.xml index 1e22a7c8e0..bee0da2496 100644 --- a/opendaylight/forwarding/staticrouting/pom.xml +++ b/opendaylight/forwarding/staticrouting/pom.xml @@ -80,8 +80,6 @@ junit junit - 4.8.1 - test org.opendaylight.controller diff --git a/opendaylight/forwardingrulesmanager/api/pom.xml b/opendaylight/forwardingrulesmanager/api/pom.xml index 94972e9fe3..d46d1d4787 100644 --- a/opendaylight/forwardingrulesmanager/api/pom.xml +++ b/opendaylight/forwardingrulesmanager/api/pom.xml @@ -93,8 +93,6 @@ junit junit - 4.8.1 - test diff --git a/opendaylight/forwardingrulesmanager/implementation/pom.xml b/opendaylight/forwardingrulesmanager/implementation/pom.xml index 6a157b61a3..9009bc30bd 100644 --- a/opendaylight/forwardingrulesmanager/implementation/pom.xml +++ b/opendaylight/forwardingrulesmanager/implementation/pom.xml @@ -148,8 +148,6 @@ junit junit - 4.8.1 - test org.opendaylight.controller diff --git a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml index 7ad701a2cd..37c3a10afb 100644 --- a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml +++ b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml @@ -121,8 +121,6 @@ junit junit - 4.8.1 - test diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 33ec9999d6..89188fc33f 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -38,6 +38,7 @@ 2.3.2 14.0.1 5.0.0 + 4.8.1 @@ -168,7 +169,8 @@ junit junit - 4.10 + ${junit.version} + test org.opendaylight.yangtools @@ -205,14 +207,6 @@ - - - junit - junit - test - true - - diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml index 29ba03be62..5975999e1a 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -114,5 +114,9 @@ org.mockito mockito-all + + junit + junit + diff --git a/opendaylight/md-sal/sal-compability/pom.xml b/opendaylight/md-sal/sal-compability/pom.xml index edb3b19f0c..172e81fa82 100644 --- a/opendaylight/md-sal/sal-compability/pom.xml +++ b/opendaylight/md-sal/sal-compability/pom.xml @@ -44,5 +44,9 @@ guava 14.0.1 + + junit + junit + diff --git a/opendaylight/protocol_plugins/openflow/pom.xml b/opendaylight/protocol_plugins/openflow/pom.xml index f3bdacc09c..d52b7211e8 100644 --- a/opendaylight/protocol_plugins/openflow/pom.xml +++ b/opendaylight/protocol_plugins/openflow/pom.xml @@ -84,8 +84,6 @@ junit junit - 4.8.1 - test diff --git a/opendaylight/protocol_plugins/stub/pom.xml b/opendaylight/protocol_plugins/stub/pom.xml index 2c501ac480..2457ddeb67 100644 --- a/opendaylight/protocol_plugins/stub/pom.xml +++ b/opendaylight/protocol_plugins/stub/pom.xml @@ -62,8 +62,6 @@ junit junit - 4.8.1 - test diff --git a/opendaylight/routing/dijkstra_implementation/pom.xml b/opendaylight/routing/dijkstra_implementation/pom.xml index ee419b71b0..1c710e7be7 100644 --- a/opendaylight/routing/dijkstra_implementation/pom.xml +++ b/opendaylight/routing/dijkstra_implementation/pom.xml @@ -79,8 +79,6 @@ junit junit - 4.8.1 - test diff --git a/opendaylight/sal/api/pom.xml b/opendaylight/sal/api/pom.xml index fcb6d16c20..87059531d2 100644 --- a/opendaylight/sal/api/pom.xml +++ b/opendaylight/sal/api/pom.xml @@ -61,8 +61,6 @@ junit junit - 4.8.1 - test diff --git a/opendaylight/sal/connection/api/pom.xml b/opendaylight/sal/connection/api/pom.xml index d66042cc71..d60e7abe70 100644 --- a/opendaylight/sal/connection/api/pom.xml +++ b/opendaylight/sal/connection/api/pom.xml @@ -55,8 +55,6 @@ junit junit - 4.8.1 - test diff --git a/opendaylight/samples/simpleforwarding/pom.xml b/opendaylight/samples/simpleforwarding/pom.xml index f6dd2bc146..ac9d20b031 100644 --- a/opendaylight/samples/simpleforwarding/pom.xml +++ b/opendaylight/samples/simpleforwarding/pom.xml @@ -82,8 +82,6 @@ junit junit - 4.8.1 - test org.opendaylight.controller diff --git a/opendaylight/web/root/pom.xml b/opendaylight/web/root/pom.xml index 6bc2029426..5024deea93 100644 --- a/opendaylight/web/root/pom.xml +++ b/opendaylight/web/root/pom.xml @@ -133,8 +133,6 @@ junit junit - 4.8.1 - test org.opendaylight.controller.thirdparty -- 2.36.6