Skip to content

Commit dcc801d

Browse files
dbtsairshkv
dbtsai
authored and
rshkv
committed
[SPARK-25956] Make Scala 2.12 as default Scala version in Spark 3.0
This PR makes Spark's default Scala version as 2.12, and Scala 2.11 will be the alternative version. This implies that Scala 2.12 will be used by our CI builds including pull request builds. We'll update the Jenkins to include a new compile-only jobs for Scala 2.11 to ensure the code can be still compiled with Scala 2.11. existing tests Closes apache#22967 from dbtsai/scala2.12. Authored-by: DB Tsai <d_tsai@apple.com> Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
1 parent 1270813 commit dcc801d

File tree

41 files changed

+113
-111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+113
-111
lines changed

‎assembly/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
<modelVersion>4.0.0</modelVersion>
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
23-
<artifactId>spark-parent_2.11</artifactId>
23+
<artifactId>spark-parent_2.12</artifactId>
2424
<version>3.0.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

28-
<artifactId>spark-assembly_2.11</artifactId>
28+
<artifactId>spark-assembly_2.12</artifactId>
2929
<name>Spark Project Assembly</name>
3030
<url>http://spark.apache.org/</url>
3131
<packaging>pom</packaging>

‎common/kvstore/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<modelVersion>4.0.0</modelVersion>
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
24-
<artifactId>spark-parent_2.11</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-kvstore_2.11</artifactId>
29+
<artifactId>spark-kvstore_2.12</artifactId>
3030
<packaging>jar</packaging>
3131
<name>Spark Project Local DB</name>
3232
<url>http://spark.apache.org/</url>

‎common/network-common/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<modelVersion>4.0.0</modelVersion>
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
24-
<artifactId>spark-parent_2.11</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-network-common_2.11</artifactId>
29+
<artifactId>spark-network-common_2.12</artifactId>
3030
<packaging>jar</packaging>
3131
<name>Spark Project Networking</name>
3232
<url>http://spark.apache.org/</url>

‎common/network-shuffle/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<modelVersion>4.0.0</modelVersion>
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
24-
<artifactId>spark-parent_2.11</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-network-shuffle_2.11</artifactId>
29+
<artifactId>spark-network-shuffle_2.12</artifactId>
3030
<packaging>jar</packaging>
3131
<name>Spark Project Shuffle Streaming Service</name>
3232
<url>http://spark.apache.org/</url>

‎common/network-yarn/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<modelVersion>4.0.0</modelVersion>
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
24-
<artifactId>spark-parent_2.11</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-network-yarn_2.11</artifactId>
29+
<artifactId>spark-network-yarn_2.12</artifactId>
3030
<packaging>jar</packaging>
3131
<name>Spark Project YARN Shuffle Service</name>
3232
<url>http://spark.apache.org/</url>

‎common/sketch/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<modelVersion>4.0.0</modelVersion>
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
24-
<artifactId>spark-parent_2.11</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-sketch_2.11</artifactId>
29+
<artifactId>spark-sketch_2.12</artifactId>
3030
<packaging>jar</packaging>
3131
<name>Spark Project Sketch</name>
3232
<url>http://spark.apache.org/</url>

‎common/tags/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<modelVersion>4.0.0</modelVersion>
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
24-
<artifactId>spark-parent_2.11</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-tags_2.11</artifactId>
29+
<artifactId>spark-tags_2.12</artifactId>
3030
<packaging>jar</packaging>
3131
<name>Spark Project Tags</name>
3232
<url>http://spark.apache.org/</url>

‎common/unsafe/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<modelVersion>4.0.0</modelVersion>
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
24-
<artifactId>spark-parent_2.11</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-unsafe_2.11</artifactId>
29+
<artifactId>spark-unsafe_2.12</artifactId>
3030
<packaging>jar</packaging>
3131
<name>Spark Project Unsafe</name>
3232
<url>http://spark.apache.org/</url>

‎core/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
<modelVersion>4.0.0</modelVersion>
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
23-
<artifactId>spark-parent_2.11</artifactId>
23+
<artifactId>spark-parent_2.12</artifactId>
2424
<version>3.0.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

28-
<artifactId>spark-core_2.11</artifactId>
28+
<artifactId>spark-core_2.12</artifactId>
2929
<properties>
3030
<sbt.project.name>core</sbt.project.name>
3131
</properties>

‎dev/deps/spark-deps-hadoop-palantir

