diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 836253558cef0..b327ab7a6c7fc 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -1,7 +1,7 @@
+ "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+ "https://checkstyle.org/dtds/configuration_1_3.dtd">
+ "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+ "https://checkstyle.org/dtds/configuration_1_3.dtd">
diff --git a/external/kafka-0-10/pom.xml b/external/kafka-0-10/pom.xml
index ea18b7e035915..0cd49480314d5 100644
--- a/external/kafka-0-10/pom.xml
+++ b/external/kafka-0-10/pom.xml
@@ -20,12 +20,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../../pom.xml
- spark-streaming-kafka-0-10_2.12
+ spark-streaming-kafka-0-10_2.11
streaming-kafka-0-10
diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml
index 0ce922349ea66..0bf4c265939e7 100644
--- a/external/kinesis-asl-assembly/pom.xml
+++ b/external/kinesis-asl-assembly/pom.xml
@@ -20,12 +20,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../../pom.xml
- spark-streaming-kinesis-asl-assembly_2.12
+ spark-streaming-kinesis-asl-assembly_2.11
jar
Spark Project Kinesis Assembly
http://spark.apache.org/
diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml
index 7d69764b77de7..0aef25329db99 100644
--- a/external/kinesis-asl/pom.xml
+++ b/external/kinesis-asl/pom.xml
@@ -19,13 +19,13 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../../pom.xml
- spark-streaming-kinesis-asl_2.12
+ spark-streaming-kinesis-asl_2.11
jar
Spark Kinesis Integration
diff --git a/external/spark-ganglia-lgpl/pom.xml b/external/spark-ganglia-lgpl/pom.xml
index a23d255f9187c..35a55b70baf33 100644
--- a/external/spark-ganglia-lgpl/pom.xml
+++ b/external/spark-ganglia-lgpl/pom.xml
@@ -19,13 +19,13 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../../pom.xml
- spark-ganglia-lgpl_2.12
+ spark-ganglia-lgpl_2.11
jar
Spark Ganglia Integration
diff --git a/graphx/pom.xml b/graphx/pom.xml
index 444568a03d6c7..22bc148e068a5 100644
--- a/graphx/pom.xml
+++ b/graphx/pom.xml
@@ -20,12 +20,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../pom.xml
- spark-graphx_2.12
+ spark-graphx_2.11
graphx
diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml
index fb343f3fb937d..0335724c36f55 100644
--- a/hadoop-cloud/pom.xml
+++ b/hadoop-cloud/pom.xml
@@ -21,12 +21,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../pom.xml
- spark-hadoop-cloud_2.12
+ spark-hadoop-cloud_2.11
jar
Spark Project Cloud Integration
diff --git a/launcher/pom.xml b/launcher/pom.xml
index 130519d6c3b08..a833a35399918 100644
--- a/launcher/pom.xml
+++ b/launcher/pom.xml
@@ -21,12 +21,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../pom.xml
- spark-launcher_2.12
+ spark-launcher_2.11
jar
Spark Project Launcher
http://spark.apache.org/
diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml
index 2eab868ac0dc8..ec5f9b0e92c8f 100644
--- a/mllib-local/pom.xml
+++ b/mllib-local/pom.xml
@@ -20,12 +20,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../pom.xml
- spark-mllib-local_2.12
+ spark-mllib-local_2.11
mllib-local
diff --git a/mllib/pom.xml b/mllib/pom.xml
index 0b17345064a71..17ddb87c4d86a 100644
--- a/mllib/pom.xml
+++ b/mllib/pom.xml
@@ -20,12 +20,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../pom.xml
- spark-mllib_2.12
+ spark-mllib_2.11
mllib
diff --git a/pom.xml b/pom.xml
index d9899108fb5e9..bce60fc97d0ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
18
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
pom
Spark Project Parent POM
@@ -170,8 +170,8 @@
3.6.1
3.2.2
- 2.12.7
- 2.12
+ 2.11.12
+ 2.11
1.9.13
2.9.7
1.1.7.2
@@ -2308,7 +2308,6 @@
-->
org.jboss.netty
org.codehaus.groovy
- *:*_2.11
*:*_2.10
true
@@ -3034,14 +3033,14 @@
- scala-2.12
+ scala-2.11
- scala-2.11
+ scala-2.12
- 2.11.12
- 2.11
+ 2.12.7
+ 2.12
@@ -3057,9 +3056,8 @@
-
- org.jboss.netty
- org.codehaus.groovy
+
+ *:*_2.11
*:*_2.10
diff --git a/project/MimaBuild.scala b/project/MimaBuild.scala
index 10c02103aeddb..79e6745977e5b 100644
--- a/project/MimaBuild.scala
+++ b/project/MimaBuild.scala
@@ -90,7 +90,7 @@ object MimaBuild {
val organization = "org.apache.spark"
val previousSparkVersion = "2.4.0"
val project = projectRef.project
- val fullId = "spark-" + project + "_2.12"
+ val fullId = "spark-" + project + "_2.11"
mimaDefaultSettings ++
Seq(mimaPreviousArtifacts := Set(organization % fullId % previousSparkVersion),
mimaBinaryIssueFilters ++= ignoredABIProblems(sparkHome, version.value))
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 639d642b78d2a..35108f1341858 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -96,15 +96,15 @@ object SparkBuild extends PomBuild {
}
Option(System.getProperty("scala.version"))
- .filter(_.startsWith("2.11"))
+ .filter(_.startsWith("2.12"))
.foreach { versionString =>
- System.setProperty("scala-2.11", "true")
+ System.setProperty("scala-2.12", "true")
}
- if (System.getProperty("scala-2.11") == "") {
+ if (System.getProperty("scala-2.12") == "") {
// To activate scala-2.10 profile, replace empty property value to non-empty value
// in the same way as Maven which handles -Dname as -Dname=true before executes build process.
// see: https://github.com/apache/maven/blob/maven-3.0.4/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java#L1082
- System.setProperty("scala-2.11", "true")
+ System.setProperty("scala-2.12", "true")
}
profiles
}
@@ -857,10 +857,10 @@ object TestSettings {
import BuildCommons._
private val scalaBinaryVersion =
- if (System.getProperty("scala-2.11") == "true") {
- "2.11"
- } else {
+ if (System.getProperty("scala-2.12") == "true") {
"2.12"
+ } else {
+ "2.11"
}
lazy val settings = Seq (
// Fork new JVMs for tests and set Java options for those
diff --git a/python/run-tests.py b/python/run-tests.py
index be5a60a28def6..f4eda6ee9ad06 100755
--- a/python/run-tests.py
+++ b/python/run-tests.py
@@ -60,7 +60,9 @@ def print_red(text):
LOGGER = logging.getLogger()
# Find out where the assembly jars are located.
-for scala in ["2.11", "2.12"]:
+# Later, add back 2.12 to this list:
+# for scala in ["2.11", "2.12"]:
+for scala in ["2.11"]:
build_dir = os.path.join(SPARK_HOME, "assembly", "target", "scala-" + scala)
if os.path.isdir(build_dir):
SPARK_DIST_CLASSPATH = os.path.join(build_dir, "jars", "*")
diff --git a/repl/pom.xml b/repl/pom.xml
index c7de67e41ca94..fa015b69d45d4 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -20,12 +20,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../pom.xml
- spark-repl_2.12
+ spark-repl_2.11
jar
Spark Project REPL
http://spark.apache.org/
diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml
index 8d594ee8f1478..b89ea383bf872 100644
--- a/resource-managers/kubernetes/core/pom.xml
+++ b/resource-managers/kubernetes/core/pom.xml
@@ -19,12 +19,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../../../pom.xml
- spark-kubernetes_2.12
+ spark-kubernetes_2.11
jar
Spark Project Kubernetes
diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml
index 17af0e03f2bbb..301b6fe8eee56 100644
--- a/resource-managers/kubernetes/integration-tests/pom.xml
+++ b/resource-managers/kubernetes/integration-tests/pom.xml
@@ -19,12 +19,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../../../pom.xml
- spark-kubernetes-integration-tests_2.12
+ spark-kubernetes-integration-tests_2.11
1.3.0
1.4.0
diff --git a/resource-managers/mesos/pom.xml b/resource-managers/mesos/pom.xml
index 7b3aad4d6ce35..9585bdfafdcf4 100644
--- a/resource-managers/mesos/pom.xml
+++ b/resource-managers/mesos/pom.xml
@@ -19,12 +19,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../../pom.xml
- spark-mesos_2.12
+ spark-mesos_2.11
jar
Spark Project Mesos
diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml
index d18df9955bb1f..e55b814be8465 100644
--- a/resource-managers/yarn/pom.xml
+++ b/resource-managers/yarn/pom.xml
@@ -19,12 +19,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../../pom.xml
- spark-yarn_2.12
+ spark-yarn_2.11
jar
Spark Project YARN
diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml
index 20cc5d03fbe52..16ecebf159c1f 100644
--- a/sql/catalyst/pom.xml
+++ b/sql/catalyst/pom.xml
@@ -21,12 +21,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../../pom.xml
- spark-catalyst_2.12
+ spark-catalyst_2.11
jar
Spark Project Catalyst
http://spark.apache.org/
diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index ac5f1fc923e7d..95e98c5444721 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -21,12 +21,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../../pom.xml
- spark-sql_2.12
+ spark-sql_2.11
jar
Spark Project SQL
http://spark.apache.org/
diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml
index 4a4629fae2706..55e051c3ed1be 100644
--- a/sql/hive-thriftserver/pom.xml
+++ b/sql/hive-thriftserver/pom.xml
@@ -21,12 +21,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../../pom.xml
- spark-hive-thriftserver_2.12
+ spark-hive-thriftserver_2.11
jar
Spark Project Hive Thrift Server
http://spark.apache.org/
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index 9642e5e3d035a..114a108ba2752 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -21,12 +21,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../../pom.xml
- spark-hive_2.12
+ spark-hive_2.11
jar
Spark Project Hive
http://spark.apache.org/
diff --git a/streaming/pom.xml b/streaming/pom.xml
index 1d1ea469f7d18..f9a5029a8e818 100644
--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@@ -20,12 +20,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../pom.xml
- spark-streaming_2.12
+ spark-streaming_2.11
streaming
diff --git a/tools/pom.xml b/tools/pom.xml
index 6286fad403c83..247f5a6df4b08 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -19,12 +19,12 @@
4.0.0
org.apache.spark
- spark-parent_2.12
+ spark-parent_2.11
3.0.0-SNAPSHOT
../pom.xml
- spark-tools_2.12
+ spark-tools_2.11
tools