diff --git a/assembly/pom.xml b/assembly/pom.xml index acdd6336df01b..b7c27fe164776 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../pom.xml diff --git a/common/kvstore/pom.xml b/common/kvstore/pom.xml index 92c9d70f21b42..0cba4cbbba735 100644 --- a/common/kvstore/pom.xml +++ b/common/kvstore/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index e52eb2c69ff61..ba61495a73748 100644 --- a/common/network-common/pom.xml +++ b/common/network-common/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index 0484e246689dd..d36978cdcc98a 100644 --- a/common/network-shuffle/pom.xml +++ b/common/network-shuffle/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index 68d7bd985c0fb..0c6334b9e301c 100644 --- a/common/network-yarn/pom.xml +++ b/common/network-yarn/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index 513b3fe86c4e1..96295eb170c49 100644 --- a/common/sketch/pom.xml +++ b/common/sketch/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/common/tags/pom.xml b/common/tags/pom.xml index 6a4d213860385..820010cb62922 100644 --- a/common/tags/pom.xml +++ b/common/tags/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index 6ebb13cc4b5df..4c603c344c144 100644 --- a/common/unsafe/pom.xml +++ b/common/unsafe/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/core/pom.xml b/core/pom.xml index d052dbcb804e6..abadb8f2a273b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../pom.xml diff --git a/core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala b/core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala index bdb768ed5a6ca..46e5709fdcdcf 100644 --- a/core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala +++ b/core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala @@ -208,7 +208,7 @@ private[spark] class ExecutorAllocationManager( // decommissioning without a shuffle service. if (conf.get(config.DYN_ALLOCATION_SHUFFLE_TRACKING_ENABLED) || (decommissionEnabled && - conf.get(config.STORAGE_DECOMMISSION_SHUFFLE_BLOCKS_ENABLED))) { + conf.get(config.STORAGE_DECOMMISSION_SHUFFLE_BLOCKS_ENABLED) || conf.isRssEnable())) { logWarning("Dynamic allocation without a shuffle service is an experimental feature.") } else if (!testing) { throw new SparkException("Dynamic allocation of executors requires the external " + diff --git a/core/src/main/scala/org/apache/spark/SparkConf.scala b/core/src/main/scala/org/apache/spark/SparkConf.scala index 5f37a1abb1909..f94c6bc7a2c8b 100644 --- a/core/src/main/scala/org/apache/spark/SparkConf.scala +++ b/core/src/main/scala/org/apache/spark/SparkConf.scala @@ -97,6 +97,8 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging with Seria this } + def isRssEnable(): Boolean = get("spark.shuffle.manager", "sort").contains("RssShuffleManager") + private[spark] def set[T](entry: ConfigEntry[T], value: T): SparkConf = { set(entry.key, entry.stringConverter(value)) this diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala index bb3a20dce2da4..5f89dcadd7894 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala @@ -952,6 +952,15 @@ private[spark] class SparkSubmit extends Logging { } catch { case t: Throwable => throw findCause(t) + } finally { + if (!isShell(args.primaryResource) && !isSqlShell(args.mainClass) && + !isThriftServer(args.mainClass)) { + try { + SparkContext.getActive.foreach(_.stop()) + } catch { + case e: Throwable => logError(s"Failed to close SparkContext: $e") + } + } } } diff --git a/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala b/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala index f333ceee9f233..99d430656b2dc 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala @@ -2030,7 +2030,8 @@ private[spark] class DAGScheduler( // if the cluster manager explicitly tells us that the entire worker was lost, then // we know to unregister shuffle output. (Note that "worker" specifically refers to the process // from a Standalone cluster, where the shuffle service lives in the Worker.) - val fileLost = workerHost.isDefined || !env.blockManager.externalShuffleServiceEnabled + val fileLost = (workerHost.isDefined || !env.blockManager.externalShuffleServiceEnabled) && + !sc.getConf.isRssEnable() removeExecutorAndUnregisterOutputs( execId = execId, fileLost = fileLost, diff --git a/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala b/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala index ad0791fa42931..44481b38be220 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala @@ -973,7 +973,8 @@ private[spark] class TaskSetManager( // and we are not using an external shuffle server which could serve the shuffle outputs. // The reason is the next stage wouldn't be able to fetch the data from this dead executor // so we would need to rerun these tasks on other executors. - if (isShuffleMapTasks && !env.blockManager.externalShuffleServiceEnabled && !isZombie) { + if (isShuffleMapTasks && !env.blockManager.externalShuffleServiceEnabled && !isZombie + && !conf.isRssEnable()) { for ((tid, info) <- taskInfos if info.executorId == execId) { val index = taskInfos(tid).index // We may have a running task whose partition has been marked as successful, diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 index 44c6dec960a1b..5b81609daa5a5 100644 --- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3 @@ -155,26 +155,31 @@ jsr305/3.0.0//jsr305-3.0.0.jar jta/1.1//jta-1.1.jar jul-to-slf4j/1.7.30//jul-to-slf4j-1.7.30.jar kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar -kubernetes-client/4.12.0//kubernetes-client-4.12.0.jar -kubernetes-model-admissionregistration/4.12.0//kubernetes-model-admissionregistration-4.12.0.jar -kubernetes-model-apiextensions/4.12.0//kubernetes-model-apiextensions-4.12.0.jar -kubernetes-model-apps/4.12.0//kubernetes-model-apps-4.12.0.jar -kubernetes-model-autoscaling/4.12.0//kubernetes-model-autoscaling-4.12.0.jar -kubernetes-model-batch/4.12.0//kubernetes-model-batch-4.12.0.jar -kubernetes-model-certificates/4.12.0//kubernetes-model-certificates-4.12.0.jar -kubernetes-model-common/4.12.0//kubernetes-model-common-4.12.0.jar -kubernetes-model-coordination/4.12.0//kubernetes-model-coordination-4.12.0.jar -kubernetes-model-core/4.12.0//kubernetes-model-core-4.12.0.jar -kubernetes-model-discovery/4.12.0//kubernetes-model-discovery-4.12.0.jar -kubernetes-model-events/4.12.0//kubernetes-model-events-4.12.0.jar -kubernetes-model-extensions/4.12.0//kubernetes-model-extensions-4.12.0.jar -kubernetes-model-metrics/4.12.0//kubernetes-model-metrics-4.12.0.jar -kubernetes-model-networking/4.12.0//kubernetes-model-networking-4.12.0.jar -kubernetes-model-policy/4.12.0//kubernetes-model-policy-4.12.0.jar -kubernetes-model-rbac/4.12.0//kubernetes-model-rbac-4.12.0.jar -kubernetes-model-scheduling/4.12.0//kubernetes-model-scheduling-4.12.0.jar -kubernetes-model-settings/4.12.0//kubernetes-model-settings-4.12.0.jar -kubernetes-model-storageclass/4.12.0//kubernetes-model-storageclass-4.12.0.jar +kubernetes-client-api/6.11.0//kubernetes-client-api-6.11.0.jar +kubernetes-client/6.11.0//kubernetes-client-6.11.0.jar +kubernetes-httpclient-okhttp/6.11.0//kubernetes-httpclient-okhttp-6.11.0.jar +kubernetes-model-admissionregistration/6.11.0//kubernetes-model-admissionregistration-6.11.0.jar +kubernetes-model-apiextensions/6.11.0//kubernetes-model-apiextensions-6.11.0.jar +kubernetes-model-apps/6.11.0//kubernetes-model-apps-6.11.0.jar +kubernetes-model-autoscaling/6.11.0//kubernetes-model-autoscaling-6.11.0.jar +kubernetes-model-batch/6.11.0//kubernetes-model-batch-6.11.0.jar +kubernetes-model-certificates/6.11.0//kubernetes-model-certificates-6.11.0.jar +kubernetes-model-common/6.11.0//kubernetes-model-common-6.11.0.jar +kubernetes-model-coordination/6.11.0//kubernetes-model-coordination-6.11.0.jar +kubernetes-model-core/6.11.0//kubernetes-model-core-6.11.0.jar +kubernetes-model-discovery/6.11.0//kubernetes-model-discovery-6.11.0.jar +kubernetes-model-events/6.11.0//kubernetes-model-events-6.11.0.jar +kubernetes-model-extensions/6.11.0//kubernetes-model-extensions-6.11.0.jar +kubernetes-model-flowcontrol/6.11.0//kubernetes-model-flowcontrol-6.11.0.jar +kubernetes-model-gatewayapi/6.11.0//kubernetes-model-gatewayapi-6.11.0.jar +kubernetes-model-metrics/6.11.0//kubernetes-model-metrics-6.11.0.jar +kubernetes-model-networking/6.11.0//kubernetes-model-networking-6.11.0.jar +kubernetes-model-node/6.11.0//kubernetes-model-node-6.11.0.jar +kubernetes-model-policy/6.11.0//kubernetes-model-policy-6.11.0.jar +kubernetes-model-rbac/6.11.0//kubernetes-model-rbac-6.11.0.jar +kubernetes-model-resource/6.11.0//kubernetes-model-resource-6.11.0.jar +kubernetes-model-scheduling/6.11.0//kubernetes-model-scheduling-6.11.0.jar +kubernetes-model-storageclass/6.11.0//kubernetes-model-storageclass-6.11.0.jar leveldbjni-all/1.8//leveldbjni-all-1.8.jar libfb303/0.9.3//libfb303-0.9.3.jar libthrift/0.12.0//libthrift-0.12.0.jar diff --git a/examples/pom.xml b/examples/pom.xml index 5a86b0dc93985..eda1ac2aee404 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../pom.xml diff --git a/external/avro/pom.xml b/external/avro/pom.xml index b460bccb0bca0..f337b88ab49db 100644 --- a/external/avro/pom.xml +++ b/external/avro/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index 358cccb000e64..458e3902fedf7 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.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/external/kafka-0-10-assembly/pom.xml b/external/kafka-0-10-assembly/pom.xml index cd0b9413e8073..d6039ad7310a4 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.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/external/kafka-0-10-sql/pom.xml b/external/kafka-0-10-sql/pom.xml index 6ec6e50cbfa5d..e924a0fb6ebfa 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.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/external/kafka-0-10-token-provider/pom.xml b/external/kafka-0-10-token-provider/pom.xml index adca14393a0a0..2f429cae670fd 100644 --- a/external/kafka-0-10-token-provider/pom.xml +++ b/external/kafka-0-10-token-provider/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/external/kafka-0-10/pom.xml b/external/kafka-0-10/pom.xml index 6746ce6847b00..26cd3f1812199 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.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml index 68a883bdde6af..ebca1d93647b6 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.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml index 83f17b7fd16c2..93a143a7cb9fa 100644 --- a/external/kinesis-asl/pom.xml +++ b/external/kinesis-asl/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/external/spark-ganglia-lgpl/pom.xml b/external/spark-ganglia-lgpl/pom.xml index d563fc26ae85a..2aed203c76e07 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.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/graphx/pom.xml b/graphx/pom.xml index 0f9ca91cbbce8..c47024b8ee314 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../pom.xml diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index 38307474b6a58..c3e0edbd476d4 100644 --- a/hadoop-cloud/pom.xml +++ b/hadoop-cloud/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../pom.xml diff --git a/launcher/pom.xml b/launcher/pom.xml index 1617cd7503866..8c8b44d76855c 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../pom.xml diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index 8f70cb418aadd..fcc5107329f74 100644 --- a/mllib-local/pom.xml +++ b/mllib-local/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 1bdb1b18bb5b9..eba5172fd7451 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../pom.xml diff --git a/pom.xml b/pom.xml index ed8522973da66..b1917d4f54c5b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 pom Spark Project Parent POM http://spark.apache.org/ @@ -207,6 +207,7 @@ 2.0.0 org.fusesource.leveldbjni + 6.11.0 javax.servlet-api diff --git a/repl/pom.xml b/repl/pom.xml index e1ac914f81aa7..3deb69e5617ed 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../pom.xml diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index 3027f20e0b93d..3ddaef59dd70a 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.12 - 3.1.1.5 + 3.1.1.6 ../../../pom.xml diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index 8683f004035b0..f47042a1c6f0d 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.12 - 3.1.1.5 + 3.1.1.6 ../../../pom.xml diff --git a/resource-managers/mesos/pom.xml b/resource-managers/mesos/pom.xml index 54d2c3f48bae9..92b8c15909dcf 100644 --- a/resource-managers/mesos/pom.xml +++ b/resource-managers/mesos/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index 9cbec46a837d8..16c995e8b32b9 100644 --- a/resource-managers/yarn/pom.xml +++ b/resource-managers/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index a34c413b954b8..ecebbc98067a9 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/sql/core/pom.xml b/sql/core/pom.xml index ea2235d00f150..a4390147a0053 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/ShuffledRowRDD.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/ShuffledRowRDD.scala index ef84cd27a3d0b..0b1ab0d50bb45 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/ShuffledRowRDD.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/ShuffledRowRDD.scala @@ -159,19 +159,23 @@ class ShuffledRowRDD( } override def getPreferredLocations(partition: Partition): Seq[String] = { - val tracker = SparkEnv.get.mapOutputTracker.asInstanceOf[MapOutputTrackerMaster] - partition.asInstanceOf[ShuffledRowRDDPartition].spec match { - case CoalescedPartitionSpec(startReducerIndex, endReducerIndex) => - // TODO order by partition size. - startReducerIndex.until(endReducerIndex).flatMap { reducerIndex => - tracker.getPreferredLocationsForShuffle(dependency, reducerIndex) - } - - case PartialReducerPartitionSpec(_, startMapIndex, endMapIndex, _) => - tracker.getMapLocation(dependency, startMapIndex, endMapIndex) - - case PartialMapperPartitionSpec(mapIndex, _, _) => - tracker.getMapLocation(dependency, mapIndex, mapIndex + 1) + if (!conf.isRssEnable()) { + val tracker = SparkEnv.get.mapOutputTracker.asInstanceOf[MapOutputTrackerMaster] + partition.asInstanceOf[ShuffledRowRDDPartition].spec match { + case CoalescedPartitionSpec(startReducerIndex, endReducerIndex) => + // TODO order by partition size. + startReducerIndex.until(endReducerIndex).flatMap { reducerIndex => + tracker.getPreferredLocationsForShuffle(dependency, reducerIndex) + } + + case PartialReducerPartitionSpec(_, startMapIndex, endMapIndex, _) => + tracker.getMapLocation(dependency, startMapIndex, endMapIndex) + + case PartialMapperPartitionSpec(mapIndex, _, _) => + tracker.getMapLocation(dependency, mapIndex, mapIndex + 1) + } + } else { + Nil } } diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index b581ef2e96f91..1457cc54eb8ae 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index c654abd6c33cb..c6fece6b7d4f3 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 5b47cf5e6594a..9a8899b1ceec9 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index bfe7abaa86eea..e1c25b71232a0 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.12 - 3.1.1.5 + 3.1.1.6 ../pom.xml