+18-18
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ aws-java-sdk-bundle-1.11.201.jar
2222
azure-data-lake-store-sdk-2.2.3.jar
2323
azure-keyvault-core-0.8.0.jar
2424
azure-storage-5.4.0.jar
25-
breeze-macros_2.11-0.13.2.jar
26-
breeze_2.11-0.13.2.jar
25+
breeze-macros_2.12-0.13.2.jar
26+
breeze_2.12-0.13.2.jar
2727
chill-java-0.9.3.jar
28-
chill_2.11-0.9.3.jar
28+
chill_2.12-0.9.3.jar
2929
classmate-1.1.0.jar
3030
commons-beanutils-1.9.3.jar
3131
commons-beanutils-core-1.8.0.jar
@@ -107,7 +107,7 @@ jackson-mapper-asl-1.9.13.jar
107107
jackson-module-afterburner-2.11.0.jar
108108
jackson-module-jaxb-annotations-2.11.0.jar
109109
jackson-module-paranamer-2.11.0.jar
110-
jackson-module-scala_2.11-2.11.0.jar
110+
jackson-module-scala_2.12-2.11.0.jar
111111
jackson-xc-1.9.13.jar
112112
jakarta.activation-api-1.2.1.jar
113113
jakarta.xml.bind-api-2.3.2.jar
@@ -136,10 +136,10 @@ jetty-util-6.1.26.jar
136136
jetty-util-9.4.12.v20180830.jar
137137
joda-time-2.10.jar
138138
json-smart-1.3.1.jar
139-
json4s-ast_2.11-3.5.3.jar
140-
json4s-core_2.11-3.5.3.jar
141-
json4s-jackson_2.11-3.5.3.jar
142-
json4s-scalap_2.11-3.5.3.jar
139+
json4s-ast_2.12-3.5.3.jar
140+
json4s-core_2.12-3.5.3.jar
141+
json4s-jackson_2.12-3.5.3.jar
142+
json4s-scalap_2.12-3.5.3.jar
143143
jsp-api-2.1.jar
144144
jsr305-3.0.2.jar
145145
jtransforms-2.4.0.jar
@@ -153,8 +153,8 @@ leveldbjni-all-1.8.jar
153153
log4j-1.2.17.jar
154154
logging-interceptor-3.11.0.jar
155155
lz4-java-1.5.0.jar
156-
machinist_2.11-0.6.1.jar
157-
macro-compat_2.11-1.1.1.jar
156+
machinist_2.12-0.6.1.jar
157+
macro-compat_2.12-1.1.1.jar
158158
metrics-core-3.2.6.jar
159159
metrics-graphite-3.2.6.jar
160160
metrics-influxdb-1.2.2.jar
@@ -186,18 +186,18 @@ protobuf-java-2.5.0.jar
186186
py4j-0.10.8.1.jar
187187
pyrolite-4.13.jar
188188
safe-logging-1.13.0.jar
189-
scala-compiler-2.11.12.jar
190-
scala-library-2.11.12.jar
191-
scala-parser-combinators_2.11-1.1.0.jar
192-
scala-reflect-2.11.12.jar
193-
scala-xml_2.11-1.0.5.jar
194-
shapeless_2.11-2.3.2.jar
189+
scala-compiler-2.12.7.jar
190+
scala-library-2.12.7.jar
191+
scala-parser-combinators_2.12-1.1.0.jar
192+
scala-reflect-2.12.7.jar
193+
scala-xml_2.12-1.0.5.jar
194+
shapeless_2.12-2.3.2.jar
195195
slf4j-api-1.7.25.jar
196196
slf4j-log4j12-1.7.25.jar
197197
snakeyaml-1.26.jar
198198
snappy-java-1.1.7.3.jar
199-
spire-macros_2.11-0.13.0.jar
200-
spire_2.11-0.13.0.jar
199+
spire-macros_2.12-0.13.0.jar
200+
spire_2.12-0.13.0.jar
201201
stax-api-1.0-2.jar
202202
stax2-api-3.1.4.jar
203203
stream-2.9.6.jar

‎docs/_config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ include:
1616
# of Spark, Scala, and Mesos.
1717
SPARK_VERSION: 3.0.0-SNAPSHOT
1818
SPARK_VERSION_SHORT: 3.0.0
19-
SCALA_BINARY_VERSION: "2.11"
20-
SCALA_VERSION: "2.11.12"
19+
SCALA_BINARY_VERSION: "2.12"
20+
SCALA_VERSION: "2.12.7"
2121
MESOS_VERSION: 1.0.0
2222
SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK
2323
SPARK_GITHUB_URL: https://github.com/apache/spark

‎docs/_plugins/copy_api_dirs.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
# Copy over the unified ScalaDoc for all projects to api/scala.
3939
# This directory will be copied over to _site when `jekyll` command is run.
40-
source = "../target/scala-2.11/unidoc"
40+
source = "../target/scala-2.12/unidoc"
4141
dest = "api/scala"
4242

4343
puts "Making directory " + dest

‎examples/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
<modelVersion>4.0.0</modelVersion>
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
23-
<artifactId>spark-parent_2.11</artifactId>
23+
<artifactId>spark-parent_2.12</artifactId>
2424
<version>3.0.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

28-
<artifactId>spark-examples_2.11</artifactId>
28+
<artifactId>spark-examples_2.12</artifactId>
2929
<packaging>jar</packaging>
3030
<name>Spark Project Examples</name>
3131
<url>http://spark.apache.org/</url>

‎external/avro/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
<modelVersion>4.0.0</modelVersion>
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
23-
<artifactId>spark-parent_2.11</artifactId>
23+
<artifactId>spark-parent_2.12</artifactId>
2424
<version>3.0.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

