Skip to content

Commit 39513a4

Browse files
vinooganeshbulldozer-bot[bot]
vinooganesh
authored and
bulldozer-bot[bot]
committed
Use Scala 2.11 by default (apache-spark-on-k8s#500)
This PR reverts back to using Scala 2.11 * Revert "Fix distribution publish to scala 2.12 apache-spark-on-k8s#478" * Revert "[SPARK-25956] Make Scala 2.12 as default Scala version in Spark 3.0"
1 parent 5f203cd commit 39513a4

File tree

47 files changed

+118
-119
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

+118
-119
lines changed

‎.baseline/checkstyle/checkstyle.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE module PUBLIC
3-
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
4-
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
3+
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
4+
"https://checkstyle.org/dtds/configuration_1_3.dtd">
55

66
<!--
77
Palantir Baseline Checkstyle configuration.

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

28-
<artifactId>spark-assembly_2.12</artifactId>
28+
<artifactId>spark-assembly_2.11</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.12</artifactId>
24+
<artifactId>spark-parent_2.11</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-kvstore_2.12</artifactId>
29+
<artifactId>spark-kvstore_2.11</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.12</artifactId>
24+
<artifactId>spark-parent_2.11</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-network-common_2.12</artifactId>
29+
<artifactId>spark-network-common_2.11</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.12</artifactId>
24+
<artifactId>spark-parent_2.11</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-network-shuffle_2.12</artifactId>
29+
<artifactId>spark-network-shuffle_2.11</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.12</artifactId>
24+
<artifactId>spark-parent_2.11</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-network-yarn_2.12</artifactId>
29+
<artifactId>spark-network-yarn_2.11</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.12</artifactId>
24+
<artifactId>spark-parent_2.11</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-sketch_2.12</artifactId>
29+
<artifactId>spark-sketch_2.11</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.12</artifactId>
24+
<artifactId>spark-parent_2.11</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-tags_2.12</artifactId>
29+
<artifactId>spark-tags_2.11</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.12</artifactId>
24+
<artifactId>spark-parent_2.11</artifactId>
2525
<version>3.0.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>spark-unsafe_2.12</artifactId>
29+
<artifactId>spark-unsafe_2.11</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.12</artifactId>
23+
<artifactId>spark-parent_2.11</artifactId>
2424
<version>3.0.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

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

0 commit comments

Comments
 (0)