BUG-4963: Bump scala to 2.11.7

[controller.git] / opendaylight / commons / opendaylight / pom.xml

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index d2b2d1d4d4937ecf7f0cf73096d464b96ed4f6a6..d39ae0a3254d9f1bf42ee91d0f90753a70805e3b 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -119,8 +119,8 @@
     <samples.loadbalancer.northbound.version>0.6.0-SNAPSHOT</samples.loadbalancer.northbound.version>
     <samples.simpleforwarding.version>0.6.0-SNAPSHOT</samples.simpleforwarding.version>
     <sanitytest.version>0.6.0-SNAPSHOT</sanitytest.version>
-    <scala.version>2.10</scala.version>
-    <scala.micro.version>4</scala.micro.version>
+    <scala.version>2.11</scala.version>
+    <scala.micro.version>7</scala.micro.version>
     <security.version>0.6.0-SNAPSHOT</security.version>
     <karaf.security.version>0.6.0-SNAPSHOT</karaf.security.version>
     <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
@@ -784,12 +784,12 @@
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-library</artifactId>
-        <version>${scala.version}.1</version>
+        <version>${scala.version}.${scala.micro.version}</version>
       </dependency>
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-reflect</artifactId>
-        <version>${scala.version}.1</version>
+        <version>${scala.version}.${scala.micro.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>