Bump scala to 2.12.5

http://www.scala-lang.org/news/2.12.5

Change-Id: I6a9fddc5ca58822367c146ec2d2cc547e61d7e7b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/odl-akka-scala-2.12/src/main/history/dependencies.xml b/features/odl-akka-scala-2.12/src/main/history/dependencies.xml
index 4d798f9c07c094de88a941227c01086a5910491c..0c827665fe46bc9374d60353c390ebabc1798f78 100644 (file)
--- a/features/odl-akka-scala-2.12/src/main/history/dependencies.xml
+++ b/features/odl-akka-scala-2.12/src/main/history/dependencies.xml
@@ -2,7 +2,7 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-akka-scala-2.12">
     <feature version="0.0.0">
         <bundle>mvn:org.scala-lang.modules/scala-java8-compat_2.12/0.8.0</bundle>
-        <bundle>mvn:org.scala-lang/scala-library/2.12.4</bundle>
-        <bundle>mvn:org.scala-lang/scala-reflect/2.12.4</bundle>
+        <bundle>mvn:org.scala-lang/scala-library/2.12.5</bundle>
+        <bundle>mvn:org.scala-lang/scala-reflect/2.12.5</bundle>
     </feature>
 </features>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 4695d533416e8c60eae435ec9ff891f94b5a163f..8db0660d52ec11df05f635b064d301d2b47781ea 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -840,12 +840,12 @@
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-library</artifactId>
-        <version>2.12.4</version>
+        <version>2.12.5</version>
       </dependency>
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-reflect</artifactId>
-        <version>2.12.4</version>
+        <version>2.12.5</version>
       </dependency>
 
       <!-- LMAX Disruptor -->