Skip to content

[WIP][DO-NOT-MERGE] Test the -Yrepl-class-based changes #27681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dwijnand wants to merge 5 commits into from
Closed

[WIP][DO-NOT-MERGE] Test the -Yrepl-class-based changes #27681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06bf180
Test the -Yrepl-class-based changes
dwijnand Feb 24, 2020
9d8a475
Use the old Scala distribution
dwijnand Feb 24, 2020
e0db793
Help the scala-integration be used
dwijnand Feb 24, 2020
7eaea97
Bump scala version in dev/deps
dwijnand Feb 24, 2020
cfc612d
Add scala-integration to the sbt build too
dwijnand Feb 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/mvn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
6 changes: 3 additions & 3 deletions dev/deps/spark-deps-hadoop-2.7-hive-1.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions dev/deps/spark-deps-hadoop-2.7-hive-2.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions dev/deps/spark-deps-hadoop-3.2-hive-2.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 17 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
<commons.math3.version>3.4.1</commons.math3.version>
<!-- managed up from 3.2.1 for SPARK-11652 -->
<commons.collections.version>3.2.2</commons.collections.version>
<scala.version>2.12.10</scala.version>
<scala.version>2.12.11-bin-4c726db</scala.version>
<scala.binary.version>2.12</scala.binary.version>
<scalafmt.parameters>--test</scalafmt.parameters>
<!-- for now, not running scalafmt as part of default verify pipeline -->
Expand Down Expand Up @@ -275,6 +275,16 @@
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>scala-integration</id>
<url>https://scala-ci.typesafe.com/artifactory/scala-integration</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
Expand Down Expand Up @@ -3176,6 +3186,12 @@
</repositories>
</profile>

<profile>
<id>scala-integration</id>
<repositories>
</repositories>
</profile>

<!--
These empty profiles are available in some sub-modules. Declare them here so that
maven does not complain when they're provided on the command line for a sub-module
Expand Down
1 change: 1 addition & 0 deletions project/SparkBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ object SparkBuild extends PomBuild {
// See https://storage-download.googleapis.com/maven-central/index.html for more info.
"gcs-maven-central-mirror" at "https://maven-central.storage-download.googleapis.com/repos/central/data/",
DefaultMavenRepository,
"scala-integration" at "https://scala-ci.typesafe.com/artifactory/scala-integration/",
Resolver.mavenLocal,
Resolver.file("local", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
),
Expand Down