Skip to content

Commit 4bcbf47

Browse files
senthhPrashant SinghLuciferYangdongjoon-hyunattilapiros
committed
ODP-2049 - CVE | HSBC | Standalone Binaries for Spark (#35)
* ODP-2189 Upgrade snakeyaml version to 2.0 * [SPARK-35579][SQL] Bump janino to 3.1.7 ### What changes were proposed in this pull request? upgrade janino to 3.1.7 from 3.0.16 ### Why are the changes needed? - The proposed version contains bug fix in janino by maropu. - janino-compiler/janino#148 - contains `getBytecodes` method which can be used to simplify the way to get bytecodes from ClassBodyEvaluator in CodeGenerator#updateAndGetCompilationStats method. (by LuciferYang) - apache#32536 ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Existing UTs Closes apache#37202 from singhpk234/upgrade/bump-janino. Authored-by: Prashant Singh <[email protected]> Signed-off-by: Sean Owen <[email protected]> (cherry picked from commit 29ed337) * [SPARK-40633][BUILD] Upgrade janino to 3.1.9 ### What changes were proposed in this pull request? This pr aims upgrade janino from 3.1.7 to 3.1.9 ### Why are the changes needed? This version bring some improvement and bug fix, and janino 3.1.9 will no longer test Java 12, 15, 16 because these STS versions have been EOL: - janino-compiler/janino@v3.1.7...v3.1.9 ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? - Pass GitHub Actions - Manual test this pr with Scala 2.13, all test passed Closes apache#38075 from LuciferYang/SPARK-40633. Lead-authored-by: yangjie01 <[email protected]> Co-authored-by: YangJie <[email protected]> Signed-off-by: Sean Owen <[email protected]> (cherry picked from commit 49e102b) * ODP-2167 Upgrade janino version from 3.1.9 to 3.1.10 * ODP-2190 Upgrade guava version to 32.1.3-jre * ODP-2193 Upgrade jettison version to 1.5.4 * ODP-2194 Upgrade wildfly-openssl version to 1.1.3 * ODP-2198 Upgrade gson version to 2.11.0 * ODP-2199 Upgrade kryo-shaded version to 4.0.3 * ODP-2200 Upgrade datanucleus-core and datanucleus-rdbms versions to 5.2.3 * ODP-2203 Upgrade Snappy and common-compress to 1.1.10.4 and 1.26.0 respectively * ODP-2198 Excluded gson from tink library * ODP-2205 Upgrade jdom2 to 2.0.6.1 * ODP-2198 Excluded gson from hive-exec * ODP-2175|SPARK-47018 Upgrade libthrift version and hive version * [SPARK-39688][K8S] `getReusablePVCs` should handle accounts with no PVC permission ### What changes were proposed in this pull request? This PR aims to handle `KubernetesClientException` in `getReusablePVCs` method to handle gracefully the cases where accounts has no PVC permission including `listing`. ### Why are the changes needed? To prevent a regression in Apache Spark 3.4. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass the CIs with the newly added test case. Closes apache#37095 from dongjoon-hyun/SPARK-39688. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]> (cherry picked from commit 79f133b) * [SPARK-40458][K8S] Bump Kubernetes Client Version to 6.1.1 ### What changes were proposed in this pull request? Bump kubernetes-client version from 5.12.3 to 6.1.1 and clean up all the deprecations. ### Why are the changes needed? To keep up with kubernetes-client [changes](fabric8io/kubernetes-client@v5.12.3...v6.1.1). As this is an upgrade where the main version changed I have cleaned up all the deprecations. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? #### Unit tests #### Manual tests for submit and application management Started an application in a non-default namespace (`bla`): ``` ➜ spark git:(SPARK-40458) ✗ ./bin/spark-submit \ --master k8s://http://127.0.0.1:8001 \ --deploy-mode cluster \ --name spark-pi \ --class org.apache.spark.examples.SparkPi \ --conf spark.executor.instances=5 \ --conf spark.kubernetes.namespace=bla \ --conf spark.kubernetes.container.image=docker.io/kubespark/spark:3.4.0-SNAPSHOT_064A99CC-57AF-46D5-B743-5B12692C260D \ local:///opt/spark/examples/jars/spark-examples_2.12-3.4.0-SNAPSHOT.jar 200000 ``` Check that we cannot find it in the default namespace even with glob without the namespace definition: ``` ➜ spark git:(SPARK-40458) ✗ minikube kubectl -- config set-context --current --namespace=default Context "minikube" modified. ➜ spark git:(SPARK-40458) ✗ ./bin/spark-submit --status "spark-pi-*" --master k8s://http://127.0.0.1:8001 Submitting a request for the status of submission spark-pi-* in k8s://http://127.0.0.1:8001. No applications found. ``` Then check we can find it by specifying the namespace: ``` ➜ spark git:(SPARK-40458) ✗ ./bin/spark-submit --status "bla:spark-pi-*" --master k8s://http://127.0.0.1:8001 Submitting a request for the status of submission bla:spark-pi-* in k8s://http://127.0.0.1:8001. Application status (driver): pod name: spark-pi-4c4e70837c86ae1a-driver namespace: bla labels: spark-app-name -> spark-pi, spark-app-selector -> spark-c95a9a0888214c01a286eb7ba23980a0, spark-role -> driver, spark-version -> 3.4.0-SNAPSHOT pod uid: 0be8952e-3e00-47a3-9082-9cb45278ed6d creation time: 2022-09-27T01:19:06Z service account name: default volumes: spark-local-dir-1, spark-conf-volume-driver, kube-api-access-wxnqw node name: minikube start time: 2022-09-27T01:19:06Z phase: Running container status: container name: spark-kubernetes-driver container image: kubespark/spark:3.4.0-SNAPSHOT_064A99CC-57AF-46D5-B743-5B12692C260D container state: running container started at: 2022-09-27T01:19:07Z ``` Changing the namespace to `bla` with `kubectl`: ``` ➜ spark git:(SPARK-40458) ✗ minikube kubectl -- config set-context --current --namespace=bla Context "minikube" modified. ``` Checking we can find it without specifying the namespace (and glob): ``` ➜ spark git:(SPARK-40458) ✗ ./bin/spark-submit --status "spark-pi-*" --master k8s://http://127.0.0.1:8001 Submitting a request for the status of submission spark-pi-* in k8s://http://127.0.0.1:8001. Application status (driver): pod name: spark-pi-4c4e70837c86ae1a-driver namespace: bla labels: spark-app-name -> spark-pi, spark-app-selector -> spark-c95a9a0888214c01a286eb7ba23980a0, spark-role -> driver, spark-version -> 3.4.0-SNAPSHOT pod uid: 0be8952e-3e00-47a3-9082-9cb45278ed6d creation time: 2022-09-27T01:19:06Z service account name: default volumes: spark-local-dir-1, spark-conf-volume-driver, kube-api-access-wxnqw node name: minikube start time: 2022-09-27T01:19:06Z phase: Running container status: container name: spark-kubernetes-driver container image: kubespark/spark:3.4.0-SNAPSHOT_064A99CC-57AF-46D5-B743-5B12692C260D container state: running container started at: 2022-09-27T01:19:07Z ``` Killing the app: ``` ➜ spark git:(SPARK-40458) ✗ ./bin/spark-submit --kill "spark-pi-*" --master k8s://http://127.0.0.1:8001 Submitting a request to kill submission spark-pi-* in k8s://http://127.0.0.1:8001. Grace period in secs: not set. Deleting driver pod: spark-pi-4c4e70837c86ae1a-driver. ``` Closes apache#37990 from attilapiros/SPARK-40458. Authored-by: attilapiros <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]> (cherry picked from commit fa88651) * [SPARK-36462][K8S] Add the ability to selectively disable watching or polling ### What changes were proposed in this pull request? Add the ability to selectively disable watching or polling Updated version of apache#34264 ### Why are the changes needed? Watching or polling for pod status on Kubernetes can place additional load on etcd, with a large number of executors and large number of jobs this can have negative impacts and executors register themselves with the driver under normal operations anyways. ### Does this PR introduce _any_ user-facing change? Two new config flags. ### How was this patch tested? New unit tests + manually tested a forked version of this on an internal cluster with both watching and polling disabled. Closes apache#36433 from holdenk/SPARK-36462-allow-spark-on-kube-to-operate-without-watchers. Lead-authored-by: Holden Karau <[email protected]> Co-authored-by: Holden Karau <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]> (cherry picked from commit 5bffb98) * ODP-2201|SPARK-48867 Upgrade okhttp to 4.12.0, okio to 3.9.0 and esdk-obs-java to 3.24.3 * [SPARK-41958][CORE][3.3] Disallow arbitrary custom classpath with proxy user in cluster mode Backporting fix for SPARK-41958 to 3.3 branch from apache#39474 Below description from original PR. -------------------------- ### What changes were proposed in this pull request? This PR proposes to disallow arbitrary custom classpath with proxy user in cluster mode by default. ### Why are the changes needed? To avoid arbitrary classpath in spark cluster. ### Does this PR introduce _any_ user-facing change? Yes. User should reenable this feature by `spark.submit.proxyUser.allowCustomClasspathInClusterMode`. ### How was this patch tested? Manually tested. Closes apache#39474 from Ngone51/dev. Lead-authored-by: Peter Toth <peter.tothgmail.com> Co-authored-by: Yi Wu <yi.wudatabricks.com> Signed-off-by: Hyukjin Kwon <gurwls223apache.org> (cherry picked from commit 909da96) ### What changes were proposed in this pull request? ### Why are the changes needed? ### Does this PR introduce _any_ user-facing change? ### How was this patch tested? Closes apache#41428 from degant/spark-41958-3.3. Lead-authored-by: Degant Puri <[email protected]> Co-authored-by: Peter Toth <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]> * ODP-2049 Changing Spark3 version from 3.3.3.3.2.3.2-2 to 3.3.3.3.2.3.2-201 * ODP-2049 Changing libthrift version to 0.16 in deps files * ODP-2049 Changing derby version to 10.14.3.0 --------- Signed-off-by: Dongjoon Hyun <[email protected]> Co-authored-by: Prashant Singh <[email protected]> Co-authored-by: yangjie01 <[email protected]> Co-authored-by: Dongjoon Hyun <[email protected]> Co-authored-by: attilapiros <[email protected]> Co-authored-by: Holden Karau <[email protected]> Co-authored-by: Degant Puri <[email protected]> Co-authored-by: Peter Toth <[email protected]>
1 parent ff21ab7 commit 4bcbf47

File tree

43 files changed

+771
-460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+771
-460
lines changed

dev/deps/spark-deps-hadoop-2-hive-2.3

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,14 @@ commons-cli/1.5.0//commons-cli-1.5.0.jar
3838
commons-codec/1.15//commons-codec-1.15.jar
3939
commons-collections/3.2.2//commons-collections-3.2.2.jar
4040
commons-collections4/4.4//commons-collections4-4.4.jar
41-
commons-compiler/3.1.7//commons-compiler-3.1.7.jar
42-
commons-compress/1.21//commons-compress-1.21.jar
41+
commons-compiler/3.1.9//commons-compiler-3.1.9.jar
42+
commons-compress/1.26.0//commons-compress-1.26.0.jar
4343
commons-configuration/1.6//commons-configuration-1.6.jar
4444
commons-crypto/1.1.0//commons-crypto-1.1.0.jar
4545
commons-dbcp/1.4//commons-dbcp-1.4.jar
4646
commons-digester/1.8//commons-digester-1.8.jar
4747
commons-httpclient/3.1//commons-httpclient-3.1.jar
4848
commons-io/2.4//commons-io-2.4.jar
49-
commons-lang/2.6//commons-lang-2.6.jar
5049
commons-lang3/3.12.0//commons-lang3-3.12.0.jar
5150
commons-logging/1.1.3//commons-logging-1.1.3.jar
5251
commons-math3/3.6.1//commons-math3-3.6.1.jar
@@ -58,15 +57,15 @@ curator-client/2.7.1//curator-client-2.7.1.jar
5857
curator-framework/2.7.1//curator-framework-2.7.1.jar
5958
curator-recipes/2.7.1//curator-recipes-2.7.1.jar
6059
datanucleus-api-jdo/4.2.4//datanucleus-api-jdo-4.2.4.jar
61-
datanucleus-core/4.1.17//datanucleus-core-4.1.17.jar
62-
datanucleus-rdbms/4.1.19//datanucleus-rdbms-4.1.19.jar
63-
derby/10.14.2.0//derby-10.14.2.0.jar
60+
datanucleus-core/5.2.3//datanucleus-core-5.2.3.jar
61+
datanucleus-rdbms/5.2.3//datanucleus-rdbms-5.2.3.jar
62+
derby/10.14.3//derby-10.14.3.jar
6463
dropwizard-metrics-hadoop-metrics2-reporter/0.1.2//dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar
6564
flatbuffers-java/1.12.0//flatbuffers-java-1.12.0.jar
6665
gcs-connector/hadoop2-2.2.7/shaded/gcs-connector-hadoop2-2.2.7-shaded.jar
6766
gmetric4j/1.0.10//gmetric4j-1.0.10.jar
68-
gson/2.2.4//gson-2.2.4.jar
69-
guava/14.0.1//guava-14.0.1.jar
67+
gson/2.11.0//gson-2.11.0.jar
68+
guava/32.1.3-jre//guava-32.1.3-jre.jar
7069
guice-servlet/3.0//guice-servlet-3.0.jar
7170
guice/3.0//guice-3.0.jar
7271
hadoop-annotations/2.7.4//hadoop-annotations-2.7.4.jar
@@ -96,45 +95,45 @@ hive-llap-common/2.3.9//hive-llap-common-2.3.10.jar
9695
hive-metastore/2.3.9//hive-metastore-2.3.10.jar
9796
hive-serde/2.3.9//hive-serde-2.3.10.jar
9897
hive-service-rpc/3.1.3//hive-service-rpc-3.1.3.jar
99-
hive-shims-0.23/2.3.9//hive-shims-0.23-2.3.9.jar
100-
hive-shims-common/2.3.9//hive-shims-common-2.3.9.jar
101-
hive-shims-scheduler/2.3.9//hive-shims-scheduler-2.3.9.jar
102-
hive-shims/2.3.9//hive-shims-2.3.9.jar
98+
hive-shims-0.23/2.3.9//hive-shims-0.23-2.3.10.jar
99+
hive-shims-common/2.3.9//hive-shims-common-2.3.10.jar
100+
hive-shims-scheduler/2.3.9//hive-shims-scheduler-2.3.10.jar
101+
hive-shims/2.3.9//hive-shims-2.3.10.jar
103102
hive-storage-api/2.7.3//hive-storage-api-2.7.3.jar
104-
hive-vector-code-gen/2.3.9//hive-vector-code-gen-2.3.9.jar
103+
hive-vector-code-gen/2.3.9//hive-vector-code-gen-2.3.10.jar
105104
hk2-api/2.6.1//hk2-api-2.6.1.jar
106105
hk2-locator/2.6.1//hk2-locator-2.6.1.jar
107106
hk2-utils/2.6.1//hk2-utils-2.6.1.jar
108107
htrace-core/3.1.0-incubating//htrace-core-3.1.0-incubating.jar
109108
httpclient/4.5.13//httpclient-4.5.13.jar
110109
httpcore/4.4.14//httpcore-4.4.14.jar
111110
istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar
112-
ivy/2.5.0//ivy-2.5.0.jar
113-
jackson-annotations/2.13.4//jackson-annotations-2.13.4.jar
111+
ivy/2.5.1//ivy-2.5.1.jar
112+
jackson-annotations/2.14.2//jackson-annotations-2.14.2.jar
114113
jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar
115-
jackson-core/2.13.4//jackson-core-2.13.4.jar
116-
jackson-databind/2.13.4.1//jackson-databind-2.13.4.1.jar
117-
jackson-dataformat-cbor/2.13.4//jackson-dataformat-cbor-2.13.4.jar
118-
jackson-dataformat-yaml/2.13.4//jackson-dataformat-yaml-2.13.4.jar
119-
jackson-datatype-jsr310/2.13.4//jackson-datatype-jsr310-2.13.4.jar
114+
jackson-core/2.14.2//jackson-core-2.14.2.jar
115+
jackson-databind/2.14.2//jackson-databind-2.14.2.jar
116+
jackson-dataformat-cbor/2.14.2//jackson-dataformat-cbor-2.14.2.jar
117+
jackson-dataformat-yaml/2.14.2//jackson-dataformat-yaml-2.14.2.jar
118+
jackson-datatype-jsr310/2.14.2//jackson-datatype-jsr310-2.14.2.jar
120119
jackson-jaxrs/1.9.13//jackson-jaxrs-1.9.13.jar
121120
jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar
122-
jackson-module-scala_2.12/2.13.4//jackson-module-scala_2.12-2.13.4.jar
121+
jackson-module-scala_2.12/2.14.2//jackson-module-scala_2.12-2.14.2.jar
123122
jackson-xc/1.9.13//jackson-xc-1.9.13.jar
124123
jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar
125124
jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
126125
jakarta.servlet-api/4.0.3//jakarta.servlet-api-4.0.3.jar
127126
jakarta.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar
128127
jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar
129128
jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar
130-
janino/3.1.7//janino-3.1.7.jar
129+
janino/3.1.10//janino-3.1.10.jar
131130
javassist/3.25.0-GA//javassist-3.25.0-GA.jar
132131
javax.inject/1//javax.inject-1.jar
133132
javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar
134133
javolution/5.5.1//javolution-5.5.1.jar
135134
jaxb-api/2.2.11//jaxb-api-2.2.11.jar
136135
jaxb-runtime/2.3.2//jaxb-runtime-2.3.2.jar
137-
jcl-over-slf4j/2.0.3//jcl-over-slf4j-2.0.3.jar
136+
jcl-over-slf4j/2.0.6//jcl-over-slf4j-2.0.6.jar
138137
jdo-api/3.0.1//jdo-api-3.0.1.jar
139138
jersey-client/2.36//jersey-client-2.36.jar
140139
jersey-common/2.36//jersey-common-2.36.jar
@@ -158,7 +157,7 @@ json4s-scalap_2.12/3.7.0-M11//json4s-scalap_2.12-3.7.0-M11.jar
158157
jsp-api/2.1//jsp-api-2.1.jar
159158
jsr305/3.0.0//jsr305-3.0.0.jar
160159
jta/1.1//jta-1.1.jar
161-
jul-to-slf4j/2.0.3//jul-to-slf4j-2.0.3.jar
160+
jul-to-slf4j/1.7.36//jul-to-slf4j-1.7.36.jar
162161
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
163162
kubernetes-client-api/6.1.1//kubernetes-client-api-6.1.1.jar
164163
kubernetes-client/6.1.1//kubernetes-client-6.1.1.jar
@@ -187,7 +186,7 @@ kubernetes-model-storageclass/6.1.1//kubernetes-model-storageclass-6.1.1.jar
187186
lapack/3.0.2//lapack-3.0.2.jar
188187
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
189188
libfb303/0.9.3//libfb303-0.9.3.jar
190-
libthrift/0.12.0//libthrift-0.12.0.jar
189+
libthrift/0.16.0//libthrift-0.16.0.jar
191190
log4j-1.2-api/2.19.0//log4j-1.2-api-2.19.0.jar
192191
log4j-api/2.19.0//log4j-api-2.19.0.jar
193192
log4j-core/2.19.0//log4j-core-2.19.0.jar
@@ -247,10 +246,10 @@ scala-library/2.12.17//scala-library-2.12.17.jar
247246
scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar
248247
scala-reflect/2.12.17//scala-reflect-2.12.17.jar
249248
scala-xml_2.12/2.1.0//scala-xml_2.12-2.1.0.jar
250-
shims/0.9.32//shims-0.9.32.jar
251-
slf4j-api/2.0.3//slf4j-api-2.0.3.jar
252-
snakeyaml/1.31//snakeyaml-1.31.jar
253-
snappy-java/1.1.8.4//snappy-java-1.1.8.4.jar
249+
shims/0.9.36//shims-0.9.36.jar
250+
slf4j-api/2.0.6//slf4j-api-2.0.6.jar
251+
snakeyaml/2.0//snakeyaml-2.0.jar
252+
snappy-java/1.1.10.4//snappy-java-1.1.10.4.jar
254253
spire-macros_2.12/0.17.0//spire-macros_2.12-0.17.0.jar
255254
spire-platform_2.12/0.17.0//spire-platform_2.12-0.17.0.jar
256255
spire-util_2.12/0.17.0//spire-util_2.12-0.17.0.jar

dev/deps/spark-deps-hadoop-3-hive-2.3

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ commons-cli/1.5.0//commons-cli-1.5.0.jar
3939
commons-codec/1.15//commons-codec-1.15.jar
4040
commons-collections/3.2.2//commons-collections-3.2.2.jar
4141
commons-collections4/4.4//commons-collections4-4.4.jar
42-
commons-compiler/3.1.7//commons-compiler-3.1.7.jar
43-
commons-compress/1.21//commons-compress-1.21.jar
42+
commons-compiler/3.1.9//commons-compiler-3.1.9.jar
43+
commons-compress/1.26//commons-compress-1.26.jar
4444
commons-crypto/1.1.0//commons-crypto-1.1.0.jar
4545
commons-dbcp/1.4//commons-dbcp-1.4.jar
4646
commons-io/2.11.0//commons-io-2.11.0.jar
@@ -55,15 +55,16 @@ curator-client/5.2.0//curator-client-5.2.0.jar
5555
curator-framework/5.2.0//curator-framework-5.2.0.jar
5656
curator-recipes/5.2.0//curator-recipes-5.2.0.jar
5757
datanucleus-api-jdo/4.2.4//datanucleus-api-jdo-4.2.4.jar
58-
datanucleus-core/4.1.17//datanucleus-core-4.1.17.jar
59-
datanucleus-rdbms/4.1.19//datanucleus-rdbms-4.1.19.jar
60-
derby/10.14.2.0//derby-10.14.2.0.jar
58+
datanucleus-core/5.2.3//datanucleus-core-5.2.3.jar
59+
datanucleus-rdbms/5.2.3//datanucleus-rdbms-5.2.3.jar
60+
derby/10.14.3//derby-10.14.3.jar
6161
dropwizard-metrics-hadoop-metrics2-reporter/0.1.2//dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar
62+
esdk-obs-java/3.24.3//esdk-obs-java-3.24.3.jar
6263
flatbuffers-java/1.12.0//flatbuffers-java-1.12.0.jar
6364
gcs-connector/hadoop3-2.2.7/shaded/gcs-connector-hadoop3-2.2.7-shaded.jar
6465
gmetric4j/1.0.10//gmetric4j-1.0.10.jar
65-
gson/2.2.4//gson-2.2.4.jar
66-
guava/14.0.1//guava-14.0.1.jar
66+
gson/2.11.0//gson-2.11.0.jar
67+
guava/32.1.3-jre//guava-32.1.3-jre.jar
6768
hadoop-aliyun/3.3.4//hadoop-aliyun-3.3.4.jar
6869
hadoop-annotations/3.3.4//hadoop-annotations-3.3.4.jar
6970
hadoop-aws/3.3.4//hadoop-aws-3.3.4.jar
@@ -99,36 +100,38 @@ ini4j/0.5.4//ini4j-0.5.4.jar
99100
istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar
100101
ivy/2.5.1//ivy-2.5.1.jar
101102
jackson-annotations/2.14.2//jackson-annotations-2.14.2.jar
103+
jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar
102104
jackson-core/2.14.2//jackson-core-2.14.2.jar
103105
jackson-databind/2.14.2//jackson-databind-2.14.2.jar
104106
jackson-dataformat-cbor/2.14.2//jackson-dataformat-cbor-2.14.2.jar
105107
jackson-dataformat-yaml/2.14.2//jackson-dataformat-yaml-2.14.2.jar
106108
jackson-datatype-jsr310/2.14.2//jackson-datatype-jsr310-2.14.2.jar
109+
jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar
107110
jackson-module-scala_2.12/2.14.2//jackson-module-scala_2.12-2.14.2.jar
108111
jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar
109112
jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
110113
jakarta.servlet-api/4.0.3//jakarta.servlet-api-4.0.3.jar
111114
jakarta.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar
112115
jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar
113116
jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar
114-
janino/3.1.7//janino-3.1.7.jar
117+
janino/3.1.10//janino-3.1.10.jar
115118
javassist/3.25.0-GA//javassist-3.25.0-GA.jar
116119
javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar
117120
javolution/5.5.1//javolution-5.5.1.jar
118121
jaxb-api/2.2.11//jaxb-api-2.2.11.jar
119122
jaxb-runtime/2.3.2//jaxb-runtime-2.3.2.jar
120123
jcl-over-slf4j/2.0.3//jcl-over-slf4j-2.0.3.jar
121124
jdo-api/3.0.1//jdo-api-3.0.1.jar
122-
jdom2/2.0.6//jdom2-2.0.6.jar
125+
jdom2/2.0.6.1//jdom2-2.0.6.1.jar
123126
jersey-client/2.36//jersey-client-2.36.jar
124127
jersey-common/2.36//jersey-common-2.36.jar
125128
jersey-container-servlet-core/2.36//jersey-container-servlet-core-2.36.jar
126129
jersey-container-servlet/2.36//jersey-container-servlet-2.36.jar
127130
jersey-hk2/2.36//jersey-hk2-2.36.jar
128131
jersey-server/2.36//jersey-server-2.36.jar
129-
jettison/1.1//jettison-1.1.jar
130-
jetty-util-ajax/9.4.49.v20220914//jetty-util-ajax-9.4.49.v20220914.jar
131-
jetty-util/9.4.49.v20220914//jetty-util-9.4.49.v20220914.jar
132+
jettison/1.5.4//jettison-1.5.4.jar
133+
jetty-util-ajax/9.4.53.v20231009//jetty-util-ajax-9.4.53.v20231009.jar
134+
jetty-util/9.4.53.v20231009//jetty-util-9.4.53.v20231009.jar
132135
jline/2.14.6//jline-2.14.6.jar
133136
joda-time/2.11.2//joda-time-2.11.2.jar
134137
jodd-core/3.5.2//jodd-core-3.5.2.jar
@@ -140,8 +143,9 @@ json4s-jackson_2.12/3.7.0-M11//json4s-jackson_2.12-3.7.0-M11.jar
140143
json4s-scalap_2.12/3.7.0-M11//json4s-scalap_2.12-3.7.0-M11.jar
141144
jsr305/3.0.0//jsr305-3.0.0.jar
142145
jta/1.1//jta-1.1.jar
143-
jul-to-slf4j/2.0.3//jul-to-slf4j-2.0.3.jar
144-
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
146+
jul-to-slf4j/2.0.6//jul-to-slf4j-2.0.6.jar
147+
kotlin-stdlib/2.0.10//kotlin-stdlib-2.0.10.jar
148+
kryo-shaded/4.0.3//kryo-shaded-4.0.3.jar
145149
kubernetes-client-api/6.1.1//kubernetes-client-api-6.1.1.jar
146150
kubernetes-client/6.1.1//kubernetes-client-6.1.1.jar
147151
kubernetes-httpclient-okhttp/6.1.1//kubernetes-httpclient-okhttp-6.1.1.jar
@@ -169,12 +173,12 @@ kubernetes-model-storageclass/6.1.1//kubernetes-model-storageclass-6.1.1.jar
169173
lapack/3.0.2//lapack-3.0.2.jar
170174
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
171175
libfb303/0.9.3//libfb303-0.9.3.jar
172-
libthrift/0.12.0//libthrift-0.12.0.jar
176+
libthrift/0.16.0//libthrift-0.16.0.jar
173177
log4j-1.2-api/2.19.0//log4j-1.2-api-2.19.0.jar
174178
log4j-api/2.19.0//log4j-api-2.19.0.jar
175179
log4j-core/2.19.0//log4j-core-2.19.0.jar
176180
log4j-slf4j2-impl/2.19.0//log4j-slf4j2-impl-2.19.0.jar
177-
logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar
181+
logging-interceptor/4.12.0//logging-interceptor-4.12.0.jar
178182
lz4-java/1.8.0//lz4-java-1.8.0.jar
179183
mesos/1.4.3/shaded-protobuf/mesos-1.4.3-shaded-protobuf.jar
180184
metrics-core/4.2.10//metrics-core-4.2.10.jar
@@ -203,8 +207,9 @@ netty-transport-native-kqueue/4.1.84.Final/osx-x86_64/netty-transport-native-kqu
203207
netty-transport-native-unix-common/4.1.84.Final//netty-transport-native-unix-common-4.1.84.Final.jar
204208
netty-transport/4.1.84.Final//netty-transport-4.1.84.Final.jar
205209
objenesis/3.2//objenesis-3.2.jar
206-
okhttp/3.12.12//okhttp-3.12.12.jar
207-
okio/1.15.0//okio-1.15.0.jar
210+
okhttp/4.12.0//okhttp-4.12.0.jar
211+
okio-jvm/3.9.0//okio-jvm-3.9.0.jar
212+
okio/3.9.0//okio-3.9.0.jar
208213
opencsv/2.3//opencsv-2.3.jar
209214
opentracing-api/0.33.0//opentracing-api-0.33.0.jar
210215
opentracing-noop/0.33.0//opentracing-noop-0.33.0.jar
@@ -232,10 +237,10 @@ scala-library/2.12.17//scala-library-2.12.17.jar
232237
scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar
233238
scala-reflect/2.12.17//scala-reflect-2.12.17.jar
234239
scala-xml_2.12/2.1.0//scala-xml_2.12-2.1.0.jar
235-
shims/0.9.32//shims-0.9.32.jar
236-
slf4j-api/2.0.3//slf4j-api-2.0.3.jar
237-
snakeyaml/1.31//snakeyaml-1.31.jar
238-
snappy-java/1.1.8.4//snappy-java-1.1.8.4.jar
240+
shims/0.9.36//shims-0.9.36.jar
241+
slf4j-api/2.0.6//slf4j-api-2.0.6.jar
242+
snakeyaml/2.0//snakeyaml-2.0.jar
243+
snappy-java/1.1.10.4//snappy-java-1.1.10.4.jar
239244
spire-macros_2.12/0.17.0//spire-macros_2.12-0.17.0.jar
240245
spire-platform_2.12/0.17.0//spire-platform_2.12-0.17.0.jar
241246
spire-util_2.12/0.17.0//spire-util_2.12-0.17.0.jar
@@ -247,10 +252,9 @@ threeten-extra/1.7.1//threeten-extra-1.7.1.jar
247252
tink/1.7.0//tink-1.7.0.jar
248253
transaction-api/1.1//transaction-api-1.1.jar
249254
univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar
250-
velocity/1.5//velocity-1.5.jar
251-
wildfly-openssl/1.0.7.Final//wildfly-openssl-1.0.7.Final.jar
252-
xbean-asm9-shaded/4.21//xbean-asm9-shaded-4.21.jar
253-
xz/1.8//xz-1.8.jar
255+
wildfly-openssl/1.1.3.Final//wildfly-openssl-1.1.3.Final.jar
256+
xbean-asm9-shaded/4.22//xbean-asm9-shaded-4.22.jar
257+
xz/1.9//xz-1.9.jar
254258
zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
255259
zookeeper-jute/3.6.2//zookeeper-jute-3.6.2.jar
256260
zookeeper/3.6.2//zookeeper-3.6.2.jar

docs/building-spark.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ If you want to build with Hadoop 2.x, enable `hadoop-2` profile:
8787

8888
To enable Hive integration for Spark SQL along with its JDBC server and CLI,
8989
add the `-Phive` and `-Phive-thriftserver` profiles to your existing build options.
90-
By default Spark will build with Hive 2.3.9.
90+
By default Spark will build with Hive 2.3.10.
9191

92-
# With Hive 2.3.9 support
92+
# With Hive 2.3.10 support
9393
./build/mvn -Pyarn -Phive -Phive-thriftserver -DskipTests clean package
9494

9595
## Packaging without Hadoop Dependencies for YARN

docs/core-migration-guide.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ license: |
5858

5959
- Since Spark 3.3, Spark migrates its log4j dependency from 1.x to 2.x because log4j 1.x has reached end of life and is no longer supported by the community. Vulnerabilities reported after August 2015 against log4j 1.x were not checked and will not be fixed. Users should rewrite original log4j properties files using log4j2 syntax (XML, JSON, YAML, or properties format). Spark rewrites the `conf/log4j.properties.template` which is included in Spark distribution, to `conf/log4j2.properties.template` with log4j2 properties format.
6060

61+
- Since Spark 3.3.3, `spark.submit.proxyUser.allowCustomClasspathInClusterMode` allows users to disable custom class path in cluster mode by proxy users. It still defaults to `true` to maintain backward compatibility.
62+
6163
## Upgrading from Core 3.1 to 3.2
6264

6365
- Since Spark 3.2, `spark.scheduler.allocation.file` supports read remote file using hadoop filesystem which means if the path has no scheme Spark will respect hadoop configuration to read it. To restore the behavior before Spark 3.2, you can specify the local scheme for `spark.scheduler.allocation.file` e.g. `file:///path/to/file`.

docs/sql-data-sources-hive-tables.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ The following options can be used to configure the version of Hive that is used
127127
<tr><th>Property Name</th><th>Default</th><th>Meaning</th><th>Since Version</th></tr>
128128
<tr>
129129
<td><code>spark.sql.hive.metastore.version</code></td>
130-
<td><code>2.3.9</code></td>
130+
<td><code>2.3.10</code></td>
131131
<td>
132132
Version of the Hive metastore. Available
133-
options are <code>0.12.0</code> through <code>2.3.9</code> and <code>3.0.0</code> through <code>3.1.2</code>.
133+
options are <code>0.12.0</code> through <code>2.3.10</code> and <code>3.0.0</code> through <code>3.1.2</code>.
134134
</td>
135135
<td>1.4.0</td>
136136
</tr>

docs/sql-migration-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ Python UDF registration is unchanged.
991991
Spark SQL is designed to be compatible with the Hive Metastore, SerDes and UDFs.
992992
Currently, Hive SerDes and UDFs are based on built-in Hive,
993993
and Spark SQL can be connected to different versions of Hive Metastore
994-
(from 0.12.0 to 2.3.9 and 3.0.0 to 3.1.2. Also see [Interacting with Different Versions of Hive Metastore](sql-data-sources-hive-tables.html#interacting-with-different-versions-of-hive-metastore)).
994+
(from 0.12.0 to 2.3.10 and 3.0.0 to 3.1.2. Also see [Interacting with Different Versions of Hive Metastore](sql-data-sources-hive-tables.html#interacting-with-different-versions-of-hive-metastore)).
995995

996996
#### Deploying in Existing Hive Warehouses
997997
{:.no_toc}

external/kafka-0-10-assembly/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@
5454
<artifactId>commons-codec</artifactId>
5555
<scope>provided</scope>
5656
</dependency>
57-
<dependency>
58-
<groupId>commons-lang</groupId>
59-
<artifactId>commons-lang</artifactId>
60-
<scope>provided</scope>
61-
</dependency>
6257
<dependency>
6358
<groupId>com.google.protobuf</groupId>
6459
<artifactId>protobuf-java</artifactId>

hadoop-cloud/pom.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,41 @@
274274
<groupId>org.jacoco</groupId>
275275
<artifactId>org.jacoco.agent</artifactId>
276276
</exclusion>
277+
<!--
278+
HADOOP-19224 / SPARK-48867: com.huaweicloud:esdk-obs-java:jar:3.20.4.2 is
279+
vulnerable due to okhttp 3.x (CVE-2023-0833, CVE-2021-0341),
280+
it has to be upgraded to 3.24.3 which depends on okhttp 4.12.0
281+
-->
282+
<exclusion>
283+
<groupId>com.huaweicloud</groupId>
284+
<artifactId>esdk-obs-java</artifactId>
285+
</exclusion>
286+
</exclusions>
287+
</dependency>
288+
<dependency>
289+
<groupId>com.huaweicloud</groupId>
290+
<artifactId>esdk-obs-java</artifactId>
291+
<version>${esdk.obs.java.version}</version>
292+
<exclusions>
293+
<exclusion>
294+
<groupId>org.jetbrains.kotlin</groupId>
295+
<artifactId>kotlin-stdlib-jdk8</artifactId>
296+
</exclusion>
297+
<exclusion>
298+
<groupId>org.jetbrains.kotlin</groupId>
299+
<artifactId>kotlin-stdlib</artifactId>
300+
</exclusion>
301+
</exclusions>
302+
</dependency>
303+
<dependency>
304+
<groupId>org.jetbrains.kotlin</groupId>
305+
<artifactId>kotlin-stdlib</artifactId>
306+
<version>${kotlin-stdlib.version}</version>
307+
<exclusions>
308+
<exclusion>
309+
<groupId>org.jetbrains</groupId>
310+
<artifactId>annotations</artifactId>
311+
</exclusion>
277312
</exclusions>
278313
</dependency>
279314
<!--

0 commit comments

Comments
 (0)