You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gr...@apache.org on 2017/05/31 20:57:20 UTC

[5/5] flink git commit: [FLINK-6332] [build] Upgrade Scala versions

[FLINK-6332] [build] Upgrade Scala versions

Upgrade to the last maintenance releases of Scala 2.10 and 2.11.

This closes #3957


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/49a58fdb
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/49a58fdb
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/49a58fdb

Branch: refs/heads/master
Commit: 49a58fdbb4ac80a0c0d34e42803ee6d1ca26b77a
Parents: 52efdcb
Author: Greg Hogan <co...@greghogan.com>
Authored: Fri May 19 13:05:55 2017 -0400
Committer: Greg Hogan <co...@greghogan.com>
Committed: Wed May 31 16:56:29 2017 -0400

----------------------------------------------------------------------
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/49a58fdb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1b6307e..ae92be9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,9 +97,9 @@ under the License.
 		<guava.version>18.0</guava.version>
 		<akka.version>2.3-custom</akka.version>
 		<java.version>1.7</java.version>
-		<scala.macros.version>2.0.1</scala.macros.version>
+		<scala.macros.version>2.1.0</scala.macros.version>
 		<!-- Default scala versions, may be overwritten by build profiles -->
-		<scala.version>2.10.4</scala.version>
+		<scala.version>2.10.6</scala.version>
 		<scala.binary.version>2.10</scala.binary.version>
 		<chill.version>0.7.4</chill.version>
 		<asm.version>5.0.4</asm.version>
@@ -488,7 +488,7 @@ under the License.
 				</property>
 			</activation>
 			<properties>
-				<scala.version>2.11.7</scala.version>
+				<scala.version>2.11.11</scala.version>
 				<scala.binary.version>2.11</scala.binary.version>
 			</properties>
 		</profile>