Skip to content

Commit

Permalink
[SPARK-45590][BUILD][3.4] Upgrade okio to 1.17.6 from 1.15.0
Browse files Browse the repository at this point in the history
Backport apache#47758 to 3.4

This PR aims to upgrade `okio` from 1.15.0 to 1.17.6.

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 apache#5587: fabric8io/kubernetes-client#5587
Followup to Update okio to version 1.17.6 apache#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

No.

Pass the CIs.

No.

Closes apache#47770 from roczei/SPARK-45590-branch-3.4.

Authored-by: Gabor Roczei <roczei@cloudera.com>
Signed-off-by: Kent Yao <yao@apache.org>
  • Loading branch information
roczei authored and viirya committed Aug 17, 2024
1 parent 6be1e19 commit fc59a9a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion dev/deps/spark-deps-hadoop-2-hive-2.3
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ netty-transport-native-unix-common/4.1.87.Final//netty-transport-native-unix-com
netty-transport/4.1.87.Final//netty-transport-4.1.87.Final.jar
objenesis/3.2//objenesis-3.2.jar
okhttp/3.12.12//okhttp-3.12.12.jar
okio/1.15.0//okio-1.15.0.jar
okio/1.17.6//okio-1.17.6.jar
opencsv/2.3//opencsv-2.3.jar
orc-core/1.8.7/shaded-protobuf/orc-core-1.8.7-shaded-protobuf.jar
orc-mapreduce/1.8.7/shaded-protobuf/orc-mapreduce-1.8.7-shaded-protobuf.jar
Expand Down
2 changes: 1 addition & 1 deletion dev/deps/spark-deps-hadoop-3-hive-2.3
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ netty-transport-native-unix-common/4.1.110.Final//netty-transport-native-unix-co
netty-transport/4.1.110.Final//netty-transport-4.1.110.Final.jar
objenesis/3.2//objenesis-3.2.jar
okhttp/3.12.12//okhttp-3.12.12.jar
okio/1.15.0//okio-1.15.0.jar
okio/1.17.6//okio-1.17.6.jar
opencsv/2.3//opencsv-2.3.jar
opentracing-api/0.33.0//opentracing-api-0.33.0.jar
opentracing-noop/0.33.0//opentracing-noop-0.33.0.jar
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@
<!-- org.fusesource.leveldbjni will be used except on arm64 platform. -->
<leveldbjni.group>org.fusesource.leveldbjni</leveldbjni.group>
<kubernetes-client.version>6.13.1</kubernetes-client.version>
<okio.version>1.17.6</okio.version>

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

Expand Down Expand Up @@ -2978,6 +2979,11 @@
<classifier>shadow-tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>${okio.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down

0 comments on commit fc59a9a

Please sign in to comment.