Skip to content

Commit bcd05a2

Browse files
roczeiyaooqinn
authored andcommitted
[SPARK-45590][BUILD][3.4] Upgrade okio to 1.17.6 from 1.15.0
Backport #47758 to 3.4 ### What changes were proposed in this pull request? This PR aims to upgrade `okio` from 1.15.0 to 1.17.6. ### Why are the changes needed? Okio 1.15.0 is vulnerable due to CVE-2023-3635, details: https://nvd.nist.gov/vuln/detail/CVE-2023-3635 Previous attempts to fix this security issue: Update okio to version 1.17.6 #5587: fabric8io/kubernetes-client#5587 Followup to Update okio to version 1.17.6 #5935: fabric8io/kubernetes-client#5935 Unfortunately it is still using 1.15.0: https://github.com/apache/spark/blob/v4.0.0-preview1/dev/deps/spark-deps-hadoop-3-hive-2.3#L227 https://github.com/apache/spark/blob/v3.5.2/dev/deps/spark-deps-hadoop-3-hive-2.3#L210 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass the CIs. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #47770 from roczei/SPARK-45590-branch-3.4. Authored-by: Gabor Roczei <[email protected]> Signed-off-by: Kent Yao <[email protected]>
1 parent 391e593 commit bcd05a2

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ netty-transport-native-unix-common/4.1.87.Final//netty-transport-native-unix-com
220220
netty-transport/4.1.87.Final//netty-transport-4.1.87.Final.jar
221221
objenesis/3.2//objenesis-3.2.jar
222222
okhttp/3.12.12//okhttp-3.12.12.jar
223-
okio/1.15.0//okio-1.15.0.jar
223+
okio/1.17.6//okio-1.17.6.jar
224224
opencsv/2.3//opencsv-2.3.jar
225225
orc-core/1.8.7/shaded-protobuf/orc-core-1.8.7-shaded-protobuf.jar
226226
orc-mapreduce/1.8.7/shaded-protobuf/orc-mapreduce-1.8.7-shaded-protobuf.jar

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ netty-transport-native-unix-common/4.1.87.Final//netty-transport-native-unix-com
204204
netty-transport/4.1.87.Final//netty-transport-4.1.87.Final.jar
205205
objenesis/3.2//objenesis-3.2.jar
206206
okhttp/3.12.12//okhttp-3.12.12.jar
207-
okio/1.15.0//okio-1.15.0.jar
207+
okio/1.17.6//okio-1.17.6.jar
208208
opencsv/2.3//opencsv-2.3.jar
209209
opentracing-api/0.33.0//opentracing-api-0.33.0.jar
210210
opentracing-noop/0.33.0//opentracing-noop-0.33.0.jar

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@
227227
<!-- org.fusesource.leveldbjni will be used except on arm64 platform. -->
228228
<leveldbjni.group>org.fusesource.leveldbjni</leveldbjni.group>
229229
<kubernetes-client.version>6.4.1</kubernetes-client.version>
230+
<okio.version>1.17.6</okio.version>
230231

231232
<test.java.home>${java.home}</test.java.home>
232233

@@ -2790,6 +2791,11 @@
27902791
<artifactId>arpack</artifactId>
27912792
<version>${netlib.ludovic.dev.version}</version>
27922793
</dependency>
2794+
<dependency>
2795+
<groupId>com.squareup.okio</groupId>
2796+
<artifactId>okio</artifactId>
2797+
<version>${okio.version}</version>
2798+
</dependency>
27932799
</dependencies>
27942800
</dependencyManagement>
27952801

0 commit comments

Comments
 (0)