Repository: spark Updated Branches: refs/heads/master 2977e2312 -> ad853c567
[SPARK-25956] Make Scala 2.12 as default Scala version in Spark 3.0 ## What changes were proposed in this pull request? 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. ## How was this patch tested? existing tests Closes #22967 from dbtsai/scala2.12. Authored-by: DB Tsai <d_t...@apple.com> Signed-off-by: Dongjoon Hyun <dongj...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ad853c56 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ad853c56 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ad853c56 Branch: refs/heads/master Commit: ad853c56788fd32e035369d1fe3d96aaf6c4ef16 Parents: 2977e23 Author: DB Tsai <d_t...@apple.com> Authored: Wed Nov 14 16:22:23 2018 -0800 Committer: Dongjoon Hyun <dongj...@apache.org> Committed: Wed Nov 14 16:22:23 2018 -0800 ---------------------------------------------------------------------- assembly/pom.xml | 4 +-- common/kvstore/pom.xml | 4 +-- common/network-common/pom.xml | 4 +-- common/network-shuffle/pom.xml | 4 +-- common/network-yarn/pom.xml | 4 +-- common/sketch/pom.xml | 4 +-- common/tags/pom.xml | 4 +-- common/unsafe/pom.xml | 4 +-- core/pom.xml | 4 +-- dev/deps/spark-deps-hadoop-2.7 | 36 ++++++++++---------- dev/deps/spark-deps-hadoop-3.1 | 36 ++++++++++---------- docs/_config.yml | 4 +-- docs/_plugins/copy_api_dirs.rb | 2 +- docs/building-spark.md | 18 +++++----- docs/cloud-integration.md | 2 +- docs/sparkr.md | 2 +- examples/pom.xml | 4 +-- external/avro/pom.xml | 4 +-- external/docker-integration-tests/pom.xml | 4 +-- external/kafka-0-10-assembly/pom.xml | 4 +-- external/kafka-0-10-sql/pom.xml | 4 +-- external/kafka-0-10/pom.xml | 4 +-- external/kinesis-asl-assembly/pom.xml | 4 +-- external/kinesis-asl/pom.xml | 4 +-- external/spark-ganglia-lgpl/pom.xml | 4 +-- graphx/pom.xml | 4 +-- hadoop-cloud/pom.xml | 4 +-- launcher/pom.xml | 4 +-- mllib-local/pom.xml | 4 +-- mllib/pom.xml | 4 +-- pom.xml | 20 ++++++----- project/MimaBuild.scala | 2 +- project/SparkBuild.scala | 14 ++++---- python/run-tests.py | 4 +-- repl/pom.xml | 4 +-- resource-managers/kubernetes/core/pom.xml | 4 +-- .../kubernetes/integration-tests/pom.xml | 4 +-- resource-managers/mesos/pom.xml | 4 +-- resource-managers/yarn/pom.xml | 4 +-- sql/catalyst/pom.xml | 4 +-- sql/core/pom.xml | 4 +-- sql/hive-thriftserver/pom.xml | 4 +-- sql/hive/pom.xml | 4 +-- streaming/pom.xml | 4 +-- tools/pom.xml | 4 +-- 45 files changed, 138 insertions(+), 138 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index b0337e5..68ebfad 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -20,12 +20,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>spark-assembly_2.11</artifactId> + <artifactId>spark-assembly_2.12</artifactId> <name>Spark Project Assembly</name> <url>http://spark.apache.org/</url> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/common/kvstore/pom.xml ---------------------------------------------------------------------- diff --git a/common/kvstore/pom.xml b/common/kvstore/pom.xml index 23a0f49..f042a12 100644 --- a/common/kvstore/pom.xml +++ b/common/kvstore/pom.xml @@ -21,12 +21,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-kvstore_2.11</artifactId> + <artifactId>spark-kvstore_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Local DB</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/common/network-common/pom.xml ---------------------------------------------------------------------- diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index 41fcbf0..56d01fa 100644 --- a/common/network-common/pom.xml +++ b/common/network-common/pom.xml @@ -21,12 +21,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-network-common_2.11</artifactId> + <artifactId>spark-network-common_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Networking</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/common/network-shuffle/pom.xml ---------------------------------------------------------------------- diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index ff71705..a6d9981 100644 --- a/common/network-shuffle/pom.xml +++ b/common/network-shuffle/pom.xml @@ -21,12 +21,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-network-shuffle_2.11</artifactId> + <artifactId>spark-network-shuffle_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Shuffle Streaming Service</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/common/network-yarn/pom.xml ---------------------------------------------------------------------- diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index a1cf761..55cdc31 100644 --- a/common/network-yarn/pom.xml +++ b/common/network-yarn/pom.xml @@ -21,12 +21,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-network-yarn_2.11</artifactId> + <artifactId>spark-network-yarn_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project YARN Shuffle Service</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/common/sketch/pom.xml ---------------------------------------------------------------------- diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index adbbcb1..3c3c0d2 100644 --- a/common/sketch/pom.xml +++ b/common/sketch/pom.xml @@ -21,12 +21,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-sketch_2.11</artifactId> + <artifactId>spark-sketch_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Sketch</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/common/tags/pom.xml ---------------------------------------------------------------------- diff --git a/common/tags/pom.xml b/common/tags/pom.xml index f6627be..883b73a 100644 --- a/common/tags/pom.xml +++ b/common/tags/pom.xml @@ -21,12 +21,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-tags_2.11</artifactId> + <artifactId>spark-tags_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Tags</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/common/unsafe/pom.xml ---------------------------------------------------------------------- diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index 62c493a..7e4b082 100644 --- a/common/unsafe/pom.xml +++ b/common/unsafe/pom.xml @@ -21,12 +21,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-unsafe_2.11</artifactId> + <artifactId>spark-unsafe_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Unsafe</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 5c26f9a..36d9321 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,12 +20,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>spark-core_2.11</artifactId> + <artifactId>spark-core_2.12</artifactId> <properties> <sbt.project.name>core</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/dev/deps/spark-deps-hadoop-2.7 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 0169181..c2f5755 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -22,13 +22,13 @@ avro-1.8.2.jar avro-ipc-1.8.2.jar avro-mapred-1.8.2-hadoop2.jar bonecp-0.8.0.RELEASE.jar -breeze-macros_2.11-0.13.2.jar -breeze_2.11-0.13.2.jar +breeze-macros_2.12-0.13.2.jar +breeze_2.12-0.13.2.jar calcite-avatica-1.2.0-incubating.jar calcite-core-1.2.0-incubating.jar calcite-linq4j-1.2.0-incubating.jar chill-java-0.9.3.jar -chill_2.11-0.9.3.jar +chill_2.12-0.9.3.jar commons-beanutils-1.7.0.jar commons-beanutils-core-1.8.0.jar commons-cli-1.2.jar @@ -96,7 +96,7 @@ jackson-jaxrs-1.9.13.jar jackson-mapper-asl-1.9.13.jar jackson-module-jaxb-annotations-2.9.6.jar jackson-module-paranamer-2.9.6.jar -jackson-module-scala_2.11-2.9.6.jar +jackson-module-scala_2.12-2.9.6.jar jackson-xc-1.9.13.jar janino-3.0.10.jar javassist-3.18.1-GA.jar @@ -122,10 +122,10 @@ jline-2.14.6.jar joda-time-2.9.3.jar jodd-core-3.5.2.jar jpam-1.1.jar -json4s-ast_2.11-3.5.3.jar -json4s-core_2.11-3.5.3.jar -json4s-jackson_2.11-3.5.3.jar -json4s-scalap_2.11-3.5.3.jar +json4s-ast_2.12-3.5.3.jar +json4s-core_2.12-3.5.3.jar +json4s-jackson_2.12-3.5.3.jar +json4s-scalap_2.12-3.5.3.jar jsp-api-2.1.jar jsr305-3.0.0.jar jta-1.1.jar @@ -140,8 +140,8 @@ libthrift-0.9.3.jar log4j-1.2.17.jar logging-interceptor-3.9.1.jar lz4-java-1.5.0.jar -machinist_2.11-0.6.1.jar -macro-compat_2.11-1.1.1.jar +machinist_2.12-0.6.1.jar +macro-compat_2.12-1.1.1.jar mesos-1.4.0-shaded-protobuf.jar metrics-core-3.1.5.jar metrics-graphite-3.1.5.jar @@ -170,19 +170,19 @@ parquet-jackson-1.10.0.jar protobuf-java-2.5.0.jar py4j-0.10.8.1.jar pyrolite-4.13.jar -scala-compiler-2.11.12.jar -scala-library-2.11.12.jar -scala-parser-combinators_2.11-1.1.0.jar -scala-reflect-2.11.12.jar -scala-xml_2.11-1.0.5.jar -shapeless_2.11-2.3.2.jar +scala-compiler-2.12.7.jar +scala-library-2.12.7.jar +scala-parser-combinators_2.12-1.1.0.jar +scala-reflect-2.12.7.jar +scala-xml_2.12-1.0.5.jar +shapeless_2.12-2.3.2.jar slf4j-api-1.7.16.jar slf4j-log4j12-1.7.16.jar snakeyaml-1.18.jar snappy-0.2.jar snappy-java-1.1.7.1.jar -spire-macros_2.11-0.13.0.jar -spire_2.11-0.13.0.jar +spire-macros_2.12-0.13.0.jar +spire_2.12-0.13.0.jar stax-api-1.0-2.jar stax-api-1.0.1.jar stream-2.7.0.jar http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/dev/deps/spark-deps-hadoop-3.1 ---------------------------------------------------------------------- diff --git a/dev/deps/spark-deps-hadoop-3.1 b/dev/deps/spark-deps-hadoop-3.1 index fd46f14..811febf 100644 --- a/dev/deps/spark-deps-hadoop-3.1 +++ b/dev/deps/spark-deps-hadoop-3.1 @@ -20,13 +20,13 @@ avro-1.8.2.jar avro-ipc-1.8.2.jar avro-mapred-1.8.2-hadoop2.jar bonecp-0.8.0.RELEASE.jar -breeze-macros_2.11-0.13.2.jar -breeze_2.11-0.13.2.jar +breeze-macros_2.12-0.13.2.jar +breeze_2.12-0.13.2.jar calcite-avatica-1.2.0-incubating.jar calcite-core-1.2.0-incubating.jar calcite-linq4j-1.2.0-incubating.jar chill-java-0.9.3.jar -chill_2.11-0.9.3.jar +chill_2.12-0.9.3.jar commons-beanutils-1.9.3.jar commons-cli-1.2.jar commons-codec-1.10.jar @@ -96,7 +96,7 @@ jackson-jaxrs-json-provider-2.7.8.jar jackson-mapper-asl-1.9.13.jar jackson-module-jaxb-annotations-2.9.6.jar jackson-module-paranamer-2.9.6.jar -jackson-module-scala_2.11-2.9.6.jar +jackson-module-scala_2.12-2.9.6.jar janino-3.0.10.jar javassist-3.18.1-GA.jar javax.annotation-api-1.2.jar @@ -123,10 +123,10 @@ joda-time-2.9.3.jar jodd-core-3.5.2.jar jpam-1.1.jar json-smart-2.3.jar -json4s-ast_2.11-3.5.3.jar -json4s-core_2.11-3.5.3.jar -json4s-jackson_2.11-3.5.3.jar -json4s-scalap_2.11-3.5.3.jar +json4s-ast_2.12-3.5.3.jar +json4s-core_2.12-3.5.3.jar +json4s-jackson_2.12-3.5.3.jar +json4s-scalap_2.12-3.5.3.jar jsp-api-2.1.jar jsr305-3.0.0.jar jta-1.1.jar @@ -155,8 +155,8 @@ libthrift-0.9.3.jar log4j-1.2.17.jar logging-interceptor-3.9.1.jar lz4-java-1.5.0.jar -machinist_2.11-0.6.1.jar -macro-compat_2.11-1.1.1.jar +machinist_2.12-0.6.1.jar +macro-compat_2.12-1.1.1.jar mesos-1.4.0-shaded-protobuf.jar metrics-core-3.1.5.jar metrics-graphite-3.1.5.jar @@ -189,19 +189,19 @@ protobuf-java-2.5.0.jar py4j-0.10.8.1.jar pyrolite-4.13.jar re2j-1.1.jar -scala-compiler-2.11.12.jar -scala-library-2.11.12.jar -scala-parser-combinators_2.11-1.1.0.jar -scala-reflect-2.11.12.jar -scala-xml_2.11-1.0.5.jar -shapeless_2.11-2.3.2.jar +scala-compiler-2.12.7.jar +scala-library-2.12.7.jar +scala-parser-combinators_2.12-1.1.0.jar +scala-reflect-2.12.7.jar +scala-xml_2.12-1.0.5.jar +shapeless_2.12-2.3.2.jar slf4j-api-1.7.16.jar slf4j-log4j12-1.7.16.jar snakeyaml-1.18.jar snappy-0.2.jar snappy-java-1.1.7.1.jar -spire-macros_2.11-0.13.0.jar -spire_2.11-0.13.0.jar +spire-macros_2.12-0.13.0.jar +spire_2.12-0.13.0.jar stax-api-1.0.1.jar stax2-api-3.1.4.jar stream-2.7.0.jar http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/docs/_config.yml ---------------------------------------------------------------------- diff --git a/docs/_config.yml b/docs/_config.yml index c3ef985..649d18b 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -16,8 +16,8 @@ include: # of Spark, Scala, and Mesos. SPARK_VERSION: 3.0.0-SNAPSHOT SPARK_VERSION_SHORT: 3.0.0 -SCALA_BINARY_VERSION: "2.11" -SCALA_VERSION: "2.11.12" +SCALA_BINARY_VERSION: "2.12" +SCALA_VERSION: "2.12.7" MESOS_VERSION: 1.0.0 SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK SPARK_GITHUB_URL: https://github.com/apache/spark http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/docs/_plugins/copy_api_dirs.rb ---------------------------------------------------------------------- diff --git a/docs/_plugins/copy_api_dirs.rb b/docs/_plugins/copy_api_dirs.rb index 4d0d043..2d1a954 100644 --- a/docs/_plugins/copy_api_dirs.rb +++ b/docs/_plugins/copy_api_dirs.rb @@ -37,7 +37,7 @@ if not (ENV['SKIP_API'] == '1') # Copy over the unified ScalaDoc for all projects to api/scala. # This directory will be copied over to _site when `jekyll` command is run. - source = "../target/scala-2.11/unidoc" + source = "../target/scala-2.12/unidoc" dest = "api/scala" puts "Making directory " + dest http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/docs/building-spark.md ---------------------------------------------------------------------- diff --git a/docs/building-spark.md b/docs/building-spark.md index 8af90db..dfcd53c 100644 --- a/docs/building-spark.md +++ b/docs/building-spark.md @@ -96,9 +96,9 @@ It's possible to build Spark submodules using the `mvn -pl` option. For instance, you can build the Spark Streaming module using: - ./build/mvn -pl :spark-streaming_2.11 clean install + ./build/mvn -pl :spark-streaming_{{site.SCALA_BINARY_VERSION}} clean install -where `spark-streaming_2.11` is the `artifactId` as defined in `streaming/pom.xml` file. +where `spark-streaming_{{site.SCALA_BINARY_VERSION}}` is the `artifactId` as defined in `streaming/pom.xml` file. ## Continuous Compilation @@ -230,7 +230,7 @@ Once installed, the `docker` service needs to be started, if not already running On Linux, this can be done by `sudo service docker start`. ./build/mvn install -DskipTests - ./build/mvn test -Pdocker-integration-tests -pl :spark-docker-integration-tests_2.11 + ./build/mvn test -Pdocker-integration-tests -pl :spark-docker-integration-tests_{{site.SCALA_BINARY_VERSION}} or @@ -238,17 +238,17 @@ or ## Change Scala Version -To build Spark using another supported Scala version, please change the major Scala version using (e.g. 2.12): +To build Spark using another supported Scala version, please change the major Scala version using (e.g. 2.11): - ./dev/change-scala-version.sh 2.12 + ./dev/change-scala-version.sh 2.11 -For Maven, please enable the profile (e.g. 2.12): +For Maven, please enable the profile (e.g. 2.11): - ./build/mvn -Pscala-2.12 compile + ./build/mvn -Pscala-2.11 compile -For SBT, specify a complete scala version using (e.g. 2.12.6): +For SBT, specify a complete scala version using (e.g. 2.11.12): - ./build/sbt -Dscala.version=2.12.6 + ./build/sbt -Dscala.version=2.11.12 Otherwise, the sbt-pom-reader plugin will use the `scala.version` specified in the spark-parent pom. http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/docs/cloud-integration.md ---------------------------------------------------------------------- diff --git a/docs/cloud-integration.md b/docs/cloud-integration.md index 36753f6..5368e13 100644 --- a/docs/cloud-integration.md +++ b/docs/cloud-integration.md @@ -85,7 +85,7 @@ is set to the chosen version of Spark: ... <dependency> <groupId>org.apache.spark</groupId> - <artifactId>hadoop-cloud_2.11</artifactId> + <artifactId>hadoop-cloud_{{site.SCALA_BINARY_VERSION}}</artifactId> <version>${spark.version}</version> </dependency> ... http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/docs/sparkr.md ---------------------------------------------------------------------- diff --git a/docs/sparkr.md b/docs/sparkr.md index cc6bc6d..acd0e77 100644 --- a/docs/sparkr.md +++ b/docs/sparkr.md @@ -133,7 +133,7 @@ specifying `--packages` with `spark-submit` or `sparkR` commands, or if initiali <div data-lang="r" markdown="1"> {% highlight r %} -sparkR.session(sparkPackages = "com.databricks:spark-avro_2.11:3.0.0") +sparkR.session(sparkPackages = "org.apache.spark:spark-avro_{{site.SCALA_BINARY_VERSION}}:{{site.SPARK_VERSION}}") {% endhighlight %} </div> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 756c475..0636406 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -20,12 +20,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>spark-examples_2.11</artifactId> + <artifactId>spark-examples_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Examples</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/external/avro/pom.xml ---------------------------------------------------------------------- diff --git a/external/avro/pom.xml b/external/avro/pom.xml index 9d8f319..ba6f20b 100644 --- a/external/avro/pom.xml +++ b/external/avro/pom.xml @@ -20,12 +20,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-avro_2.11</artifactId> + <artifactId>spark-avro_2.12</artifactId> <properties> <sbt.project.name>avro</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/external/docker-integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index f24254b..b39db75 100644 --- a/external/docker-integration-tests/pom.xml +++ b/external/docker-integration-tests/pom.xml @@ -21,12 +21,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-docker-integration-tests_2.11</artifactId> + <artifactId>spark-docker-integration-tests_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Docker Integration Tests</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/external/kafka-0-10-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/external/kafka-0-10-assembly/pom.xml b/external/kafka-0-10-assembly/pom.xml index 4f9c316..f2dcf5d 100644 --- a/external/kafka-0-10-assembly/pom.xml +++ b/external/kafka-0-10-assembly/pom.xml @@ -20,12 +20,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-streaming-kafka-0-10-assembly_2.11</artifactId> + <artifactId>spark-streaming-kafka-0-10-assembly_2.12</artifactId> <packaging>jar</packaging> <name>Spark Integration for Kafka 0.10 Assembly</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/external/kafka-0-10-sql/pom.xml ---------------------------------------------------------------------- diff --git a/external/kafka-0-10-sql/pom.xml b/external/kafka-0-10-sql/pom.xml index efd0862..3f1055a 100644 --- a/external/kafka-0-10-sql/pom.xml +++ b/external/kafka-0-10-sql/pom.xml @@ -20,13 +20,13 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-sql-kafka-0-10_2.11</artifactId> + <artifactId>spark-sql-kafka-0-10_2.12</artifactId> <properties> <sbt.project.name>sql-kafka-0-10</sbt.project.name> <!-- note that this should be compatible with Kafka brokers version 0.10 and up --> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/external/kafka-0-10/pom.xml ---------------------------------------------------------------------- diff --git a/external/kafka-0-10/pom.xml b/external/kafka-0-10/pom.xml index f59f072..d75b13d 100644 --- a/external/kafka-0-10/pom.xml +++ b/external/kafka-0-10/pom.xml @@ -20,12 +20,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-streaming-kafka-0-10_2.11</artifactId> + <artifactId>spark-streaming-kafka-0-10_2.12</artifactId> <properties> <sbt.project.name>streaming-kafka-0-10</sbt.project.name> <!-- note that this should be compatible with Kafka brokers version 0.10 and up --> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/external/kinesis-asl-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml index 0bf4c26..0ce9223 100644 --- a/external/kinesis-asl-assembly/pom.xml +++ b/external/kinesis-asl-assembly/pom.xml @@ -20,12 +20,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-streaming-kinesis-asl-assembly_2.11</artifactId> + <artifactId>spark-streaming-kinesis-asl-assembly_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Kinesis Assembly</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/external/kinesis-asl/pom.xml ---------------------------------------------------------------------- diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml index 0aef253..7d69764 100644 --- a/external/kinesis-asl/pom.xml +++ b/external/kinesis-asl/pom.xml @@ -19,13 +19,13 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <!-- Kinesis integration is not included by default due to ASL-licensed code. --> - <artifactId>spark-streaming-kinesis-asl_2.11</artifactId> + <artifactId>spark-streaming-kinesis-asl_2.12</artifactId> <packaging>jar</packaging> <name>Spark Kinesis Integration</name> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/external/spark-ganglia-lgpl/pom.xml ---------------------------------------------------------------------- diff --git a/external/spark-ganglia-lgpl/pom.xml b/external/spark-ganglia-lgpl/pom.xml index 35a55b7..a23d255 100644 --- a/external/spark-ganglia-lgpl/pom.xml +++ b/external/spark-ganglia-lgpl/pom.xml @@ -19,13 +19,13 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <!-- Ganglia integration is not included by default due to LGPL-licensed code --> - <artifactId>spark-ganglia-lgpl_2.11</artifactId> + <artifactId>spark-ganglia-lgpl_2.12</artifactId> <packaging>jar</packaging> <name>Spark Ganglia Integration</name> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/graphx/pom.xml ---------------------------------------------------------------------- diff --git a/graphx/pom.xml b/graphx/pom.xml index 22bc148..444568a 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -20,12 +20,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>spark-graphx_2.11</artifactId> + <artifactId>spark-graphx_2.12</artifactId> <properties> <sbt.project.name>graphx</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/hadoop-cloud/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index 3182ab1..2e5b046 100644 --- a/hadoop-cloud/pom.xml +++ b/hadoop-cloud/pom.xml @@ -21,12 +21,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>spark-hadoop-cloud_2.11</artifactId> + <artifactId>spark-hadoop-cloud_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Cloud Integration through Hadoop Libraries</name> <description> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/launcher/pom.xml ---------------------------------------------------------------------- diff --git a/launcher/pom.xml b/launcher/pom.xml index b1b6126..e75e834 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -21,12 +21,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>spark-launcher_2.11</artifactId> + <artifactId>spark-launcher_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Launcher</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/mllib-local/pom.xml ---------------------------------------------------------------------- diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index ec5f9b0..2eab868 100644 --- a/mllib-local/pom.xml +++ b/mllib-local/pom.xml @@ -20,12 +20,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>spark-mllib-local_2.11</artifactId> + <artifactId>spark-mllib-local_2.12</artifactId> <properties> <sbt.project.name>mllib-local</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/mllib/pom.xml ---------------------------------------------------------------------- diff --git a/mllib/pom.xml b/mllib/pom.xml index 17ddb87..0b17345 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -20,12 +20,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>spark-mllib_2.11</artifactId> + <artifactId>spark-mllib_2.12</artifactId> <properties> <sbt.project.name>mllib</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ee1fd47..59e3d0f 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ <version>18</version> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Spark Project Parent POM</name> @@ -154,8 +154,8 @@ <commons.math3.version>3.4.1</commons.math3.version> <!-- managed up from 3.2.1 for SPARK-11652 --> <commons.collections.version>3.2.2</commons.collections.version> - <scala.version>2.11.12</scala.version> - <scala.binary.version>2.11</scala.binary.version> + <scala.version>2.12.7</scala.version> + <scala.binary.version>2.12</scala.binary.version> <codehaus.jackson.version>1.9.13</codehaus.jackson.version> <fasterxml.jackson.version>2.9.6</fasterxml.jackson.version> <snappy.version>1.1.7.1</snappy.version> @@ -1998,6 +1998,7 @@ --> <exclude>org.jboss.netty</exclude> <exclude>org.codehaus.groovy</exclude> + <exclude>*:*_2.11</exclude> <exclude>*:*_2.10</exclude> </excludes> <searchTransitive>true</searchTransitive> @@ -2705,14 +2706,14 @@ <!-- Exists for backwards compatibility; profile doesn't do anything --> <profile> - <id>scala-2.11</id> + <id>scala-2.12</id> </profile> <profile> - <id>scala-2.12</id> + <id>scala-2.11</id> <properties> - <scala.version>2.12.7</scala.version> - <scala.binary.version>2.12</scala.binary.version> + <scala.version>2.11.12</scala.version> + <scala.binary.version>2.11</scala.binary.version> </properties> <build> <plugins> @@ -2728,8 +2729,9 @@ <configuration> <rules> <bannedDependencies> - <excludes combine.children="append"> - <exclude>*:*_2.11</exclude> + <excludes combine.self="override"> + <exclude>org.jboss.netty</exclude> + <exclude>org.codehaus.groovy</exclude> <exclude>*:*_2.10</exclude> </excludes> </bannedDependencies> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/project/MimaBuild.scala ---------------------------------------------------------------------- diff --git a/project/MimaBuild.scala b/project/MimaBuild.scala index 79e6745..10c0210 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.11" + val fullId = "spark-" + project + "_2.12" mimaDefaultSettings ++ Seq(mimaPreviousArtifacts := Set(organization % fullId % previousSparkVersion), mimaBinaryIssueFilters ++= ignoredABIProblems(sparkHome, version.value)) http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 5e034f9..08e22fa 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -95,15 +95,15 @@ object SparkBuild extends PomBuild { } Option(System.getProperty("scala.version")) - .filter(_.startsWith("2.12")) + .filter(_.startsWith("2.11")) .foreach { versionString => - System.setProperty("scala-2.12", "true") + System.setProperty("scala-2.11", "true") } - if (System.getProperty("scala-2.12") == "") { + if (System.getProperty("scala-2.11") == "") { // 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.12", "true") + System.setProperty("scala-2.11", "true") } profiles } @@ -849,10 +849,10 @@ object TestSettings { import BuildCommons._ private val scalaBinaryVersion = - if (System.getProperty("scala-2.12") == "true") { - "2.12" - } else { + if (System.getProperty("scala-2.11") == "true") { "2.11" + } else { + "2.12" } lazy val settings = Seq ( // Fork new JVMs for tests and set Java options for those http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/python/run-tests.py ---------------------------------------------------------------------- diff --git a/python/run-tests.py b/python/run-tests.py index 4430574..9fd1c9b 100755 --- a/python/run-tests.py +++ b/python/run-tests.py @@ -59,9 +59,7 @@ FAILURE_REPORTING_LOCK = Lock() LOGGER = logging.getLogger() # Find out where the assembly jars are located. -# Later, add back 2.12 to this list: -# for scala in ["2.11", "2.12"]: -for scala in ["2.11"]: +for scala in ["2.11", "2.12"]: 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", "*") http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/repl/pom.xml ---------------------------------------------------------------------- diff --git a/repl/pom.xml b/repl/pom.xml index fa015b6..c7de67e 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -20,12 +20,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>spark-repl_2.11</artifactId> + <artifactId>spark-repl_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project REPL</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/resource-managers/kubernetes/core/pom.xml ---------------------------------------------------------------------- diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index b89ea38..8d594ee 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -19,12 +19,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> - <artifactId>spark-kubernetes_2.11</artifactId> + <artifactId>spark-kubernetes_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Kubernetes</name> <properties> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/resource-managers/kubernetes/integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index 301b6fe..17af0e0 100644 --- a/resource-managers/kubernetes/integration-tests/pom.xml +++ b/resource-managers/kubernetes/integration-tests/pom.xml @@ -19,12 +19,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> - <artifactId>spark-kubernetes-integration-tests_2.11</artifactId> + <artifactId>spark-kubernetes-integration-tests_2.12</artifactId> <properties> <download-maven-plugin.version>1.3.0</download-maven-plugin.version> <exec-maven-plugin.version>1.4.0</exec-maven-plugin.version> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/resource-managers/mesos/pom.xml ---------------------------------------------------------------------- diff --git a/resource-managers/mesos/pom.xml b/resource-managers/mesos/pom.xml index 9585bdf..7b3aad4 100644 --- a/resource-managers/mesos/pom.xml +++ b/resource-managers/mesos/pom.xml @@ -19,12 +19,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-mesos_2.11</artifactId> + <artifactId>spark-mesos_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Mesos</name> <properties> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/resource-managers/yarn/pom.xml ---------------------------------------------------------------------- diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index e55b814..d18df99 100644 --- a/resource-managers/yarn/pom.xml +++ b/resource-managers/yarn/pom.xml @@ -19,12 +19,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-yarn_2.11</artifactId> + <artifactId>spark-yarn_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project YARN</name> <properties> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/sql/catalyst/pom.xml ---------------------------------------------------------------------- diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 16ecebf..20cc5d0 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -21,12 +21,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-catalyst_2.11</artifactId> + <artifactId>spark-catalyst_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Catalyst</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/sql/core/pom.xml ---------------------------------------------------------------------- diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 95e98c5..ac5f1fc 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -21,12 +21,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-sql_2.11</artifactId> + <artifactId>spark-sql_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project SQL</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/sql/hive-thriftserver/pom.xml ---------------------------------------------------------------------- diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 55e051c..4a4629f 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -21,12 +21,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-hive-thriftserver_2.11</artifactId> + <artifactId>spark-hive-thriftserver_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Hive Thrift Server</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/sql/hive/pom.xml ---------------------------------------------------------------------- diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index ef22e2a..9994689 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -21,12 +21,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>spark-hive_2.11</artifactId> + <artifactId>spark-hive_2.12</artifactId> <packaging>jar</packaging> <name>Spark Project Hive</name> <url>http://spark.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/streaming/pom.xml ---------------------------------------------------------------------- diff --git a/streaming/pom.xml b/streaming/pom.xml index f9a5029..1d1ea46 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -20,12 +20,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>spark-streaming_2.11</artifactId> + <artifactId>spark-streaming_2.12</artifactId> <properties> <sbt.project.name>streaming</sbt.project.name> </properties> http://git-wip-us.apache.org/repos/asf/spark/blob/ad853c56/tools/pom.xml ---------------------------------------------------------------------- diff --git a/tools/pom.xml b/tools/pom.xml index 247f5a6..6286fad 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -19,12 +19,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> + <artifactId>spark-parent_2.12</artifactId> <version>3.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>spark-tools_2.11</artifactId> + <artifactId>spark-tools_2.12</artifactId> <properties> <sbt.project.name>tools</sbt.project.name> </properties> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
