BUG-4963: Bump scala to 2.11.7 52/30252/7
authorTomas Cere <tcere@cisco.com>
Tue, 24 Nov 2015 08:25:25 +0000 (09:25 +0100)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 19 Jan 2016 12:48:35 +0000 (12:48 +0000)
With 2.10 i was experiencing random freezes
when installing features that used it in karaf.
Bumping to 2.11 doesn't seem to break anything
nor has any downsides.

We have scala.micro.version defined so use it instead of the
hardcoded micro version

Change-Id: I2a445790980d0da3152db3664294fd789f8272c7
Signed-off-by: Tomas Cere <tcere@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
features/akka/pom.xml
opendaylight/commons/opendaylight/pom.xml

index ece109c..b6d4501 100644 (file)
@@ -26,7 +26,7 @@
       <karaf.empty.version>1.7.0-SNAPSHOT</karaf.empty.version>
       <surefire.version>2.16</surefire.version>
       <akka.version>2.3.14</akka.version>
-      <scala.version>2.10</scala.version>
+      <scala.version>2.11</scala.version>
    </properties>
     <dependencyManagement>
         <dependencies>
index f7ab2d9..12facdb 100644 (file)
     <samples.loadbalancer.northbound.version>0.7.0-SNAPSHOT</samples.loadbalancer.northbound.version>
     <samples.simpleforwarding.version>0.7.0-SNAPSHOT</samples.simpleforwarding.version>
     <sanitytest.version>0.7.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.7.0-SNAPSHOT</security.version>
     <karaf.security.version>0.7.0-SNAPSHOT</karaf.security.version>
     <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
       <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>