Skip to content

Commit 08da997

Browse files
dongjoon-hyunLuciferYang
authored and
czxm
committed
Revert [SPARK-43836][SPARK-43845][SPARK-43858][SPARK-43858] to keep Scala 2.12 for Spark 3.x
### What changes were proposed in this pull request? This PR aims to revert the following 4 commits effectively. SPARK-43836 Make Scala 2.13 as default in Spark 3.5 SPARK-43845 Setup Scala 2.12 Daily GitHub Action Job SPARK-43858 Make benchmark Github Action task use Scala 2.13 as default SPARK-43858 Restore the Scala version to 2.13 after run benchmark ### Why are the changes needed? According to the dev mailing list discussion, we keep the Scala 2.12 for Spark 3.x. - https://lists.apache.org/thread/xz7x0nkjn1d13yl9on59lfttm6f0yd45 We open a new thread, "Apache Spark 4.0 Timeframe?", for Spark 4 planning. - https://lists.apache.org/thread/xhkgj60j361gdpywoxxz7qspp2w80ry6 ### Does this PR introduce _any_ user-facing change? No. This is a recovery to the existing behavior. ### How was this patch tested? Pass the CIs. Closes apache#41416 from dongjoon-hyun/revert-2.13. Lead-authored-by: Dongjoon Hyun <[email protected]> Co-authored-by: yangjie01 <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent 1151075 commit 08da997

File tree

47 files changed

+213
-207
lines changed

Some content is hidden

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

47 files changed

+213
-207
lines changed

‎.github/workflows/benchmark.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ on:
3333
scala:
3434
description: 'Scala version: 2.12 or 2.13'
3535
required: true
36-
default: '2.13'
36+
default: '2.12'
3737
failfast:
3838
description: 'Failfast: true or false'
3939
required: true
@@ -182,7 +182,7 @@ jobs:
182182
"`find . -name 'spark-core*-SNAPSHOT-tests.jar'`" \
183183
"${{ github.event.inputs.class }}"
184184
# Revert to default Scala version to clean up unnecessary git diff
185-
dev/change-scala-version.sh 2.13
185+
dev/change-scala-version.sh 2.12
186186
# To keep the directory structure and file permissions, tar them
187187
# See also https://github.com/actions/upload-artifact#maintaining-file-permissions-and-case-sensitive-files
188188
echo "Preparing the benchmark results:"

.github/workflows/build_scala212.yml renamed to .github/workflows/build_scala213.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# under the License.
1818
#
1919

20-
name: "Build (master, Scala 2.12, Hadoop 3, JDK 8)"
20+
name: "Build (master, Scala 2.13, Hadoop 3, JDK 8)"
2121

2222
on:
2323
schedule:
@@ -36,7 +36,7 @@ jobs:
3636
hadoop: hadoop3
3737
envs: >-
3838
{
39-
"SCALA_PROFILE": "scala2.12"
39+
"SCALA_PROFILE": "scala2.13"
4040
}
4141
jobs: >-
4242
{

‎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.13</artifactId>
23+
<artifactId>spark-parent_2.12</artifactId>
2424
<version>3.5.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

28-
<artifactId>spark-assembly_2.13</artifactId>
28+
<artifactId>spark-assembly_2.12</artifactId>
2929
<name>Spark Project Assembly</name>
3030
<url>https://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.13</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.5.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-kvstore_2.13</artifactId>
29+
<artifactId>spark-kvstore_2.12</artifactId>
3030
<packaging>jar</packaging>
3131
<name>Spark Project Local DB</name>
3232
<url>https://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.13</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.5.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-network-common_2.13</artifactId>
29+
<artifactId>spark-network-common_2.12</artifactId>
3030
<packaging>jar</packaging>
3131
<name>Spark Project Networking</name>
3232
<url>https://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.13</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.5.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-network-shuffle_2.13</artifactId>
29+
<artifactId>spark-network-shuffle_2.12</artifactId>
3030
<packaging>jar</packaging>
3131
<name>Spark Project Shuffle Streaming Service</name>
3232
<url>https://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.13</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.5.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-network-yarn_2.13</artifactId>
29+
<artifactId>spark-network-yarn_2.12</artifactId>
3030
<packaging>jar</packaging>
3131
<name>Spark Project YARN Shuffle Service</name>
3232
<url>https://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.13</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.5.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-sketch_2.13</artifactId>
29+
<artifactId>spark-sketch_2.12</artifactId>
3030
<packaging>jar</packaging>
3131
<name>Spark Project Sketch</name>
3232
<url>https://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.13</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.5.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-tags_2.13</artifactId>
29+
<artifactId>spark-tags_2.12</artifactId>
3030
<packaging>jar</packaging>
3131
<name>Spark Project Tags</name>
3232
<url>https://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.13</artifactId>
24+
<artifactId>spark-parent_2.12</artifactId>
2525
<version>3.5.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

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

0 commit comments

Comments
 (0)