diff --git a/assembly/pom.xml b/assembly/pom.xml index 9e64d079fa14..3e095aa2c44a 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/common/kvstore/pom.xml b/common/kvstore/pom.xml index eab56b0353e9..7884de114e10 100644 --- a/common/kvstore/pom.xml +++ b/common/kvstore/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index aec676bf573b..a54d7146bf03 100644 --- a/common/network-common/pom.xml +++ b/common/network-common/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index 038bbbcc0ea3..27eed9cf66b8 100644 --- a/common/network-shuffle/pom.xml +++ b/common/network-shuffle/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index cdd87aeec9cf..d874d9f57d61 100644 --- a/common/network-yarn/pom.xml +++ b/common/network-yarn/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index 8fadcead37b4..bc88c4b08880 100644 --- a/common/sketch/pom.xml +++ b/common/sketch/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/common/tags/pom.xml b/common/tags/pom.xml index ee8cfcf6cd58..445c6bab0457 100644 --- a/common/tags/pom.xml +++ b/common/tags/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index 0170e4cb8ad8..e565c8ce29a5 100644 --- a/common/unsafe/pom.xml +++ b/common/unsafe/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/core/pom.xml b/core/pom.xml index 75d846d022d4..8cfe84438da4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/dev/.rat-excludes b/dev/.rat-excludes index 9be76af943f0..6df16cf19a5d 100644 --- a/dev/.rat-excludes +++ b/dev/.rat-excludes @@ -112,6 +112,13 @@ kafka-source-initial-offset-version-2.1.0.bin kafka-source-initial-offset-future-version.bin announce.tmpl vote.tmpl +GangliaReporter.java +application_1578436911597_0052 +config.properties +local-1596020211915 +app-20200706201101-0003 +application_1628109047826_1317105 +py.typed _metadata _SUCCESS part-00000 @@ -120,3 +127,5 @@ flights_tiny.txt.1 over1k over10k exported_table/* +SessionManager.java +SessionHandler.java diff --git a/examples/pom.xml b/examples/pom.xml index 01f6af595df2..fd7bc9526e4d 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/external/avro/pom.xml b/external/avro/pom.xml index 2b299181c591..7d8906be9a3a 100644 --- a/external/avro/pom.xml +++ b/external/avro/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index 5acff7440889..ff7759a59e3b 100644 --- a/external/docker-integration-tests/pom.xml +++ b/external/docker-integration-tests/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/external/flume-assembly/pom.xml b/external/flume-assembly/pom.xml index e180283eee83..80c7e8292f9f 100644 --- a/external/flume-assembly/pom.xml +++ b/external/flume-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index 2a656e9770ad..a1c69686711e 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 57d3fd08ea37..337d791b265f 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/external/kafka-0-10-assembly/pom.xml b/external/kafka-0-10-assembly/pom.xml index 3185becf58cf..bb590bf2416e 100644 --- a/external/kafka-0-10-assembly/pom.xml +++ b/external/kafka-0-10-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/external/kafka-0-10-sql/pom.xml b/external/kafka-0-10-sql/pom.xml index de10b7fba5a2..a724a5a6c0ed 100644 --- a/external/kafka-0-10-sql/pom.xml +++ b/external/kafka-0-10-sql/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/external/kafka-0-10/pom.xml b/external/kafka-0-10/pom.xml index be534f202d48..275873e10dc3 100644 --- a/external/kafka-0-10/pom.xml +++ b/external/kafka-0-10/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/external/kafka-0-8-assembly/pom.xml b/external/kafka-0-8-assembly/pom.xml index 0247b174f987..4f14cad3ae8b 100644 --- a/external/kafka-0-8-assembly/pom.xml +++ b/external/kafka-0-8-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/external/kafka-0-8/pom.xml b/external/kafka-0-8/pom.xml index cbfcf21e912a..d39e9e938144 100644 --- a/external/kafka-0-8/pom.xml +++ b/external/kafka-0-8/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml index 6493dc57dc8b..c3f43c4ccc5c 100644 --- a/external/kinesis-asl-assembly/pom.xml +++ b/external/kinesis-asl-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml index 395244cfbaa1..9cd14e7f865d 100644 --- a/external/kinesis-asl/pom.xml +++ b/external/kinesis-asl/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/external/spark-ganglia-lgpl/pom.xml b/external/spark-ganglia-lgpl/pom.xml index 91b5d25b6dee..4f5a0ec2687d 100644 --- a/external/spark-ganglia-lgpl/pom.xml +++ b/external/spark-ganglia-lgpl/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/graphx/pom.xml b/graphx/pom.xml index 0b50bad834b2..e6e194248958 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index 454bc3341425..5e8353e334ca 100644 --- a/hadoop-cloud/pom.xml +++ b/hadoop-cloud/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/launcher/pom.xml b/launcher/pom.xml index 7987b1a8bd8e..281f045fd52f 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index eb8f7185f039..90377a34ddac 100644 --- a/mllib-local/pom.xml +++ b/mllib-local/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index c82cb48c705c..e50fcb0a9b76 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index cad1919d45f1..2ddbdaef6922 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT pom Spark Project Parent POM http://spark.apache.org/ @@ -43,7 +43,7 @@ scm:git:git@github.com:apache/spark.git HEAD - + nexus-releases @@ -132,11 +132,11 @@ spark 1.7.16 1.2.17 - 3.2.3.3.2.2.0-SNAPSHOT + 3.2.3.3.3.0.0-SNAPSHOT 2.5.0 ${hadoop.version} 1.6.0 - 3.5.10.3.2.2.0-SNAPSHOT + 3.5.10.3.3.0.0-SNAPSHOT 2.6.0 org.spark-project.hive @@ -1125,6 +1125,10 @@ asm asm + + org.codehaus.jettison + jettison + org.ow2.asm asm @@ -2832,18 +2836,18 @@ hadoop-3.1 - 3.2.3.3.2.2.0-SNAPSHOT + 3.2.3.3.3.0.0-SNAPSHOT 2.12.0 - 3.5.10.3.2.2.0-SNAPSHOT + 3.5.10.3.3.0.0-SNAPSHOT hadoop-3.2 - 3.2.3.3.2.2.0-SNAPSHOT + 3.2.3.3.3.0.0-SNAPSHOT 2.12.0 - 3.5.10.3.2.2.0-SNAPSHOT + 3.5.10.3.3.0.0-SNAPSHOT @@ -2913,9 +2917,9 @@ scala-2.11 - 2.11.12 diff --git a/repl/pom.xml b/repl/pom.xml index 05dc6af467b4..dd05ed9c9481 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index b5ec9b83fc7b..b3d55250dc74 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../../pom.xml diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index fd0b5a4886dc..2147d4bc32ea 100644 --- a/resource-managers/kubernetes/integration-tests/pom.xml +++ b/resource-managers/kubernetes/integration-tests/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../../pom.xml diff --git a/resource-managers/mesos/pom.xml b/resource-managers/mesos/pom.xml index 05c6e4a05274..be6104638134 100644 --- a/resource-managers/mesos/pom.xml +++ b/resource-managers/mesos/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index fe81b7cab6cc..26df2e9e5e56 100644 --- a/resource-managers/yarn/pom.xml +++ b/resource-managers/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml @@ -29,7 +29,8 @@ Spark Project YARN yarn - 1.9 + 1.19 + 1.5.4 @@ -64,6 +65,12 @@ org.apache.hadoop hadoop-yarn-common + + + org.codehaus.jettison + jettison + + org.apache.hadoop @@ -154,6 +161,12 @@ test ${jersey-1.version} + + org.codehaus.jettison + jettison + ${jettison.version} + test + com.sun.jersey jersey-server @@ -166,6 +179,12 @@ test ${jersey-1.version} + + com.sun.jersey + jersey-servlet + test + ${jersey-1.version} + diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 04ecaa74a020..c441d580e6c0 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/sql/core/pom.xml b/sql/core/pom.xml index ad4e94f91759..d42b0816d226 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 254fb46cdc73..15e2f63faaad 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 0edfa079481e..4b219c33efc3 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index e5f174aabf6d..1bbc6e355316 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 64e567d0efe5..77a1ccd2408e 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index d52b975d0d8f..0e4e4115d2a3 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.4.8.3.2.2.0-SNAPSHOT + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml