Be more strict in ensuring compilation with scala 2.11

2 files changed, 5 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6fa51cf86dd8..3c8d2c65db38 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Jan  5 12:07:03 UTC 2016
+# Tue Jan  5 15:43:48 UTC 2016
 pkgbase = apache-spark
 	pkgdesc = fast and general engine for large-scale data processing
 	pkgver = 1.6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://spark.apache.org
 	install = apache-spark.install
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index c5664d642b7c..d3b8be6b334d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=apache-spark
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="fast and general engine for large-scale data processing"
 arch=('any')
 url="http://spark.apache.org"
@@ -33,9 +33,9 @@ build() {
 
         export MAVEN_OPTS="-Xmx2g -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=512m"
 
-        dev/change-version-to-2.11.sh
+        dev/change-scala-version.sh 2.11
 
-        JAVA_HOME=/usr/lib/jvm/default-runtime ./make-distribution.sh -Dscala-2.11 -DskipTests -Dmaven.repo.local=/tmp
+        JAVA_HOME=/usr/lib/jvm/default-runtime ./make-distribution.sh -Pscala-2.11  -DskipTests -Dmaven.repo.local=/tmp -DautoVersionSubmodules=true -U -Djline.version=2.13 -Djline.groupid=jline
 }
 
 package() {