28-
<artifactId>spark-avro_2.11</artifactId>
28+
<artifactId>spark-avro_2.12</artifactId>
2929
<properties>
3030
<sbt.project.name>avro</sbt.project.name>
3131
</properties>

‎external/docker-integration-tests/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<modelVersion>4.0.0</modelVersion>
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
24-
<artifactId>spark-parent_2.11</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-docker-integration-tests_2.11</artifactId>
29+
<artifactId>spark-docker-integration-tests_2.12</artifactId>
3030
<packaging>jar</packaging>
3131
<name>Spark Project Docker Integration Tests</name>
3232
<url>http://spark.apache.org/</url>

‎external/kafka-0-10-assembly/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
<modelVersion>4.0.0</modelVersion>
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
23-
<artifactId>spark-parent_2.11</artifactId>
23+
<artifactId>spark-parent_2.12</artifactId>
2424
<version>3.0.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

28-
<artifactId>spark-streaming-kafka-0-10-assembly_2.11</artifactId>
28+
<artifactId>spark-streaming-kafka-0-10-assembly_2.12</artifactId>
2929
<packaging>jar</packaging>
3030
<name>Spark Integration for Kafka 0.10 Assembly</name>
3131
<url>http://spark.apache.org/</url>

‎external/kafka-0-10-sql/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
<modelVersion>4.0.0</modelVersion>
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
23-
<artifactId>spark-parent_2.11</artifactId>
23+
<artifactId>spark-parent_2.12</artifactId>
2424
<version>3.0.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

2828
<groupId>org.apache.spark</groupId>
29-
<artifactId>spark-sql-kafka-0-10_2.11</artifactId>
29+
<artifactId>spark-sql-kafka-0-10_2.12</artifactId>
3030
<properties>
3131
<sbt.project.name>sql-kafka-0-10</sbt.project.name>
3232
</properties>

‎external/kafka-0-10/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
<modelVersion>4.0.0</modelVersion>
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
23-
<artifactId>spark-parent_2.11</artifactId>
23+
<artifactId>spark-parent_2.12</artifactId>
2424
<version>3.0.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

28-
<artifactId>spark-streaming-kafka-0-10_2.11</artifactId>
28+
<artifactId>spark-streaming-kafka-0-10_2.12</artifactId>
2929
<properties>
3030
<sbt.project.name>streaming-kafka-0-10</sbt.project.name>
3131
</properties>

‎external/kinesis-asl-assembly/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
<modelVersion>4.0.0</modelVersion>
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
23-
<artifactId>spark-parent_2.11</artifactId>
23+
<artifactId>spark-parent_2.12</artifactId>
2424
<version>3.0.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

28-
<artifactId>spark-streaming-kinesis-asl-assembly_2.11</artifactId>
28+
<artifactId>spark-streaming-kinesis-asl-assembly_2.12</artifactId>
2929
<packaging>jar</packaging>
3030
<name>Spark Project Kinesis Assembly</name>
3131
<url>http://spark.apache.org/</url>

‎external/kinesis-asl/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
<modelVersion>4.0.0</modelVersion>
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
22-
<artifactId>spark-parent_2.11</artifactId>
22+
<artifactId>spark-parent_2.12</artifactId>
2323
<version>3.0.0-SNAPSHOT</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

2727
<!-- Kinesis integration is not included by default due to ASL-licensed code. -->
28-
<artifactId>spark-streaming-kinesis-asl_2.11</artifactId>
28+
<artifactId>spark-streaming-kinesis-asl_2.12</artifactId>
2929
<packaging>jar</packaging>
3030
<name>Spark Kinesis Integration</name>
3131

‎external/spark-ganglia-lgpl/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
<modelVersion>4.0.0</modelVersion>
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
22-
<artifactId>spark-parent_2.11</artifactId>
22+
<artifactId>spark-parent_2.12</artifactId>
2323
<version>3.0.0-SNAPSHOT</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

2727
<!-- Ganglia integration is not included by default due to LGPL-licensed code -->
28-
<artifactId>spark-ganglia-lgpl_2.11</artifactId>
28+
<artifactId>spark-ganglia-lgpl_2.12</artifactId>
2929
<packaging>jar</packaging>
3030
<name>Spark Ganglia Integration</name>
3131

‎graphx/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
<modelVersion>4.0.0</modelVersion>
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
23-
<artifactId>spark-parent_2.11</artifactId>
23+
<artifactId>spark-parent_2.12</artifactId>
2424
<version>3.0.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

28-
<artifactId>spark-graphx_2.11</artifactId>
28+
<artifactId>spark-graphx_2.12</artifactId>
2929
<properties>
3030
<sbt.project.name>graphx</sbt.project.name>
3131
</properties>

‎hadoop-cloud/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<modelVersion>4.0.0</modelVersion>
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
24-
<artifactId>spark-parent_2.11</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-hadoop-cloud_2.11</artifactId>
29+
<artifactId>spark-hadoop-cloud_2.12</artifactId>
3030
<packaging>jar</packaging>
3131
<name>Spark Project Cloud Integration</name>
3232
<description>

0 commit comments

Comments
 (0)