Skip to content

Commit eeaf7b1

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 <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent fdcc7b9 commit eeaf7b1

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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 18 additions & 18 deletions
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
@@ -106,7 +106,7 @@ jackson-mapper-asl-1.9.13.jar
106106
jackson-module-afterburner-2.11.0.jar
107107
jackson-module-jaxb-annotations-2.11.0.jar
108108
jackson-module-paranamer-2.11.0.jar
109-
jackson-module-scala_2.11-2.11.0.jar
109+
jackson-module-scala_2.12-2.11.0.jar
110110
jackson-xc-1.9.13.jar
111111
jakarta.activation-api-1.2.1.jar
112112
jakarta.xml.bind-api-2.3.2.jar
@@ -135,10 +135,10 @@ jetty-util-6.1.26.jar
135135
jetty-util-9.4.12.v20180830.jar
136136
joda-time-2.10.jar
137137
json-smart-1.3.1.jar
138-
json4s-ast_2.11-3.5.3.jar
139-
json4s-core_2.11-3.5.3.jar
140-
json4s-jackson_2.11-3.5.3.jar
141-
json4s-scalap_2.11-3.5.3.jar
138+
json4s-ast_2.12-3.5.3.jar
139+
json4s-core_2.12-3.5.3.jar
140+
json4s-jackson_2.12-3.5.3.jar
141+
json4s-scalap_2.12-3.5.3.jar
142142
jsp-api-2.1.jar
143143
jsr305-3.0.2.jar
144144
jtransforms-2.4.0.jar
@@ -152,8 +152,8 @@ leveldbjni-all-1.8.jar
152152
log4j-1.2.17.jar
153153
logging-interceptor-3.11.0.jar
154154
lz4-java-1.5.0.jar
155-
machinist_2.11-0.6.1.jar
156-
macro-compat_2.11-1.1.1.jar
155+
machinist_2.12-0.6.1.jar
156+
macro-compat_2.12-1.1.1.jar
157157
metrics-core-3.2.6.jar
158158
metrics-graphite-3.2.6.jar
159159
metrics-influxdb-1.2.2.jar
@@ -185,18 +185,18 @@ protobuf-java-2.5.0.jar
185185
py4j-0.10.8.1.jar
186186
pyrolite-4.13.jar
187187
safe-logging-1.13.0.jar
188-
scala-compiler-2.11.12.jar
189-
scala-library-2.11.12.jar
190-
scala-parser-combinators_2.11-1.1.0.jar
191-
scala-reflect-2.11.12.jar
192-
scala-xml_2.11-1.0.5.jar
193-
shapeless_2.11-2.3.2.jar
188+
scala-compiler-2.12.7.jar
189+
scala-library-2.12.7.jar
190+
scala-parser-combinators_2.12-1.1.0.jar
191+
scala-reflect-2.12.7.jar
192+
scala-xml_2.12-1.0.5.jar
193+
shapeless_2.12-2.3.2.jar
194194
slf4j-api-1.7.25.jar
195195
slf4j-log4j12-1.7.25.jar
196196
snakeyaml-1.26.jar
197197
snappy-java-1.1.7.3.jar
198-
spire-macros_2.11-0.13.0.jar
199-
spire_2.11-0.13.0.jar
198+
spire-macros_2.12-0.13.0.jar
199+
spire_2.12-0.13.0.jar
200200
stax-api-1.0-2.jar
201201
stax2-api-3.1.4.jar
202202
stream-2.9.6.jar

0 commit comments

Comments
 (0)