From 98c0fea83808d736fb4c073629679290eddf17f8 Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Sat, 25 Mar 2023 10:54:31 +0800 Subject: [PATCH 1/5] split --- .../datetime-special-ansi.sql.out | 26 ++++++++++++++++ .../timestampNTZ/datetime-special-ansi.sql | 2 ++ .../inputs/timestampNTZ/datetime-special.sql | 1 + .../datetime-special-ansi.sql.out | 31 +++++++++++++++++++ 4 files changed, 60 insertions(+) create mode 100644 sql/core/src/test/resources/sql-tests/analyzer-results/timestampNTZ/datetime-special-ansi.sql.out create mode 100644 sql/core/src/test/resources/sql-tests/inputs/timestampNTZ/datetime-special-ansi.sql create mode 100644 sql/core/src/test/resources/sql-tests/results/timestampNTZ/datetime-special-ansi.sql.out diff --git a/sql/core/src/test/resources/sql-tests/analyzer-results/timestampNTZ/datetime-special-ansi.sql.out b/sql/core/src/test/resources/sql-tests/analyzer-results/timestampNTZ/datetime-special-ansi.sql.out new file mode 100644 index 0000000000000..0f8ad6eb2ccfb --- /dev/null +++ b/sql/core/src/test/resources/sql-tests/analyzer-results/timestampNTZ/datetime-special-ansi.sql.out @@ -0,0 +1,26 @@ +-- Automatically generated by SQLQueryTestSuite +-- !query +select date'999999-03-18', date'-0001-1-28', date'0015' +-- !query analysis +[Analyzer test output redacted due to nondeterminism] + + +-- !query +select make_date(999999, 3, 18), make_date(-1, 1, 28) +-- !query analysis +Project [make_date(999999, 3, 18, true) AS make_date(999999, 3, 18)#x, make_date(-1, 1, 28, true) AS make_date(-1, 1, 28)#x] ++- OneRowRelation + + +-- !query +select timestamp'-1969-12-31 16:00:00', timestamp'-0015-03-18 16:00:00', timestamp'-000001', timestamp'99999-03-18T12:03:17' +-- !query analysis +Project [-1969-12-31 16:00:00 AS TIMESTAMP_NTZ '-1969-12-31 16:00:00'#x, -0015-03-18 16:00:00 AS TIMESTAMP_NTZ '-0015-03-18 16:00:00'#x, -0001-01-01 00:00:00 AS TIMESTAMP_NTZ '-0001-01-01 00:00:00'#x, +99999-03-18 12:03:17 AS TIMESTAMP_NTZ '+99999-03-18 12:03:17'#x] ++- OneRowRelation + + +-- !query +select make_timestamp(-1969, 12, 31, 16, 0, 0.0), make_timestamp(-15, 3, 18, 16, 0, 0.0), make_timestamp(99999, 3, 18, 12, 3, 17.0) +-- !query analysis +Project [make_timestamp(-1969, 12, 31, 16, 0, cast(0.0 as decimal(16,6)), None, Some(America/Los_Angeles), true, TimestampNTZType) AS make_timestamp(-1969, 12, 31, 16, 0, 0.0)#x, make_timestamp(-15, 3, 18, 16, 0, cast(0.0 as decimal(16,6)), None, Some(America/Los_Angeles), true, TimestampNTZType) AS make_timestamp(-15, 3, 18, 16, 0, 0.0)#x, make_timestamp(99999, 3, 18, 12, 3, cast(17.0 as decimal(16,6)), None, Some(America/Los_Angeles), true, TimestampNTZType) AS make_timestamp(99999, 3, 18, 12, 3, 17.0)#x] ++- OneRowRelation diff --git a/sql/core/src/test/resources/sql-tests/inputs/timestampNTZ/datetime-special-ansi.sql b/sql/core/src/test/resources/sql-tests/inputs/timestampNTZ/datetime-special-ansi.sql new file mode 100644 index 0000000000000..527f81fa5abff --- /dev/null +++ b/sql/core/src/test/resources/sql-tests/inputs/timestampNTZ/datetime-special-ansi.sql @@ -0,0 +1,2 @@ +--SET spark.sql.ansi.enabled = true +--IMPORT datetime-special.sql diff --git a/sql/core/src/test/resources/sql-tests/inputs/timestampNTZ/datetime-special.sql b/sql/core/src/test/resources/sql-tests/inputs/timestampNTZ/datetime-special.sql index 87a5986ae9a9c..a9aa3f3f6a3ac 100644 --- a/sql/core/src/test/resources/sql-tests/inputs/timestampNTZ/datetime-special.sql +++ b/sql/core/src/test/resources/sql-tests/inputs/timestampNTZ/datetime-special.sql @@ -1 +1,2 @@ +--SET spark.sql.ansi.enabled = false --IMPORT datetime-special.sql diff --git a/sql/core/src/test/resources/sql-tests/results/timestampNTZ/datetime-special-ansi.sql.out b/sql/core/src/test/resources/sql-tests/results/timestampNTZ/datetime-special-ansi.sql.out new file mode 100644 index 0000000000000..c8cdec4eeb984 --- /dev/null +++ b/sql/core/src/test/resources/sql-tests/results/timestampNTZ/datetime-special-ansi.sql.out @@ -0,0 +1,31 @@ +-- Automatically generated by SQLQueryTestSuite +-- !query +select date'999999-03-18', date'-0001-1-28', date'0015' +-- !query schema +struct +-- !query output ++999999-03-18 -0001-01-28 0015-01-01 + + +-- !query +select make_date(999999, 3, 18), make_date(-1, 1, 28) +-- !query schema +struct +-- !query output ++999999-03-18 -0001-01-28 + + +-- !query +select timestamp'-1969-12-31 16:00:00', timestamp'-0015-03-18 16:00:00', timestamp'-000001', timestamp'99999-03-18T12:03:17' +-- !query schema +struct +-- !query output +-1969-12-31 16:00:00 -0015-03-18 16:00:00 -0001-01-01 00:00:00 +99999-03-18 12:03:17 + + +-- !query +select make_timestamp(-1969, 12, 31, 16, 0, 0.0), make_timestamp(-15, 3, 18, 16, 0, 0.0), make_timestamp(99999, 3, 18, 12, 3, 17.0) +-- !query schema +struct +-- !query output +-1969-12-31 16:00:00 -0015-03-18 16:00:00 +99999-03-18 12:03:17 From 16e2e6c375f4f5a10b8dcf50b39a41d1eb02a223 Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Sat, 25 Mar 2023 13:36:38 +0800 Subject: [PATCH 2/5] ignore datetime-special-ansi.sql in ThriftServerQueryTestSuite --- 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 ++-- connector/avro/pom.xml | 8 ++++---- connector/connect/client/jvm/pom.xml | 4 ++-- connector/connect/common/pom.xml | 4 ++-- connector/connect/server/pom.xml | 8 ++++---- connector/docker-integration-tests/pom.xml | 4 ++-- connector/kafka-0-10-assembly/pom.xml | 4 ++-- connector/kafka-0-10-sql/pom.xml | 8 ++++---- connector/kafka-0-10-token-provider/pom.xml | 4 ++-- connector/kafka-0-10/pom.xml | 8 ++++---- connector/kinesis-asl-assembly/pom.xml | 4 ++-- connector/kinesis-asl/pom.xml | 4 ++-- connector/protobuf/pom.xml | 8 ++++---- connector/spark-ganglia-lgpl/pom.xml | 4 ++-- core/pom.xml | 8 ++++---- dev/mima | 8 ++++---- docs/_plugins/copy_api_dirs.rb | 14 +++++++------- examples/pom.xml | 4 ++-- graphx/pom.xml | 4 ++-- hadoop-cloud/pom.xml | 4 ++-- launcher/pom.xml | 4 ++-- mllib-local/pom.xml | 4 ++-- mllib/pom.xml | 8 ++++---- pom.xml | 12 ++++++------ 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 | 8 ++++---- sql/core/pom.xml | 8 ++++---- sql/hive-thriftserver/pom.xml | 8 ++++---- .../thriftserver/ThriftServerQueryTestSuite.scala | 2 ++ sql/hive/pom.xml | 8 ++++---- streaming/pom.xml | 8 ++++---- tools/pom.xml | 4 ++-- 43 files changed, 121 insertions(+), 119 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 36cc607843831..7ec818bc63856 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../pom.xml - spark-assembly_2.12 + spark-assembly_2.13 Spark Project Assembly https://spark.apache.org/ pom diff --git a/common/kvstore/pom.xml b/common/kvstore/pom.xml index bef8303874b20..69f9f186e0889 100644 --- a/common/kvstore/pom.xml +++ b/common/kvstore/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-kvstore_2.12 + spark-kvstore_2.13 jar Spark Project Local DB https://spark.apache.org/ diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index 8a63e999c53cd..9f90d12216e69 100644 --- a/common/network-common/pom.xml +++ b/common/network-common/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-network-common_2.12 + spark-network-common_2.13 jar Spark Project Networking https://spark.apache.org/ diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index a8bde14a259f0..864f1cc2d3715 100644 --- a/common/network-shuffle/pom.xml +++ b/common/network-shuffle/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-network-shuffle_2.12 + spark-network-shuffle_2.13 jar Spark Project Shuffle Streaming Service https://spark.apache.org/ diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index 080bf7ab438bd..a49ee6851e5df 100644 --- a/common/network-yarn/pom.xml +++ b/common/network-yarn/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-network-yarn_2.12 + spark-network-yarn_2.13 jar Spark Project YARN Shuffle Service https://spark.apache.org/ diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index 4cc597519c3dd..6cf1a4fb83e56 100644 --- a/common/sketch/pom.xml +++ b/common/sketch/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-sketch_2.12 + spark-sketch_2.13 jar Spark Project Sketch https://spark.apache.org/ diff --git a/common/tags/pom.xml b/common/tags/pom.xml index 9a44c847d8a03..1eb8352e32df3 100644 --- a/common/tags/pom.xml +++ b/common/tags/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-tags_2.12 + spark-tags_2.13 jar Spark Project Tags https://spark.apache.org/ diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index a61f00084eb64..e37f1b80a5045 100644 --- a/common/unsafe/pom.xml +++ b/common/unsafe/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-unsafe_2.12 + spark-unsafe_2.13 jar Spark Project Unsafe https://spark.apache.org/ diff --git a/connector/avro/pom.xml b/connector/avro/pom.xml index 597e3c2235f7a..7087fdbccd04d 100644 --- a/connector/avro/pom.xml +++ b/connector/avro/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-avro_2.12 + spark-avro_2.13 avro @@ -70,12 +70,12 @@ org.apache.spark spark-tags_${scala.binary.version} - org.scala-lang.modules scala-parallel-collections_${scala.binary.version} - --> + org.tukaani xz diff --git a/connector/connect/client/jvm/pom.xml b/connector/connect/client/jvm/pom.xml index 8543057d0c0d1..507ca75c33f62 100644 --- a/connector/connect/client/jvm/pom.xml +++ b/connector/connect/client/jvm/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../../../pom.xml - spark-connect-client-jvm_2.12 + spark-connect-client-jvm_2.13 jar Spark Project Connect Client https://spark.apache.org/ diff --git a/connector/connect/common/pom.xml b/connector/connect/common/pom.xml index e457620e5930d..5e57500c621c2 100644 --- a/connector/connect/common/pom.xml +++ b/connector/connect/common/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../../pom.xml - spark-connect-common_2.12 + spark-connect-common_2.13 jar Spark Project Connect Common https://spark.apache.org/ diff --git a/connector/connect/server/pom.xml b/connector/connect/server/pom.xml index 838d7bf2bd38c..bc3013a7689a7 100644 --- a/connector/connect/server/pom.xml +++ b/connector/connect/server/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../../pom.xml - spark-connect_2.12 + spark-connect_2.13 jar Spark Project Connect Server https://spark.apache.org/ @@ -144,12 +144,12 @@ - org.scala-lang.modules scala-parallel-collections_${scala.binary.version} - --> + com.google.guava guava diff --git a/connector/docker-integration-tests/pom.xml b/connector/docker-integration-tests/pom.xml index cc549487a8b57..e40269838522d 100644 --- a/connector/docker-integration-tests/pom.xml +++ b/connector/docker-integration-tests/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-docker-integration-tests_2.12 + spark-docker-integration-tests_2.13 jar Spark Project Docker Integration Tests https://spark.apache.org/ diff --git a/connector/kafka-0-10-assembly/pom.xml b/connector/kafka-0-10-assembly/pom.xml index caa591320d45d..b7af1458e1709 100644 --- a/connector/kafka-0-10-assembly/pom.xml +++ b/connector/kafka-0-10-assembly/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-streaming-kafka-0-10-assembly_2.12 + spark-streaming-kafka-0-10-assembly_2.13 jar Spark Integration for Kafka 0.10 Assembly https://spark.apache.org/ diff --git a/connector/kafka-0-10-sql/pom.xml b/connector/kafka-0-10-sql/pom.xml index fdd1196cd446a..f5a12b61c2bea 100644 --- a/connector/kafka-0-10-sql/pom.xml +++ b/connector/kafka-0-10-sql/pom.xml @@ -20,13 +20,13 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml org.apache.spark - spark-sql-kafka-0-10_2.12 + spark-sql-kafka-0-10_2.13 sql-kafka-0-10 @@ -74,12 +74,12 @@ test-jar test - org.scala-lang.modules scala-parallel-collections_${scala.binary.version} - --> + org.apache.kafka kafka-clients diff --git a/connector/kafka-0-10-token-provider/pom.xml b/connector/kafka-0-10-token-provider/pom.xml index 06b1462b439b2..c9d2b9ec82a2e 100644 --- a/connector/kafka-0-10-token-provider/pom.xml +++ b/connector/kafka-0-10-token-provider/pom.xml @@ -20,13 +20,13 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml org.apache.spark - spark-token-provider-kafka-0-10_2.12 + spark-token-provider-kafka-0-10_2.13 token-provider-kafka-0-10 diff --git a/connector/kafka-0-10/pom.xml b/connector/kafka-0-10/pom.xml index 706eb2dd2c399..f1820bb595a2d 100644 --- a/connector/kafka-0-10/pom.xml +++ b/connector/kafka-0-10/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-streaming-kafka-0-10_2.12 + spark-streaming-kafka-0-10_2.13 streaming-kafka-0-10 @@ -59,12 +59,12 @@ test-jar test - org.scala-lang.modules scala-parallel-collections_${scala.binary.version} - --> + org.apache.kafka kafka-clients diff --git a/connector/kinesis-asl-assembly/pom.xml b/connector/kinesis-asl-assembly/pom.xml index 1f45d72ed2e93..42173873488f5 100644 --- a/connector/kinesis-asl-assembly/pom.xml +++ b/connector/kinesis-asl-assembly/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-streaming-kinesis-asl-assembly_2.12 + spark-streaming-kinesis-asl-assembly_2.13 jar Spark Project Kinesis Assembly https://spark.apache.org/ diff --git a/connector/kinesis-asl/pom.xml b/connector/kinesis-asl/pom.xml index c70a073e73407..af9cd4b7ec96e 100644 --- a/connector/kinesis-asl/pom.xml +++ b/connector/kinesis-asl/pom.xml @@ -19,13 +19,13 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-streaming-kinesis-asl_2.12 + spark-streaming-kinesis-asl_2.13 jar Spark Kinesis Integration diff --git a/connector/protobuf/pom.xml b/connector/protobuf/pom.xml index f4b8af0e64eb9..868cf081d0425 100644 --- a/connector/protobuf/pom.xml +++ b/connector/protobuf/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-protobuf_2.12 + spark-protobuf_2.13 protobuf @@ -70,12 +70,12 @@ org.apache.spark spark-tags_${scala.binary.version} - org.scala-lang.modules scala-parallel-collections_${scala.binary.version} - --> + com.google.protobuf protobuf-java diff --git a/connector/spark-ganglia-lgpl/pom.xml b/connector/spark-ganglia-lgpl/pom.xml index c0dcde1355849..00f4769fd60ad 100644 --- a/connector/spark-ganglia-lgpl/pom.xml +++ b/connector/spark-ganglia-lgpl/pom.xml @@ -19,13 +19,13 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-ganglia-lgpl_2.12 + spark-ganglia-lgpl_2.13 jar Spark Ganglia Integration diff --git a/core/pom.xml b/core/pom.xml index 00ce0ef2bc041..d17d99b0f506e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../pom.xml - spark-core_2.12 + spark-core_2.13 jar Spark Project Core https://spark.apache.org/ @@ -35,12 +35,12 @@ - org.scala-lang.modules scala-parallel-collections_${scala.binary.version} - --> + org.apache.avro avro diff --git a/dev/mima b/dev/mima index b3aa374760641..080de7b765421 100755 --- a/dev/mima +++ b/dev/mima @@ -24,9 +24,9 @@ set -e FWDIR="$(cd "`dirname "$0"`"/..; pwd)" cd "$FWDIR" -SPARK_PROFILES=${1:-"-Pmesos -Pkubernetes -Pyarn -Pspark-ganglia-lgpl -Pkinesis-asl -Phive-thriftserver -Phive"} -TOOLS_CLASSPATH="$(build/sbt -DcopyDependencies=false "export tools/fullClasspath" | grep jar | tail -n1)" -OLD_DEPS_CLASSPATH="$(build/sbt -DcopyDependencies=false $SPARK_PROFILES "export oldDeps/fullClasspath" | grep jar | tail -n1)" +SPARK_PROFILES=${1:-"-Pscala-2.13 -Pmesos -Pkubernetes -Pyarn -Pspark-ganglia-lgpl -Pkinesis-asl -Phive-thriftserver -Phive"} +TOOLS_CLASSPATH="$(build/sbt -Pscala-2.13 -DcopyDependencies=false "export tools/fullClasspath" | grep jar | tail -n1)" +OLD_DEPS_CLASSPATH="$(build/sbt -Pscala-2.13 -DcopyDependencies=false $SPARK_PROFILES "export oldDeps/fullClasspath" | grep jar | tail -n1)" rm -f .generated-mima* @@ -42,7 +42,7 @@ $JAVA_CMD \ -cp "$TOOLS_CLASSPATH:$OLD_DEPS_CLASSPATH" \ org.apache.spark.tools.GenerateMIMAIgnore -echo -e "q\n" | build/sbt -mem 4096 -DcopyDependencies=false "$@" mimaReportBinaryIssues | grep -v -e "info.*Resolving" +echo -e "q\n" | build/sbt -Pscala-2.13 -mem 4096 -DcopyDependencies=false "$@" mimaReportBinaryIssues | grep -v -e "info.*Resolving" ret_val=$? if [ $ret_val != 0 ]; then diff --git a/docs/_plugins/copy_api_dirs.rb b/docs/_plugins/copy_api_dirs.rb index 28d5e0d82c93a..9cb073ef1e00c 100644 --- a/docs/_plugins/copy_api_dirs.rb +++ b/docs/_plugins/copy_api_dirs.rb @@ -26,8 +26,8 @@ curr_dir = pwd cd("..") - puts "Running 'build/sbt -Pkinesis-asl clean compile unidoc' from " + pwd + "; this may take a few minutes..." - system("build/sbt -Pkinesis-asl clean compile unidoc") || raise("Unidoc generation failed") + puts "Running 'build/sbt -Pscala-2.13 -Pkinesis-asl clean compile unidoc' from " + pwd + "; this may take a few minutes..." + system("build/sbt -Pscala-2.13 -Pkinesis-asl clean compile unidoc") || raise("Unidoc generation failed") puts "Moving back into docs dir." cd("docs") @@ -37,7 +37,7 @@ # 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.12/unidoc" + source = "../target/scala-2.13/unidoc" dest = "api/scala" puts "Making directory " + dest @@ -119,8 +119,8 @@ puts "Moving to project root and building API docs." cd("..") - puts "Running 'build/sbt clean package -Phive' from " + pwd + "; this may take a few minutes..." - system("build/sbt clean package -Phive") || raise("PySpark doc generation failed") + puts "Running 'build/sbt -Pscala-2.13 clean package -Phive' from " + pwd + "; this may take a few minutes..." + system("build/sbt -Pscala-2.13 clean package -Phive") || raise("PySpark doc generation failed") puts "Moving back into docs dir." cd("docs") @@ -165,8 +165,8 @@ puts "Moving to project root and building API docs." cd("..") - puts "Running 'build/sbt clean package -Phive' from " + pwd + "; this may take a few minutes..." - system("build/sbt clean package -Phive") || raise("SQL doc generation failed") + puts "Running 'build/sbt -Pscala-2.13 clean package -Phive' from " + pwd + "; this may take a few minutes..." + system("build/sbt -Pscala-2.13 clean package -Phive") || raise("SQL doc generation failed") puts "Moving back into docs dir." cd("docs") diff --git a/examples/pom.xml b/examples/pom.xml index e8f22b995fded..57e41724bdca4 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../pom.xml - spark-examples_2.12 + spark-examples_2.13 jar Spark Project Examples https://spark.apache.org/ diff --git a/graphx/pom.xml b/graphx/pom.xml index 48baeb9a87560..5d01dd06c0ecb 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../pom.xml - spark-graphx_2.12 + spark-graphx_2.13 graphx diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index 58eddd295fdfc..bf7310d4b7ccc 100644 --- a/hadoop-cloud/pom.xml +++ b/hadoop-cloud/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../pom.xml - spark-hadoop-cloud_2.12 + spark-hadoop-cloud_2.13 jar Spark Project Hadoop Cloud Integration diff --git a/launcher/pom.xml b/launcher/pom.xml index 32b0c3d1bb074..905bc785d7aa5 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../pom.xml - spark-launcher_2.12 + spark-launcher_2.13 jar Spark Project Launcher https://spark.apache.org/ diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index 00c16a8b6a544..83ca643f43bce 100644 --- a/mllib-local/pom.xml +++ b/mllib-local/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../pom.xml - spark-mllib-local_2.12 + spark-mllib-local_2.13 mllib-local diff --git a/mllib/pom.xml b/mllib/pom.xml index 73af83c758688..07290124273f2 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../pom.xml - spark-mllib_2.12 + spark-mllib_2.13 mllib @@ -91,12 +91,12 @@ test-jar test - org.scala-lang.modules scala-parallel-collections_${scala.binary.version} - --> + org.scalanlp breeze_${scala.binary.version} diff --git a/pom.xml b/pom.xml index 10e4da4dcb0d1..7ef04588153e4 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 18 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT pom Spark Project Parent POM @@ -168,8 +168,8 @@ 3.2.2 4.4 - 2.12.17 - 2.12 + 2.13.8 + 2.13 2.2.0 org.scala-lang.modules scala-parallel-collections_${scala.binary.version} 1.0.4 - --> + com.twitter chill_${scala.binary.version} @@ -1099,7 +1099,7 @@ org.scala-lang.modules - scala-xml_2.12 + scala-xml_2.13 diff --git a/repl/pom.xml b/repl/pom.xml index 8c0f9f989c170..74ac775100cb8 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../pom.xml - spark-repl_2.12 + spark-repl_2.13 jar Spark Project REPL https://spark.apache.org/ diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index 9dab5496184e2..72c7f1f12f42d 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -19,12 +19,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../../pom.xml - spark-kubernetes_2.12 + spark-kubernetes_2.13 jar Spark Project Kubernetes diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index 1ffd5adba8426..7a5498a7c6005 100644 --- a/resource-managers/kubernetes/integration-tests/pom.xml +++ b/resource-managers/kubernetes/integration-tests/pom.xml @@ -19,12 +19,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../../pom.xml - spark-kubernetes-integration-tests_2.12 + spark-kubernetes-integration-tests_2.13 kubernetes-integration-tests diff --git a/resource-managers/mesos/pom.xml b/resource-managers/mesos/pom.xml index 7510ecac3e7fc..267d6c7d84f21 100644 --- a/resource-managers/mesos/pom.xml +++ b/resource-managers/mesos/pom.xml @@ -19,12 +19,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-mesos_2.12 + spark-mesos_2.13 jar Spark Project Mesos diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index 19cfdb8dcda02..8657ab7b42088 100644 --- a/resource-managers/yarn/pom.xml +++ b/resource-managers/yarn/pom.xml @@ -19,12 +19,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-yarn_2.12 + spark-yarn_2.13 jar Spark Project YARN diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 73a5899a2a591..ebb44d0204722 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-catalyst_2.12 + spark-catalyst_2.13 jar Spark Project Catalyst https://spark.apache.org/ @@ -87,12 +87,12 @@ spark-sketch_${scala.binary.version} ${project.version} - org.scala-lang.modules scala-parallel-collections_${scala.binary.version} - --> + org.scalacheck scalacheck_${scala.binary.version} diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 1ac4ebd0299a7..62381eabf8088 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-sql_2.12 + spark-sql_2.13 jar Spark Project SQL https://spark.apache.org/ @@ -89,12 +89,12 @@ test - org.scala-lang.modules scala-parallel-collections_${scala.binary.version} - --> + org.apache.orc orc-core diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index ad7fc0d2ac4bd..4bbb92d1376a0 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-hive-thriftserver_2.12 + spark-hive-thriftserver_2.13 jar Spark Project Hive Thrift Server https://spark.apache.org/ @@ -61,12 +61,12 @@ test-jar test - org.scala-lang.modules scala-parallel-collections_${scala.binary.version} - --> + com.google.guava guava diff --git a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/ThriftServerQueryTestSuite.scala b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/ThriftServerQueryTestSuite.scala index cf0184f6608da..1cddbb4623e9f 100644 --- a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/ThriftServerQueryTestSuite.scala +++ b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/ThriftServerQueryTestSuite.scala @@ -88,6 +88,8 @@ class ThriftServerQueryTestSuite extends SQLQueryTestSuite with SharedThriftServ "datetime-special.sql", "ansi/datetime-special.sql", "timestampNTZ/datetime-special.sql", + // SPARK-42921 + "timestampNTZ/datetime-special-ansi.sql", // SPARK-28620 "postgreSQL/float4.sql", // SPARK-28636 diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index ae8bb135aec79..6954e6f11e846 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.12 + spark-parent_2.13 3.5.0-SNAPSHOT ../../pom.xml - spark-hive_2.12 + spark-hive_2.13 jar Spark Project Hive https://spark.apache.org/ @@ -79,12 +79,12 @@ test-jar test - org.scala-lang.modules scala-parallel-collections_${scala.binary.version} - --> + org.scala-lang.modules scala-parallel-collections_${scala.binary.version} - --> + + + --> org.tukaani xz diff --git a/connector/connect/client/jvm/pom.xml b/connector/connect/client/jvm/pom.xml index 507ca75c33f62..8543057d0c0d1 100644 --- a/connector/connect/client/jvm/pom.xml +++ b/connector/connect/client/jvm/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../../../pom.xml - spark-connect-client-jvm_2.13 + spark-connect-client-jvm_2.12 jar Spark Project Connect Client https://spark.apache.org/ diff --git a/connector/connect/common/pom.xml b/connector/connect/common/pom.xml index 5e57500c621c2..e457620e5930d 100644 --- a/connector/connect/common/pom.xml +++ b/connector/connect/common/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../../pom.xml - spark-connect-common_2.13 + spark-connect-common_2.12 jar Spark Project Connect Common https://spark.apache.org/ diff --git a/connector/connect/server/pom.xml b/connector/connect/server/pom.xml index bc3013a7689a7..838d7bf2bd38c 100644 --- a/connector/connect/server/pom.xml +++ b/connector/connect/server/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../../pom.xml - spark-connect_2.13 + spark-connect_2.12 jar Spark Project Connect Server https://spark.apache.org/ @@ -144,12 +144,12 @@ - + + --> com.google.guava guava diff --git a/connector/docker-integration-tests/pom.xml b/connector/docker-integration-tests/pom.xml index e40269838522d..cc549487a8b57 100644 --- a/connector/docker-integration-tests/pom.xml +++ b/connector/docker-integration-tests/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../pom.xml - spark-docker-integration-tests_2.13 + spark-docker-integration-tests_2.12 jar Spark Project Docker Integration Tests https://spark.apache.org/ diff --git a/connector/kafka-0-10-assembly/pom.xml b/connector/kafka-0-10-assembly/pom.xml index b7af1458e1709..caa591320d45d 100644 --- a/connector/kafka-0-10-assembly/pom.xml +++ b/connector/kafka-0-10-assembly/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../pom.xml - spark-streaming-kafka-0-10-assembly_2.13 + spark-streaming-kafka-0-10-assembly_2.12 jar Spark Integration for Kafka 0.10 Assembly https://spark.apache.org/ diff --git a/connector/kafka-0-10-sql/pom.xml b/connector/kafka-0-10-sql/pom.xml index f5a12b61c2bea..fdd1196cd446a 100644 --- a/connector/kafka-0-10-sql/pom.xml +++ b/connector/kafka-0-10-sql/pom.xml @@ -20,13 +20,13 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../pom.xml org.apache.spark - spark-sql-kafka-0-10_2.13 + spark-sql-kafka-0-10_2.12 sql-kafka-0-10 @@ -74,12 +74,12 @@ test-jar test - + + --> org.apache.kafka kafka-clients diff --git a/connector/kafka-0-10-token-provider/pom.xml b/connector/kafka-0-10-token-provider/pom.xml index c9d2b9ec82a2e..06b1462b439b2 100644 --- a/connector/kafka-0-10-token-provider/pom.xml +++ b/connector/kafka-0-10-token-provider/pom.xml @@ -20,13 +20,13 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../pom.xml org.apache.spark - spark-token-provider-kafka-0-10_2.13 + spark-token-provider-kafka-0-10_2.12 token-provider-kafka-0-10 diff --git a/connector/kafka-0-10/pom.xml b/connector/kafka-0-10/pom.xml index f1820bb595a2d..706eb2dd2c399 100644 --- a/connector/kafka-0-10/pom.xml +++ b/connector/kafka-0-10/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../pom.xml - spark-streaming-kafka-0-10_2.13 + spark-streaming-kafka-0-10_2.12 streaming-kafka-0-10 @@ -59,12 +59,12 @@ test-jar test - + + --> org.apache.kafka kafka-clients diff --git a/connector/kinesis-asl-assembly/pom.xml b/connector/kinesis-asl-assembly/pom.xml index 42173873488f5..1f45d72ed2e93 100644 --- a/connector/kinesis-asl-assembly/pom.xml +++ b/connector/kinesis-asl-assembly/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../pom.xml - spark-streaming-kinesis-asl-assembly_2.13 + spark-streaming-kinesis-asl-assembly_2.12 jar Spark Project Kinesis Assembly https://spark.apache.org/ diff --git a/connector/kinesis-asl/pom.xml b/connector/kinesis-asl/pom.xml index af9cd4b7ec96e..c70a073e73407 100644 --- a/connector/kinesis-asl/pom.xml +++ b/connector/kinesis-asl/pom.xml @@ -19,13 +19,13 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../pom.xml - spark-streaming-kinesis-asl_2.13 + spark-streaming-kinesis-asl_2.12 jar Spark Kinesis Integration diff --git a/connector/protobuf/pom.xml b/connector/protobuf/pom.xml index 868cf081d0425..f4b8af0e64eb9 100644 --- a/connector/protobuf/pom.xml +++ b/connector/protobuf/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../pom.xml - spark-protobuf_2.13 + spark-protobuf_2.12 protobuf @@ -70,12 +70,12 @@ org.apache.spark spark-tags_${scala.binary.version} - + + --> com.google.protobuf protobuf-java diff --git a/connector/spark-ganglia-lgpl/pom.xml b/connector/spark-ganglia-lgpl/pom.xml index 00f4769fd60ad..c0dcde1355849 100644 --- a/connector/spark-ganglia-lgpl/pom.xml +++ b/connector/spark-ganglia-lgpl/pom.xml @@ -19,13 +19,13 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../pom.xml - spark-ganglia-lgpl_2.13 + spark-ganglia-lgpl_2.12 jar Spark Ganglia Integration diff --git a/core/pom.xml b/core/pom.xml index d17d99b0f506e..00ce0ef2bc041 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../pom.xml - spark-core_2.13 + spark-core_2.12 jar Spark Project Core https://spark.apache.org/ @@ -35,12 +35,12 @@ - + + --> org.apache.avro avro diff --git a/dev/mima b/dev/mima index 080de7b765421..b3aa374760641 100755 --- a/dev/mima +++ b/dev/mima @@ -24,9 +24,9 @@ set -e FWDIR="$(cd "`dirname "$0"`"/..; pwd)" cd "$FWDIR" -SPARK_PROFILES=${1:-"-Pscala-2.13 -Pmesos -Pkubernetes -Pyarn -Pspark-ganglia-lgpl -Pkinesis-asl -Phive-thriftserver -Phive"} -TOOLS_CLASSPATH="$(build/sbt -Pscala-2.13 -DcopyDependencies=false "export tools/fullClasspath" | grep jar | tail -n1)" -OLD_DEPS_CLASSPATH="$(build/sbt -Pscala-2.13 -DcopyDependencies=false $SPARK_PROFILES "export oldDeps/fullClasspath" | grep jar | tail -n1)" +SPARK_PROFILES=${1:-"-Pmesos -Pkubernetes -Pyarn -Pspark-ganglia-lgpl -Pkinesis-asl -Phive-thriftserver -Phive"} +TOOLS_CLASSPATH="$(build/sbt -DcopyDependencies=false "export tools/fullClasspath" | grep jar | tail -n1)" +OLD_DEPS_CLASSPATH="$(build/sbt -DcopyDependencies=false $SPARK_PROFILES "export oldDeps/fullClasspath" | grep jar | tail -n1)" rm -f .generated-mima* @@ -42,7 +42,7 @@ $JAVA_CMD \ -cp "$TOOLS_CLASSPATH:$OLD_DEPS_CLASSPATH" \ org.apache.spark.tools.GenerateMIMAIgnore -echo -e "q\n" | build/sbt -Pscala-2.13 -mem 4096 -DcopyDependencies=false "$@" mimaReportBinaryIssues | grep -v -e "info.*Resolving" +echo -e "q\n" | build/sbt -mem 4096 -DcopyDependencies=false "$@" mimaReportBinaryIssues | grep -v -e "info.*Resolving" ret_val=$? if [ $ret_val != 0 ]; then diff --git a/docs/_plugins/copy_api_dirs.rb b/docs/_plugins/copy_api_dirs.rb index 9cb073ef1e00c..28d5e0d82c93a 100644 --- a/docs/_plugins/copy_api_dirs.rb +++ b/docs/_plugins/copy_api_dirs.rb @@ -26,8 +26,8 @@ curr_dir = pwd cd("..") - puts "Running 'build/sbt -Pscala-2.13 -Pkinesis-asl clean compile unidoc' from " + pwd + "; this may take a few minutes..." - system("build/sbt -Pscala-2.13 -Pkinesis-asl clean compile unidoc") || raise("Unidoc generation failed") + puts "Running 'build/sbt -Pkinesis-asl clean compile unidoc' from " + pwd + "; this may take a few minutes..." + system("build/sbt -Pkinesis-asl clean compile unidoc") || raise("Unidoc generation failed") puts "Moving back into docs dir." cd("docs") @@ -37,7 +37,7 @@ # 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.13/unidoc" + source = "../target/scala-2.12/unidoc" dest = "api/scala" puts "Making directory " + dest @@ -119,8 +119,8 @@ puts "Moving to project root and building API docs." cd("..") - puts "Running 'build/sbt -Pscala-2.13 clean package -Phive' from " + pwd + "; this may take a few minutes..." - system("build/sbt -Pscala-2.13 clean package -Phive") || raise("PySpark doc generation failed") + puts "Running 'build/sbt clean package -Phive' from " + pwd + "; this may take a few minutes..." + system("build/sbt clean package -Phive") || raise("PySpark doc generation failed") puts "Moving back into docs dir." cd("docs") @@ -165,8 +165,8 @@ puts "Moving to project root and building API docs." cd("..") - puts "Running 'build/sbt -Pscala-2.13 clean package -Phive' from " + pwd + "; this may take a few minutes..." - system("build/sbt -Pscala-2.13 clean package -Phive") || raise("SQL doc generation failed") + puts "Running 'build/sbt clean package -Phive' from " + pwd + "; this may take a few minutes..." + system("build/sbt clean package -Phive") || raise("SQL doc generation failed") puts "Moving back into docs dir." cd("docs") diff --git a/examples/pom.xml b/examples/pom.xml index 57e41724bdca4..e8f22b995fded 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../pom.xml - spark-examples_2.13 + spark-examples_2.12 jar Spark Project Examples https://spark.apache.org/ diff --git a/graphx/pom.xml b/graphx/pom.xml index 5d01dd06c0ecb..48baeb9a87560 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../pom.xml - spark-graphx_2.13 + spark-graphx_2.12 graphx diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index bf7310d4b7ccc..58eddd295fdfc 100644 --- a/hadoop-cloud/pom.xml +++ b/hadoop-cloud/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../pom.xml - spark-hadoop-cloud_2.13 + spark-hadoop-cloud_2.12 jar Spark Project Hadoop Cloud Integration diff --git a/launcher/pom.xml b/launcher/pom.xml index 905bc785d7aa5..32b0c3d1bb074 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../pom.xml - spark-launcher_2.13 + spark-launcher_2.12 jar Spark Project Launcher https://spark.apache.org/ diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index 83ca643f43bce..00c16a8b6a544 100644 --- a/mllib-local/pom.xml +++ b/mllib-local/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../pom.xml - spark-mllib-local_2.13 + spark-mllib-local_2.12 mllib-local diff --git a/mllib/pom.xml b/mllib/pom.xml index 07290124273f2..73af83c758688 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../pom.xml - spark-mllib_2.13 + spark-mllib_2.12 mllib @@ -91,12 +91,12 @@ test-jar test - + + --> org.scalanlp breeze_${scala.binary.version} diff --git a/pom.xml b/pom.xml index 7ef04588153e4..10e4da4dcb0d1 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 18 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT pom Spark Project Parent POM @@ -168,8 +168,8 @@ 3.2.2 4.4 - 2.13.8 - 2.13 + 2.12.17 + 2.12 2.2.0 + + --> com.twitter chill_${scala.binary.version} @@ -1099,7 +1099,7 @@ org.scala-lang.modules - scala-xml_2.13 + scala-xml_2.12 diff --git a/repl/pom.xml b/repl/pom.xml index 74ac775100cb8..8c0f9f989c170 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -20,12 +20,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../pom.xml - spark-repl_2.13 + spark-repl_2.12 jar Spark Project REPL https://spark.apache.org/ diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index 72c7f1f12f42d..9dab5496184e2 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -19,12 +19,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../../pom.xml - spark-kubernetes_2.13 + spark-kubernetes_2.12 jar Spark Project Kubernetes diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index 7a5498a7c6005..1ffd5adba8426 100644 --- a/resource-managers/kubernetes/integration-tests/pom.xml +++ b/resource-managers/kubernetes/integration-tests/pom.xml @@ -19,12 +19,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../../pom.xml - spark-kubernetes-integration-tests_2.13 + spark-kubernetes-integration-tests_2.12 kubernetes-integration-tests diff --git a/resource-managers/mesos/pom.xml b/resource-managers/mesos/pom.xml index 267d6c7d84f21..7510ecac3e7fc 100644 --- a/resource-managers/mesos/pom.xml +++ b/resource-managers/mesos/pom.xml @@ -19,12 +19,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../pom.xml - spark-mesos_2.13 + spark-mesos_2.12 jar Spark Project Mesos diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index 8657ab7b42088..19cfdb8dcda02 100644 --- a/resource-managers/yarn/pom.xml +++ b/resource-managers/yarn/pom.xml @@ -19,12 +19,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../pom.xml - spark-yarn_2.13 + spark-yarn_2.12 jar Spark Project YARN diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index ebb44d0204722..73a5899a2a591 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../pom.xml - spark-catalyst_2.13 + spark-catalyst_2.12 jar Spark Project Catalyst https://spark.apache.org/ @@ -87,12 +87,12 @@ spark-sketch_${scala.binary.version} ${project.version} - + + --> org.scalacheck scalacheck_${scala.binary.version} diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 62381eabf8088..1ac4ebd0299a7 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../pom.xml - spark-sql_2.13 + spark-sql_2.12 jar Spark Project SQL https://spark.apache.org/ @@ -89,12 +89,12 @@ test - + + --> org.apache.orc orc-core diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 4bbb92d1376a0..ad7fc0d2ac4bd 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../pom.xml - spark-hive-thriftserver_2.13 + spark-hive-thriftserver_2.12 jar Spark Project Hive Thrift Server https://spark.apache.org/ @@ -61,12 +61,12 @@ test-jar test - + + --> com.google.guava guava diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 6954e6f11e846..ae8bb135aec79 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -21,12 +21,12 @@ 4.0.0 org.apache.spark - spark-parent_2.13 + spark-parent_2.12 3.5.0-SNAPSHOT ../../pom.xml - spark-hive_2.13 + spark-hive_2.12 jar Spark Project Hive https://spark.apache.org/ @@ -79,12 +79,12 @@ test-jar test - + + --> + + -->