diff --git a/build/mvn b/build/mvn index 3628be9880253..b171e2235fdd2 100755 --- a/build/mvn +++ b/build/mvn @@ -126,7 +126,7 @@ install_zinc() { install_scala() { # determine the Scala version used in Spark local scala_binary_version=`grep "scala.binary.version" "${_DIR}/../pom.xml" | head -n1 | awk -F '[<>]' '{print $3}'` - local scala_version=`grep "scala.version" "${_DIR}/../pom.xml" | grep ${scala_binary_version} | head -n1 | awk -F '[<>]' '{print $3}'` + local scala_version=2.12.10 local scala_bin="${_DIR}/scala-${scala_version}/bin/scala" local TYPESAFE_MIRROR=${TYPESAFE_MIRROR:-https://downloads.lightbend.com} diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-1.2 b/dev/deps/spark-deps-hadoop-2.7-hive-1.2 index 534ac39e0c46e..9c4d78245a51f 100644 --- a/dev/deps/spark-deps-hadoop-2.7-hive-1.2 +++ b/dev/deps/spark-deps-hadoop-2.7-hive-1.2 @@ -177,10 +177,10 @@ protobuf-java/2.5.0//protobuf-java-2.5.0.jar py4j/0.10.8.1//py4j-0.10.8.1.jar pyrolite/4.30//pyrolite-4.30.jar scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar -scala-compiler/2.12.10//scala-compiler-2.12.10.jar -scala-library/2.12.10//scala-library-2.12.10.jar +scala-compiler/2.12.11-bin-4c726db//scala-compiler-2.12.11-bin-4c726db.jar +scala-library/2.12.11-bin-4c726db//scala-library-2.12.11-bin-4c726db.jar scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar -scala-reflect/2.12.10//scala-reflect-2.12.10.jar +scala-reflect/2.12.11-bin-4c726db//scala-reflect-2.12.11-bin-4c726db.jar scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar shapeless_2.12/2.3.3//shapeless_2.12-2.3.3.jar shims/0.7.45//shims-0.7.45.jar diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 index c50cf96dc9065..08bc1a45d1b8e 100644 --- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 @@ -191,10 +191,10 @@ protobuf-java/2.5.0//protobuf-java-2.5.0.jar py4j/0.10.8.1//py4j-0.10.8.1.jar pyrolite/4.30//pyrolite-4.30.jar scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar -scala-compiler/2.12.10//scala-compiler-2.12.10.jar -scala-library/2.12.10//scala-library-2.12.10.jar +scala-compiler/2.12.11-bin-4c726db//scala-compiler-2.12.11-bin-4c726db.jar +scala-library/2.12.11-bin-4c726db//scala-library-2.12.11-bin-4c726db.jar scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar -scala-reflect/2.12.10//scala-reflect-2.12.10.jar +scala-reflect/2.12.11-bin-4c726db//scala-reflect-2.12.11-bin-4c726db.jar scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar shapeless_2.12/2.3.3//shapeless_2.12-2.3.3.jar shims/0.7.45//shims-0.7.45.jar diff --git a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 index c37ce7fab36f6..c6a7f76b5a21f 100644 --- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3 @@ -207,10 +207,10 @@ py4j/0.10.8.1//py4j-0.10.8.1.jar pyrolite/4.30//pyrolite-4.30.jar re2j/1.1//re2j-1.1.jar scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar -scala-compiler/2.12.10//scala-compiler-2.12.10.jar -scala-library/2.12.10//scala-library-2.12.10.jar +scala-compiler/2.12.11-bin-4c726db//scala-compiler-2.12.11-bin-4c726db.jar +scala-library/2.12.11-bin-4c726db//scala-library-2.12.11-bin-4c726db.jar scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar -scala-reflect/2.12.10//scala-reflect-2.12.10.jar +scala-reflect/2.12.11-bin-4c726db//scala-reflect-2.12.11-bin-4c726db.jar scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar shapeless_2.12/2.3.3//shapeless_2.12-2.3.3.jar shims/0.7.45//shims-0.7.45.jar diff --git a/pom.xml b/pom.xml index 925fa28a291a4..a7ecc1f209d44 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ 3.4.1 3.2.2 - 2.12.10 + 2.12.11-bin-4c726db 2.12 --test @@ -275,6 +275,16 @@ false + + scala-integration + https://scala-ci.typesafe.com/artifactory/scala-integration + + true + + + false + + @@ -3176,6 +3186,12 @@ + + scala-integration + + + +