Declare junit version and use junit dependencyManagement section.

[controller.git] / opendaylight / md-sal / pom.xml

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 1bf9a676b8feb1f316b25f9ed6fc87024f737469..89188fc33f6b4ef5139d5712608db95af6f32947 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -34,10 +34,11 @@
                <slf4j.version>1.7.2</slf4j.version>
                <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
                <yang.version>0.5.8-SNAPSHOT</yang.version>
-               <maven.bundle.version>2.4.0</maven.bundle.version>
+               <bundle.plugin.version>2.3.7</bundle.plugin.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>
@@ -122,7 +123,13 @@
                <repository>
                        <id>jboss.releases</id>
                        <name>jboss.releases</name>
-                       <url>${nexusproxy}/repositories/jboss.releases/</url>
+            <url>${nexusproxy}/repositories/jboss.releases/</url>
+            <snapshots>
+              <enabled>false</enabled>
+            </snapshots>
+            <releases>
+              <enabled>true</enabled>
+            </releases>
                </repository>
                <!-- OpenDayLight Released artifact -->
                
@@ -162,7 +169,8 @@
                        <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>
@@ -199,14 +207,6 @@
 
        </dependencyManagement>
 
-       <dependencies>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-                       <optional>true</optional>
-               </dependency>
-       </dependencies>
        <build>
         <pluginManagement>
           <plugins>
@@ -221,7 +221,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${maven.bundle.version}</version>
+                               <version>${bundle.plugin.version}</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <instructions>