Pull in junit-dep from odlparent

This also upgrades junit from 4.8.1 to 4.11.

Change-Id: I751dbdfbaae9fc9e6fb89acfc6751bd1c9dbf20b
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 22616231c85097c32a117b8ece442231844e2ea0..b29d5a72e5b2f63a017a3ea6ce90a3b94c59b69a 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -440,7 +440,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
-      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <!-- dependency for opendaylight-karaf-empty for use by testing -->

diff --git a/features/test/pom.xml b/features/test/pom.xml
index f9790542311e79cdad45129901905c224d464cb8..a4e5fc2d96403561a3b9b5e067d1c72059712089 100644 (file)
--- a/features/test/pom.xml
+++ b/features/test/pom.xml
@@ -40,7 +40,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
-      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <!-- dependency for opendaylight-karaf-empty for use by testing -->

diff --git a/pom.xml b/pom.xml
index 4919f4d73af53a860631c35b72a94c53b6c73b7b..9ab1b8a62f1f2f6eeb46d76bd9caf8589d7fa717 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,6 @@
     <feature.vpnservice.version>0.2.0-SNAPSHOT</feature.vpnservice.version>
     <feature.vtn-manager.version>0.4.0-SNAPSHOT</feature.vtn-manager.version>
     <feature.yangtools.version>0.8.0-SNAPSHOT</feature.yangtools.version>
-    <junit.version>4.8.1</junit.version>
     <karaf.branding.version>1.2.0-SNAPSHOT</karaf.branding.version>
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>