From 84afdac8c3d772de1ef086550978b4a56b8aa73f Mon Sep 17 00:00:00 2001 From: kravii Date: Tue, 26 Mar 2024 22:31:34 -0400 Subject: [PATCH 1/5] SNAPSHOT to 3.2.2.0-1095 --- assembly/pom.xml | 2 +- common/kvstore/pom.xml | 2 +- common/network-common/pom.xml | 2 +- common/network-shuffle/pom.xml | 2 +- common/network-yarn/pom.xml | 2 +- common/sketch/pom.xml | 2 +- common/tags/pom.xml | 2 +- common/unsafe/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- external/avro/pom.xml | 2 +- external/docker-integration-tests/pom.xml | 2 +- external/flume-assembly/pom.xml | 2 +- external/flume-sink/pom.xml | 2 +- external/flume/pom.xml | 2 +- external/kafka-0-10-assembly/pom.xml | 2 +- external/kafka-0-10-sql/pom.xml | 2 +- external/kafka-0-10/pom.xml | 2 +- external/kafka-0-8-assembly/pom.xml | 2 +- external/kafka-0-8/pom.xml | 2 +- external/kinesis-asl-assembly/pom.xml | 2 +- external/kinesis-asl/pom.xml | 2 +- external/spark-ganglia-lgpl/pom.xml | 2 +- graphx/pom.xml | 2 +- hadoop-cloud/pom.xml | 2 +- launcher/pom.xml | 2 +- mllib-local/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 14 +++++++------- repl/pom.xml | 2 +- resource-managers/kubernetes/core/pom.xml | 2 +- .../kubernetes/integration-tests/pom.xml | 2 +- resource-managers/mesos/pom.xml | 2 +- resource-managers/yarn/pom.xml | 2 +- sql/catalyst/pom.xml | 2 +- sql/core/pom.xml | 2 +- sql/hive-thriftserver/pom.xml | 2 +- sql/hive/pom.xml | 2 +- standalone-metastore/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- 41 files changed, 47 insertions(+), 47 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 9e64d079fa14..c7364a8fa05a 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.2.2.0-1095 ../pom.xml diff --git a/common/kvstore/pom.xml b/common/kvstore/pom.xml index eab56b0353e9..f3cb2e1d540d 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.2.2.0-1095 ../../pom.xml diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index aec676bf573b..c3358a8c0ad0 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.2.2.0-1095 ../../pom.xml diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index 038bbbcc0ea3..ed6a3ae85fb0 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.2.2.0-1095 ../../pom.xml diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index cdd87aeec9cf..4339c8e403aa 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.2.2.0-1095 ../../pom.xml diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index 8fadcead37b4..e019192879d0 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.2.2.0-1095 ../../pom.xml diff --git a/common/tags/pom.xml b/common/tags/pom.xml index ee8cfcf6cd58..091bf846d079 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.2.2.0-1095 ../../pom.xml diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index 0170e4cb8ad8..03cdc5bfb555 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.2.2.0-1095 ../../pom.xml diff --git a/core/pom.xml b/core/pom.xml index 75d846d022d4..e5b455cd6c43 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.2.2.0-1095 ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index 01f6af595df2..bddb630baedb 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.2.2.0-1095 ../pom.xml diff --git a/external/avro/pom.xml b/external/avro/pom.xml index 2b299181c591..86fc38162a5b 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.2.2.0-1095 ../../pom.xml diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index 5acff7440889..bb9f5ca8faa6 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.2.2.0-1095 ../../pom.xml diff --git a/external/flume-assembly/pom.xml b/external/flume-assembly/pom.xml index e180283eee83..648eede6cae6 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.2.2.0-1095 ../../pom.xml diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index 2a656e9770ad..bc8e99d0bfe8 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.2.2.0-1095 ../../pom.xml diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 57d3fd08ea37..58fe17f63f87 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.2.2.0-1095 ../../pom.xml diff --git a/external/kafka-0-10-assembly/pom.xml b/external/kafka-0-10-assembly/pom.xml index 3185becf58cf..6bb373bad313 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.2.2.0-1095 ../../pom.xml diff --git a/external/kafka-0-10-sql/pom.xml b/external/kafka-0-10-sql/pom.xml index de10b7fba5a2..a9636ba308c1 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.2.2.0-1095 ../../pom.xml diff --git a/external/kafka-0-10/pom.xml b/external/kafka-0-10/pom.xml index be534f202d48..e50b3c9a9478 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.2.2.0-1095 ../../pom.xml diff --git a/external/kafka-0-8-assembly/pom.xml b/external/kafka-0-8-assembly/pom.xml index 0247b174f987..b14956281d61 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.2.2.0-1095 ../../pom.xml diff --git a/external/kafka-0-8/pom.xml b/external/kafka-0-8/pom.xml index cbfcf21e912a..3af456140c85 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.2.2.0-1095 ../../pom.xml diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml index 6493dc57dc8b..63ed8447a674 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.2.2.0-1095 ../../pom.xml diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml index 395244cfbaa1..89bd127eeef5 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.2.2.0-1095 ../../pom.xml diff --git a/external/spark-ganglia-lgpl/pom.xml b/external/spark-ganglia-lgpl/pom.xml index 91b5d25b6dee..c5f5b8016169 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.2.2.0-1095 ../../pom.xml diff --git a/graphx/pom.xml b/graphx/pom.xml index 0b50bad834b2..98262fab9158 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.2.2.0-1095 ../pom.xml diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index 454bc3341425..6fc141c0d1bb 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.2.2.0-1095 ../pom.xml diff --git a/launcher/pom.xml b/launcher/pom.xml index 7987b1a8bd8e..5e460509782b 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.2.2.0-1095 ../pom.xml diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index eb8f7185f039..d615b68ed10c 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.2.2.0-1095 ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index c82cb48c705c..d6068cfab8ac 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.2.2.0-1095 ../pom.xml diff --git a/pom.xml b/pom.xml index cad1919d45f1..4b2c8fa16471 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.2.2.0-1095 pom Spark Project Parent POM http://spark.apache.org/ @@ -132,11 +132,11 @@ spark 1.7.16 1.2.17 - 3.2.3.3.2.2.0-SNAPSHOT + 3.2.3.3.2.2.0-1095 2.5.0 ${hadoop.version} 1.6.0 - 3.5.10.3.2.2.0-SNAPSHOT + 3.5.10.3.2.2.0-1095 2.6.0 org.spark-project.hive @@ -2832,18 +2832,18 @@ hadoop-3.1 - 3.2.3.3.2.2.0-SNAPSHOT + 3.2.3.3.2.2.0-1095 2.12.0 - 3.5.10.3.2.2.0-SNAPSHOT + 3.5.10.3.2.2.0-1095 hadoop-3.2 - 3.2.3.3.2.2.0-SNAPSHOT + 3.2.3.3.2.2.0-1095 2.12.0 - 3.5.10.3.2.2.0-SNAPSHOT + 3.5.10.3.2.2.0-1095 diff --git a/repl/pom.xml b/repl/pom.xml index 05dc6af467b4..28cb09cc7074 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.2.2.0-1095 ../pom.xml diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index b5ec9b83fc7b..da6dd13282ae 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.2.2.0-1095 ../../../pom.xml diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index fd0b5a4886dc..17a356a8789a 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.2.2.0-1095 ../../../pom.xml diff --git a/resource-managers/mesos/pom.xml b/resource-managers/mesos/pom.xml index 05c6e4a05274..384cc4f796c3 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.2.2.0-1095 ../../pom.xml diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index fe81b7cab6cc..870d517640a4 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.2.2.0-1095 ../../pom.xml diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 04ecaa74a020..b280398936a7 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.2.2.0-1095 ../../pom.xml diff --git a/sql/core/pom.xml b/sql/core/pom.xml index ad4e94f91759..c8a0854734b8 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.2.2.0-1095 ../../pom.xml diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 254fb46cdc73..c90fc1dfc2ac 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.2.2.0-1095 ../../pom.xml diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 0edfa079481e..7c65b787e0b7 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.2.2.0-1095 ../../pom.xml diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index e5f174aabf6d..7e7f4f214c73 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.2.2.0-1095 ../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 64e567d0efe5..4b7e0094c003 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.2.2.0-1095 ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index d52b975d0d8f..39e117cb6065 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.2.2.0-1095 ../pom.xml From dbf20eb32ad3eb31c1eed17fc48fc791a0f2f0a6 Mon Sep 17 00:00:00 2001 From: Yuming Wang Date: Tue, 2 Apr 2019 15:38:26 -0500 Subject: [PATCH 2/5] [SPARK-27180][BUILD][YARN] Fix testing issues with yarn module in Hadoop-3 Fix testing issues with `yarn` module in Hadoop-3: 1. Upgrade jersey-1 to `1.19` to fix ```Cause: java.lang.NoClassDefFoundError: com/sun/jersey/spi/container/servlet/ServletContainer```. 2. Copy `ServerSocketUtil` from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java to fix ```java.lang.NoClassDefFoundError: org/apache/hadoop/net/ServerSocketUtil```. 3. Adapte `SessionHandler` from jetty-9.3.25.v20180904/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java to fix ```java.lang.NoSuchMethodError: org.eclipse.jetty.server.session.SessionHandler.getSessionManager()Lorg/eclipse/jetty/server/SessionManager```. manual tests: ```shell build/sbt yarn/test -Pyarn build/sbt yarn/test -Phadoop-3.2 -Pyarn build/mvn -Dtest=none -DwildcardSuites=org.apache.spark.deploy.yarn.YarnClusterSuite -pl resource-managers/yarn test -Pyarn build/mvn -Dtest=none -DwildcardSuites=org.apache.spark.deploy.yarn.YarnClusterSuite -pl resource-managers/yarn test -Pyarn -Phadoop-3.2 ``` Closes #24115 from wangyum/hadoop3-yarn. Authored-by: Yuming Wang Signed-off-by: Sean Owen (cherry picked from commit 13c5c1fb4b88e15c6cd09e6e275a9fc03f3085bd) --- dev/.rat-excludes | 2 + resource-managers/yarn/pom.xml | 8 +- .../apache/hadoop/net/ServerSocketUtil.java | 132 ++++++++ .../eclipse/jetty/server/SessionManager.java | 290 ++++++++++++++++++ .../jetty/server/session/SessionHandler.java | 90 ++++++ 5 files changed, 521 insertions(+), 1 deletion(-) create mode 100644 resource-managers/yarn/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java create mode 100644 resource-managers/yarn/src/test/java/org/eclipse/jetty/server/SessionManager.java create mode 100644 resource-managers/yarn/src/test/java/org/eclipse/jetty/server/session/SessionHandler.java diff --git a/dev/.rat-excludes b/dev/.rat-excludes index 9be76af943f0..cd5a24606a13 100644 --- a/dev/.rat-excludes +++ b/dev/.rat-excludes @@ -120,3 +120,5 @@ flights_tiny.txt.1 over1k over10k exported_table/* +SessionManager.java +SessionHandler.java diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index 870d517640a4..2e0158d2430a 100644 --- a/resource-managers/yarn/pom.xml +++ b/resource-managers/yarn/pom.xml @@ -29,7 +29,7 @@ Spark Project YARN yarn - 1.9 + 1.19 @@ -166,6 +166,12 @@ test ${jersey-1.version} + + com.sun.jersey + jersey-servlet + test + ${jersey-1.version} + diff --git a/resource-managers/yarn/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java b/resource-managers/yarn/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java new file mode 100644 index 000000000000..df0ebcc9871a --- /dev/null +++ b/resource-managers/yarn/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java @@ -0,0 +1,132 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.net; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.net.ServerSocket; +import java.util.Random; + +/** + * Copied from + * hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java + * for Hadoop-3.x testing + */ +public class ServerSocketUtil { + + private static final Logger LOG = LoggerFactory.getLogger(ServerSocketUtil.class); + private static Random rand = new Random(); + + /** + * Port scan & allocate is how most other apps find ports + * + * @param port given port + * @param retries number of retries + * @return + * @throws IOException + */ + public static int getPort(int port, int retries) throws IOException { + int tryPort = port; + int tries = 0; + while (true) { + if (tries > 0 || tryPort == 0) { + tryPort = port + rand.nextInt(65535 - port); + } + if (tryPort == 0) { + continue; + } + try (ServerSocket s = new ServerSocket(tryPort)) { + LOG.info("Using port " + tryPort); + return tryPort; + } catch (IOException e) { + tries++; + if (tries >= retries) { + LOG.info("Port is already in use; giving up"); + throw e; + } else { + LOG.info("Port is already in use; trying again"); + } + } + } + } + + /** + * Check whether port is available or not. + * + * @param port given port + * @return + */ + private static boolean isPortAvailable(int port) { + try (ServerSocket s = new ServerSocket(port)) { + return true; + } catch (IOException e) { + return false; + } + } + + /** + * Wait till the port available. + * + * @param port given port + * @param retries number of retries for given port + * @return + * @throws InterruptedException + * @throws IOException + */ + public static int waitForPort(int port, int retries) + throws InterruptedException, IOException { + int tries = 0; + while (true) { + if (isPortAvailable(port)) { + return port; + } else { + tries++; + if (tries >= retries) { + throw new IOException( + "Port is already in use; giving up after " + tries + " times."); + } + Thread.sleep(1000); + } + } + } + + /** + * Find the specified number of unique ports available. + * The ports are all closed afterwards, + * so other network services started may grab those same ports. + * + * @param numPorts number of required port nubmers + * @return array of available port numbers + * @throws IOException + */ + public static int[] getPorts(int numPorts) throws IOException { + ServerSocket[] sockets = new ServerSocket[numPorts]; + int[] ports = new int[numPorts]; + for (int i = 0; i < numPorts; i++) { + ServerSocket sock = new ServerSocket(0); + sockets[i] = sock; + ports[i] = sock.getLocalPort(); + } + for (ServerSocket sock : sockets) { + sock.close(); + } + return ports; + } +} diff --git a/resource-managers/yarn/src/test/java/org/eclipse/jetty/server/SessionManager.java b/resource-managers/yarn/src/test/java/org/eclipse/jetty/server/SessionManager.java new file mode 100644 index 000000000000..bf89f8d7c804 --- /dev/null +++ b/resource-managers/yarn/src/test/java/org/eclipse/jetty/server/SessionManager.java @@ -0,0 +1,290 @@ +// +// ======================================================================== +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.server; + +import javax.servlet.SessionCookieConfig; +import javax.servlet.SessionTrackingMode; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.util.EventListener; +import java.util.Set; + +import org.eclipse.jetty.http.HttpCookie; +import org.eclipse.jetty.server.session.SessionHandler; +import org.eclipse.jetty.util.component.LifeCycle; + +/** + * Adapted from https://github.com/eclipse/jetty.project/blob/jetty-9.3.25.v20180904/ + * jetty-server/src/main/java/org/eclipse/jetty/server/SessionManager.java + */ +public interface SessionManager extends LifeCycle { + /** + * Session cookie name. + * Defaults to JSESSIONID, but can be set with the + * org.eclipse.jetty.servlet.SessionCookie context init parameter. + */ + String __SessionCookieProperty = "org.eclipse.jetty.servlet.SessionCookie"; + String __DefaultSessionCookie = "JSESSIONID"; + + /** + * Session id path parameter name. + * Defaults to jsessionid, but can be set with the + * org.eclipse.jetty.servlet.SessionIdPathParameterName context init parameter. + * If set to null or "none" no URL rewriting will be done. + */ + String __SessionIdPathParameterNameProperty = + "org.eclipse.jetty.servlet.SessionIdPathParameterName"; + String __DefaultSessionIdPathParameterName = "jsessionid"; + String __CheckRemoteSessionEncoding = "org.eclipse.jetty.servlet.CheckingRemoteSessionIdEncoding"; + + /** + * Session Domain. + * If this property is set as a ServletContext InitParam, then it is + * used as the domain for session cookies. If it is not set, then + * no domain is specified for the session cookie. + */ + String __SessionDomainProperty = "org.eclipse.jetty.servlet.SessionDomain"; + String __DefaultSessionDomain = null; + + /** + * Session Path. + * If this property is set as a ServletContext InitParam, then it is + * used as the path for the session cookie. If it is not set, then + * the context path is used as the path for the cookie. + */ + String __SessionPathProperty = "org.eclipse.jetty.servlet.SessionPath"; + + /** + * Session Max Age. + * If this property is set as a ServletContext InitParam, then it is + * used as the max age for the session cookie. If it is not set, then + * a max age of -1 is used. + */ + String __MaxAgeProperty = "org.eclipse.jetty.servlet.MaxAge"; + + /** + * Returns the HttpSession with the given session id + * + * @param id the session id + * @return the HttpSession with the corresponding id + * or null if no session with the given id exists + */ + HttpSession getHttpSession(String id); + + /** + * Creates a new HttpSession. + * + * @param request the HttpServletRequest containing the requested session id + * @return the new HttpSession + */ + HttpSession newHttpSession(HttpServletRequest request); + + /** + * @return true if session cookies should be HTTP-only (Microsoft extension) + * @see HttpCookie#isHttpOnly() + */ + boolean getHttpOnly(); + + /** + * @return the max period of inactivity, after which the session is invalidated, in seconds. + * @see #setMaxInactiveInterval(int) + */ + int getMaxInactiveInterval(); + + /** + * Sets the max period of inactivity, after which the session is invalidated, in seconds. + * + * @param seconds the max inactivity period, in seconds. + * @see #getMaxInactiveInterval() + */ + void setMaxInactiveInterval(int seconds); + + /** + * Sets the {@link SessionHandler}. + * + * @param handler the SessionHandler object + */ + void setSessionHandler(SessionHandler handler); + + /** + * Adds an event listener for session-related events. + * + * @param listener the session event listener to add + * Individual SessionManagers implementations may accept arbitrary listener types, + * but they are expected to at least handle HttpSessionActivationListener, + * HttpSessionAttributeListener, + * HttpSessionBindingListener and HttpSessionListener. + * @see #removeEventListener(EventListener) + */ + void addEventListener(EventListener listener); + + /** + * Removes an event listener for for session-related events. + * + * @param listener the session event listener to remove + * @see #addEventListener(EventListener) + */ + void removeEventListener(EventListener listener); + + /** + * Removes all event listeners for session-related events. + * + * @see #removeEventListener(EventListener) + */ + void clearEventListeners(); + + /** + * Gets a Cookie for a session. + * + * @param session the session to which the cookie should refer. + * @param contextPath the context to which the cookie should be linked. + * The client will only send the cookie value when + * requesting resources under this path. + * @param requestIsSecure whether the client is accessing the server over + * a secure protocol (i.e. HTTPS). + * @return if this SessionManager uses cookies, then this method will return a new + * {@link Cookie cookie object} that should be set on the client + * in order to link future HTTP requests + * with the session. If cookies are not in use, + * this method returns null. + */ + HttpCookie getSessionCookie(HttpSession session, String contextPath, boolean requestIsSecure); + + /** + * @return the cross context session id manager. + * @see #setSessionIdManager(SessionIdManager) + */ + SessionIdManager getSessionIdManager(); + + /** + * @return the cross context session id manager. + * @deprecated use {@link #getSessionIdManager()} + */ + @Deprecated + SessionIdManager getMetaManager(); + + /** + * Sets the cross context session id manager + * + * @param idManager the cross context session id manager. + * @see #getSessionIdManager() + */ + void setSessionIdManager(SessionIdManager idManager); + + /** + * @param session the session to test for validity + * @return whether the given session is valid, that is, it has not been invalidated. + */ + boolean isValid(HttpSession session); + + /** + * @param session the session object + * @return the unique id of the session within the cluster, extended with an optional node id. + * @see #getClusterId(HttpSession) + */ + String getNodeId(HttpSession session); + + /** + * @param session the session object + * @return the unique id of the session within the cluster (without a node id extension) + * @see #getNodeId(HttpSession) + */ + String getClusterId(HttpSession session); + + /** + * Called by the {@link SessionHandler} when a session is first accessed by a request. + * + * @param session the session object + * @param secure whether the request is secure or not + * @return the session cookie. If not null, + * this cookie should be set on the response to either migrate + * the session or to refresh a session cookie that may expire. + * @see #complete(HttpSession) + */ + HttpCookie access(HttpSession session, boolean secure); + + /** + * Called by the {@link SessionHandler} when a session is last accessed by a request. + * + * @param session the session object + * @see #access(HttpSession, boolean) + */ + void complete(HttpSession session); + + /** + * Sets the session id URL path parameter name. + * + * @param parameterName the URL path parameter name + * for session id URL rewriting (null or "none" for no rewriting). + * @see #getSessionIdPathParameterName() + * @see #getSessionIdPathParameterNamePrefix() + */ + void setSessionIdPathParameterName(String parameterName); + + /** + * @return the URL path parameter name for session id URL rewriting, by default "jsessionid". + * @see #setSessionIdPathParameterName(String) + */ + String getSessionIdPathParameterName(); + + /** + * @return a formatted version of {@link #getSessionIdPathParameterName()}, by default + * ";" + sessionIdParameterName + "=", for easier lookup in URL strings. + * @see #getSessionIdPathParameterName() + */ + String getSessionIdPathParameterNamePrefix(); + + /** + * @return whether the session management is handled via cookies. + */ + boolean isUsingCookies(); + + /** + * @return whether the session management is handled via URLs. + */ + boolean isUsingURLs(); + + Set getDefaultSessionTrackingModes(); + + Set getEffectiveSessionTrackingModes(); + + void setSessionTrackingModes(Set sessionTrackingModes); + + SessionCookieConfig getSessionCookieConfig(); + + /** + * @return True if absolute URLs are check for remoteness before being session encoded. + */ + boolean isCheckingRemoteSessionIdEncoding(); + + /** + * @param remote True if absolute URLs are check for remoteness before being session encoded. + */ + void setCheckingRemoteSessionIdEncoding(boolean remote); + + /** Change the existing session id. + * + * @param oldClusterId the old cluster id + * @param oldNodeId the old node id + * @param newClusterId the new cluster id + * @param newNodeId the new node id + */ + void renewSessionId(String oldClusterId, String oldNodeId, String newClusterId, String newNodeId); +} diff --git a/resource-managers/yarn/src/test/java/org/eclipse/jetty/server/session/SessionHandler.java b/resource-managers/yarn/src/test/java/org/eclipse/jetty/server/session/SessionHandler.java new file mode 100644 index 000000000000..f8bcf8de82f6 --- /dev/null +++ b/resource-managers/yarn/src/test/java/org/eclipse/jetty/server/session/SessionHandler.java @@ -0,0 +1,90 @@ +// +// ======================================================================== +// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.server.session; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.SessionManager; +import org.eclipse.jetty.server.handler.ScopedHandler; + +/** + * Adapted from https://github.com/eclipse/jetty.project/blob/jetty-9.3.25.v20180904/ + * jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java + */ +public class SessionHandler extends ScopedHandler { + private SessionManager _sessionManager; + + public SessionHandler() { + } + + /** + * @param manager + * The session manager + */ + public SessionHandler(SessionManager manager) { + setSessionManager(manager); + } + + /** + * @return Returns the sessionManager. + */ + public SessionManager getSessionManager() { + return _sessionManager; + } + + /** + * @param sessionManager + * The sessionManager to set. + */ + public void setSessionManager(SessionManager sessionManager) { + if (isStarted()) { + throw new IllegalStateException(); + } + if (sessionManager != null) { + updateBean(_sessionManager,sessionManager); + _sessionManager=sessionManager; + } + } + + /* + * @see org.eclipse.jetty.server.Handler#handle(javax.servlet.http.HttpServletRequest, + * javax.servlet.http.HttpServletResponse, int) + */ + @Override + public void doHandle(String target, Request baseRequest, HttpServletRequest request, + HttpServletResponse response) throws IOException, ServletException { + // start manual inline of nextHandle(target,baseRequest,request,response); + if (_nextScope != null && _nextScope == _handler) { + _nextScope.doHandle(target,baseRequest,request,response); + } else if (_handler != null) { + _handler.handle(target,baseRequest,request,response); + // end manual inline + } + } + + public void clearEventListeners() { + if (_sessionManager != null) { + _sessionManager.clearEventListeners(); + } + } +} From 892ebe1ea9c3ace62eb3e4249325bcf734e006bb Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Thu, 16 Feb 2023 09:26:33 -0600 Subject: [PATCH 3/5] [SPARK-42463][SPARK-27180][YARN][TESTS] Clean up the third-party Java files copy introduced by SPARK-27180 introduced some third-party Java source code to solve Yarn module test failure, but maven and sbt can also test pass without them, so this pr remove these files. Clean up the third-party Java source code copy in Spark. No - Pass GitHub Actions - manual check: **Maven** ``` build/mvn clean build/mvn clean install -DskipTestes -pl resource-managers/yarn -am -Pyarn build/mvn -Dtest=none -DwildcardSuites=org.apache.spark.deploy.yarn.YarnClusterSuite -pl resource-managers/yarn test -Pyarn build/mvn test -pl resource-managers/yarn -Pyarn -Dtest.exclude.tags=org.apache.spark.tags.ExtendedLevelDBTest ``` Both `YarnClusterSuite` and full module test passed. **SBT** ``` build/sbt clean yarn/test -Pyarn -Dtest.exclude.tags=org.apache.spark.tags.ExtendedLevelDBTest ``` All tests passed. Closes #40052 from LuciferYang/SPARK-42463. Authored-by: yangjie01 Signed-off-by: Sean Owen (cherry picked from commit 64e5928e86377a216e48bb7be12150ad130322f3) --- dev/.rat-excludes | 7 + .../apache/hadoop/net/ServerSocketUtil.java | 132 -------- .../eclipse/jetty/server/SessionManager.java | 290 ------------------ .../jetty/server/session/SessionHandler.java | 90 ------ 4 files changed, 7 insertions(+), 512 deletions(-) delete mode 100644 resource-managers/yarn/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java delete mode 100644 resource-managers/yarn/src/test/java/org/eclipse/jetty/server/SessionManager.java delete mode 100644 resource-managers/yarn/src/test/java/org/eclipse/jetty/server/session/SessionHandler.java diff --git a/dev/.rat-excludes b/dev/.rat-excludes index cd5a24606a13..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 diff --git a/resource-managers/yarn/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java b/resource-managers/yarn/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java deleted file mode 100644 index df0ebcc9871a..000000000000 --- a/resource-managers/yarn/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.hadoop.net; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.net.ServerSocket; -import java.util.Random; - -/** - * Copied from - * hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java - * for Hadoop-3.x testing - */ -public class ServerSocketUtil { - - private static final Logger LOG = LoggerFactory.getLogger(ServerSocketUtil.class); - private static Random rand = new Random(); - - /** - * Port scan & allocate is how most other apps find ports - * - * @param port given port - * @param retries number of retries - * @return - * @throws IOException - */ - public static int getPort(int port, int retries) throws IOException { - int tryPort = port; - int tries = 0; - while (true) { - if (tries > 0 || tryPort == 0) { - tryPort = port + rand.nextInt(65535 - port); - } - if (tryPort == 0) { - continue; - } - try (ServerSocket s = new ServerSocket(tryPort)) { - LOG.info("Using port " + tryPort); - return tryPort; - } catch (IOException e) { - tries++; - if (tries >= retries) { - LOG.info("Port is already in use; giving up"); - throw e; - } else { - LOG.info("Port is already in use; trying again"); - } - } - } - } - - /** - * Check whether port is available or not. - * - * @param port given port - * @return - */ - private static boolean isPortAvailable(int port) { - try (ServerSocket s = new ServerSocket(port)) { - return true; - } catch (IOException e) { - return false; - } - } - - /** - * Wait till the port available. - * - * @param port given port - * @param retries number of retries for given port - * @return - * @throws InterruptedException - * @throws IOException - */ - public static int waitForPort(int port, int retries) - throws InterruptedException, IOException { - int tries = 0; - while (true) { - if (isPortAvailable(port)) { - return port; - } else { - tries++; - if (tries >= retries) { - throw new IOException( - "Port is already in use; giving up after " + tries + " times."); - } - Thread.sleep(1000); - } - } - } - - /** - * Find the specified number of unique ports available. - * The ports are all closed afterwards, - * so other network services started may grab those same ports. - * - * @param numPorts number of required port nubmers - * @return array of available port numbers - * @throws IOException - */ - public static int[] getPorts(int numPorts) throws IOException { - ServerSocket[] sockets = new ServerSocket[numPorts]; - int[] ports = new int[numPorts]; - for (int i = 0; i < numPorts; i++) { - ServerSocket sock = new ServerSocket(0); - sockets[i] = sock; - ports[i] = sock.getLocalPort(); - } - for (ServerSocket sock : sockets) { - sock.close(); - } - return ports; - } -} diff --git a/resource-managers/yarn/src/test/java/org/eclipse/jetty/server/SessionManager.java b/resource-managers/yarn/src/test/java/org/eclipse/jetty/server/SessionManager.java deleted file mode 100644 index bf89f8d7c804..000000000000 --- a/resource-managers/yarn/src/test/java/org/eclipse/jetty/server/SessionManager.java +++ /dev/null @@ -1,290 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.server; - -import javax.servlet.SessionCookieConfig; -import javax.servlet.SessionTrackingMode; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import java.util.EventListener; -import java.util.Set; - -import org.eclipse.jetty.http.HttpCookie; -import org.eclipse.jetty.server.session.SessionHandler; -import org.eclipse.jetty.util.component.LifeCycle; - -/** - * Adapted from https://github.com/eclipse/jetty.project/blob/jetty-9.3.25.v20180904/ - * jetty-server/src/main/java/org/eclipse/jetty/server/SessionManager.java - */ -public interface SessionManager extends LifeCycle { - /** - * Session cookie name. - * Defaults to JSESSIONID, but can be set with the - * org.eclipse.jetty.servlet.SessionCookie context init parameter. - */ - String __SessionCookieProperty = "org.eclipse.jetty.servlet.SessionCookie"; - String __DefaultSessionCookie = "JSESSIONID"; - - /** - * Session id path parameter name. - * Defaults to jsessionid, but can be set with the - * org.eclipse.jetty.servlet.SessionIdPathParameterName context init parameter. - * If set to null or "none" no URL rewriting will be done. - */ - String __SessionIdPathParameterNameProperty = - "org.eclipse.jetty.servlet.SessionIdPathParameterName"; - String __DefaultSessionIdPathParameterName = "jsessionid"; - String __CheckRemoteSessionEncoding = "org.eclipse.jetty.servlet.CheckingRemoteSessionIdEncoding"; - - /** - * Session Domain. - * If this property is set as a ServletContext InitParam, then it is - * used as the domain for session cookies. If it is not set, then - * no domain is specified for the session cookie. - */ - String __SessionDomainProperty = "org.eclipse.jetty.servlet.SessionDomain"; - String __DefaultSessionDomain = null; - - /** - * Session Path. - * If this property is set as a ServletContext InitParam, then it is - * used as the path for the session cookie. If it is not set, then - * the context path is used as the path for the cookie. - */ - String __SessionPathProperty = "org.eclipse.jetty.servlet.SessionPath"; - - /** - * Session Max Age. - * If this property is set as a ServletContext InitParam, then it is - * used as the max age for the session cookie. If it is not set, then - * a max age of -1 is used. - */ - String __MaxAgeProperty = "org.eclipse.jetty.servlet.MaxAge"; - - /** - * Returns the HttpSession with the given session id - * - * @param id the session id - * @return the HttpSession with the corresponding id - * or null if no session with the given id exists - */ - HttpSession getHttpSession(String id); - - /** - * Creates a new HttpSession. - * - * @param request the HttpServletRequest containing the requested session id - * @return the new HttpSession - */ - HttpSession newHttpSession(HttpServletRequest request); - - /** - * @return true if session cookies should be HTTP-only (Microsoft extension) - * @see HttpCookie#isHttpOnly() - */ - boolean getHttpOnly(); - - /** - * @return the max period of inactivity, after which the session is invalidated, in seconds. - * @see #setMaxInactiveInterval(int) - */ - int getMaxInactiveInterval(); - - /** - * Sets the max period of inactivity, after which the session is invalidated, in seconds. - * - * @param seconds the max inactivity period, in seconds. - * @see #getMaxInactiveInterval() - */ - void setMaxInactiveInterval(int seconds); - - /** - * Sets the {@link SessionHandler}. - * - * @param handler the SessionHandler object - */ - void setSessionHandler(SessionHandler handler); - - /** - * Adds an event listener for session-related events. - * - * @param listener the session event listener to add - * Individual SessionManagers implementations may accept arbitrary listener types, - * but they are expected to at least handle HttpSessionActivationListener, - * HttpSessionAttributeListener, - * HttpSessionBindingListener and HttpSessionListener. - * @see #removeEventListener(EventListener) - */ - void addEventListener(EventListener listener); - - /** - * Removes an event listener for for session-related events. - * - * @param listener the session event listener to remove - * @see #addEventListener(EventListener) - */ - void removeEventListener(EventListener listener); - - /** - * Removes all event listeners for session-related events. - * - * @see #removeEventListener(EventListener) - */ - void clearEventListeners(); - - /** - * Gets a Cookie for a session. - * - * @param session the session to which the cookie should refer. - * @param contextPath the context to which the cookie should be linked. - * The client will only send the cookie value when - * requesting resources under this path. - * @param requestIsSecure whether the client is accessing the server over - * a secure protocol (i.e. HTTPS). - * @return if this SessionManager uses cookies, then this method will return a new - * {@link Cookie cookie object} that should be set on the client - * in order to link future HTTP requests - * with the session. If cookies are not in use, - * this method returns null. - */ - HttpCookie getSessionCookie(HttpSession session, String contextPath, boolean requestIsSecure); - - /** - * @return the cross context session id manager. - * @see #setSessionIdManager(SessionIdManager) - */ - SessionIdManager getSessionIdManager(); - - /** - * @return the cross context session id manager. - * @deprecated use {@link #getSessionIdManager()} - */ - @Deprecated - SessionIdManager getMetaManager(); - - /** - * Sets the cross context session id manager - * - * @param idManager the cross context session id manager. - * @see #getSessionIdManager() - */ - void setSessionIdManager(SessionIdManager idManager); - - /** - * @param session the session to test for validity - * @return whether the given session is valid, that is, it has not been invalidated. - */ - boolean isValid(HttpSession session); - - /** - * @param session the session object - * @return the unique id of the session within the cluster, extended with an optional node id. - * @see #getClusterId(HttpSession) - */ - String getNodeId(HttpSession session); - - /** - * @param session the session object - * @return the unique id of the session within the cluster (without a node id extension) - * @see #getNodeId(HttpSession) - */ - String getClusterId(HttpSession session); - - /** - * Called by the {@link SessionHandler} when a session is first accessed by a request. - * - * @param session the session object - * @param secure whether the request is secure or not - * @return the session cookie. If not null, - * this cookie should be set on the response to either migrate - * the session or to refresh a session cookie that may expire. - * @see #complete(HttpSession) - */ - HttpCookie access(HttpSession session, boolean secure); - - /** - * Called by the {@link SessionHandler} when a session is last accessed by a request. - * - * @param session the session object - * @see #access(HttpSession, boolean) - */ - void complete(HttpSession session); - - /** - * Sets the session id URL path parameter name. - * - * @param parameterName the URL path parameter name - * for session id URL rewriting (null or "none" for no rewriting). - * @see #getSessionIdPathParameterName() - * @see #getSessionIdPathParameterNamePrefix() - */ - void setSessionIdPathParameterName(String parameterName); - - /** - * @return the URL path parameter name for session id URL rewriting, by default "jsessionid". - * @see #setSessionIdPathParameterName(String) - */ - String getSessionIdPathParameterName(); - - /** - * @return a formatted version of {@link #getSessionIdPathParameterName()}, by default - * ";" + sessionIdParameterName + "=", for easier lookup in URL strings. - * @see #getSessionIdPathParameterName() - */ - String getSessionIdPathParameterNamePrefix(); - - /** - * @return whether the session management is handled via cookies. - */ - boolean isUsingCookies(); - - /** - * @return whether the session management is handled via URLs. - */ - boolean isUsingURLs(); - - Set getDefaultSessionTrackingModes(); - - Set getEffectiveSessionTrackingModes(); - - void setSessionTrackingModes(Set sessionTrackingModes); - - SessionCookieConfig getSessionCookieConfig(); - - /** - * @return True if absolute URLs are check for remoteness before being session encoded. - */ - boolean isCheckingRemoteSessionIdEncoding(); - - /** - * @param remote True if absolute URLs are check for remoteness before being session encoded. - */ - void setCheckingRemoteSessionIdEncoding(boolean remote); - - /** Change the existing session id. - * - * @param oldClusterId the old cluster id - * @param oldNodeId the old node id - * @param newClusterId the new cluster id - * @param newNodeId the new node id - */ - void renewSessionId(String oldClusterId, String oldNodeId, String newClusterId, String newNodeId); -} diff --git a/resource-managers/yarn/src/test/java/org/eclipse/jetty/server/session/SessionHandler.java b/resource-managers/yarn/src/test/java/org/eclipse/jetty/server/session/SessionHandler.java deleted file mode 100644 index f8bcf8de82f6..000000000000 --- a/resource-managers/yarn/src/test/java/org/eclipse/jetty/server/session/SessionHandler.java +++ /dev/null @@ -1,90 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.server.session; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.SessionManager; -import org.eclipse.jetty.server.handler.ScopedHandler; - -/** - * Adapted from https://github.com/eclipse/jetty.project/blob/jetty-9.3.25.v20180904/ - * jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java - */ -public class SessionHandler extends ScopedHandler { - private SessionManager _sessionManager; - - public SessionHandler() { - } - - /** - * @param manager - * The session manager - */ - public SessionHandler(SessionManager manager) { - setSessionManager(manager); - } - - /** - * @return Returns the sessionManager. - */ - public SessionManager getSessionManager() { - return _sessionManager; - } - - /** - * @param sessionManager - * The sessionManager to set. - */ - public void setSessionManager(SessionManager sessionManager) { - if (isStarted()) { - throw new IllegalStateException(); - } - if (sessionManager != null) { - updateBean(_sessionManager,sessionManager); - _sessionManager=sessionManager; - } - } - - /* - * @see org.eclipse.jetty.server.Handler#handle(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse, int) - */ - @Override - public void doHandle(String target, Request baseRequest, HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - // start manual inline of nextHandle(target,baseRequest,request,response); - if (_nextScope != null && _nextScope == _handler) { - _nextScope.doHandle(target,baseRequest,request,response); - } else if (_handler != null) { - _handler.handle(target,baseRequest,request,response); - // end manual inline - } - } - - public void clearEventListeners() { - if (_sessionManager != null) { - _sessionManager.clearEventListeners(); - } - } -} From eeeaa5e4cfa223fc5b794045b58b11c4b1937ba5 Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Thu, 28 Mar 2024 15:56:45 -0400 Subject: [PATCH 4/5] ODP-1095: jettison 1.5.4 --- pom.xml | 10 +++++++--- resource-managers/yarn/pom.xml | 13 +++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4b2c8fa16471..ffc417fe7beb 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ scm:git:git@github.com:apache/spark.git HEAD - + nexus-releases @@ -1125,6 +1125,10 @@ asm asm + + org.codehaus.jettison + jettison + org.ow2.asm asm @@ -2913,9 +2917,9 @@ scala-2.11 - 2.11.12 diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index 2e0158d2430a..1a3f0422997f 100644 --- a/resource-managers/yarn/pom.xml +++ b/resource-managers/yarn/pom.xml @@ -30,6 +30,7 @@ yarn 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 From d3c3aad257117c452cee210dcb03a131538ac9b6 Mon Sep 17 00:00:00 2001 From: shubhamsharma Date: Thu, 2 May 2024 11:53:34 -0400 Subject: [PATCH 5/5] Fixed version as per main across all poms --- assembly/pom.xml | 2 +- common/kvstore/pom.xml | 2 +- common/network-common/pom.xml | 2 +- common/network-shuffle/pom.xml | 2 +- common/network-yarn/pom.xml | 2 +- common/sketch/pom.xml | 2 +- common/tags/pom.xml | 2 +- common/unsafe/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- external/avro/pom.xml | 2 +- external/docker-integration-tests/pom.xml | 2 +- external/flume-assembly/pom.xml | 2 +- external/flume-sink/pom.xml | 2 +- external/flume/pom.xml | 2 +- external/kafka-0-10-assembly/pom.xml | 2 +- external/kafka-0-10-sql/pom.xml | 2 +- external/kafka-0-10/pom.xml | 2 +- external/kafka-0-8-assembly/pom.xml | 2 +- external/kafka-0-8/pom.xml | 2 +- external/kinesis-asl-assembly/pom.xml | 2 +- external/kinesis-asl/pom.xml | 2 +- external/spark-ganglia-lgpl/pom.xml | 2 +- graphx/pom.xml | 2 +- hadoop-cloud/pom.xml | 2 +- launcher/pom.xml | 2 +- mllib-local/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 14 +++++++------- repl/pom.xml | 2 +- resource-managers/kubernetes/core/pom.xml | 2 +- .../kubernetes/integration-tests/pom.xml | 2 +- resource-managers/mesos/pom.xml | 2 +- resource-managers/yarn/pom.xml | 2 +- sql/catalyst/pom.xml | 2 +- sql/core/pom.xml | 2 +- sql/hive-thriftserver/pom.xml | 2 +- sql/hive/pom.xml | 2 +- standalone-metastore/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- 41 files changed, 47 insertions(+), 47 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index c7364a8fa05a..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/common/kvstore/pom.xml b/common/kvstore/pom.xml index f3cb2e1d540d..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-1095 + 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 c3358a8c0ad0..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-1095 + 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 ed6a3ae85fb0..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-1095 + 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 4339c8e403aa..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index e019192879d0..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/common/tags/pom.xml b/common/tags/pom.xml index 091bf846d079..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index 03cdc5bfb555..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/core/pom.xml b/core/pom.xml index e5b455cd6c43..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index bddb630baedb..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/external/avro/pom.xml b/external/avro/pom.xml index 86fc38162a5b..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-1095 + 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 bb9f5ca8faa6..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-1095 + 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 648eede6cae6..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-1095 + 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 bc8e99d0bfe8..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 58fe17f63f87..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-1095 + 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 6bb373bad313..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-1095 + 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 a9636ba308c1..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-1095 + 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 e50b3c9a9478..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-1095 + 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 b14956281d61..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-1095 + 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 3af456140c85..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-1095 + 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 63ed8447a674..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-1095 + 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 89bd127eeef5..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-1095 + 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 c5f5b8016169..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/graphx/pom.xml b/graphx/pom.xml index 98262fab9158..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index 6fc141c0d1bb..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/launcher/pom.xml b/launcher/pom.xml index 5e460509782b..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index d615b68ed10c..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index d6068cfab8ac..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index ffc417fe7beb..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT pom Spark Project Parent POM http://spark.apache.org/ @@ -132,11 +132,11 @@ spark 1.7.16 1.2.17 - 3.2.3.3.2.2.0-1095 + 3.2.3.3.3.0.0-SNAPSHOT 2.5.0 ${hadoop.version} 1.6.0 - 3.5.10.3.2.2.0-1095 + 3.5.10.3.3.0.0-SNAPSHOT 2.6.0 org.spark-project.hive @@ -2836,18 +2836,18 @@ hadoop-3.1 - 3.2.3.3.2.2.0-1095 + 3.2.3.3.3.0.0-SNAPSHOT 2.12.0 - 3.5.10.3.2.2.0-1095 + 3.5.10.3.3.0.0-SNAPSHOT hadoop-3.2 - 3.2.3.3.2.2.0-1095 + 3.2.3.3.3.0.0-SNAPSHOT 2.12.0 - 3.5.10.3.2.2.0-1095 + 3.5.10.3.3.0.0-SNAPSHOT diff --git a/repl/pom.xml b/repl/pom.xml index 28cb09cc7074..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-1095 + 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 da6dd13282ae..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-1095 + 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 17a356a8789a..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-1095 + 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 384cc4f796c3..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-1095 + 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 1a3f0422997f..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index b280398936a7..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/sql/core/pom.xml b/sql/core/pom.xml index c8a0854734b8..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-1095 + 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 c90fc1dfc2ac..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 7c65b787e0b7..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../../pom.xml diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index 7e7f4f214c73..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 4b7e0094c003..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index 39e117cb6065..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-1095 + 2.4.8.3.3.0.0-SNAPSHOT ../pom.xml