Repository: incubator-systemml Updated Branches: refs/heads/master 97dee8fba -> 90f5cbba4
[SYSTEMML-868] Switch default to scala 2.10 Changed default scala properties to 2.10 and added scala-2.11 profile. Closes #219 Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/90f5cbba Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/90f5cbba Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/90f5cbba Branch: refs/heads/master Commit: 90f5cbba406af6f95ac011f88d62f0e2955d4384 Parents: 97dee8f Author: Glenn Weidner <[email protected]> Authored: Thu Aug 25 15:13:42 2016 -0700 Committer: Glenn Weidner <[email protected]> Committed: Thu Aug 25 15:13:42 2016 -0700 ---------------------------------------------------------------------- pom.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/90f5cbba/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a4c66a1..b6e51e2 100644 --- a/pom.xml +++ b/pom.xml @@ -66,8 +66,8 @@ <hadoop.version>2.4.1</hadoop.version> <antlr.version>4.3</antlr.version> <spark.version>1.4.1</spark.version> - <scala.version>2.11.8</scala.version> - <scala.binary.version>2.11</scala.binary.version> + <scala.version>2.10.5</scala.version> + <scala.binary.version>2.10</scala.binary.version> <scala.test.version>2.2.6</scala.test.version> <!-- OS-specific JVM arguments for running integration tests --> <integrationTestExtraJVMArgs /> @@ -490,6 +490,14 @@ <scala.binary.version>2.10</scala.binary.version> </properties> </profile> + + <profile> + <id>scala-2.11</id> + <properties> + <scala.version>2.11.8</scala.version> + <scala.binary.version>2.11</scala.binary.version> + </properties> + </profile> <profile> <!-- Profile for Windows builds. Not currently needed, but might be needed
