Skip to content

Commit b01dd4c

Browse files
LuciferYangsrowen
authored andcommitted
[SPARK-41031][BUILD] Upgrade xz to 1.9 for avro 1.11.1
This pr aims to upgrade `xz` to 1.9 for `avro` 1.11.1. Spark depend on `avro` 1.11.1 and `avro` 1.11.1 use `xz` as an optional dependency, we need to manually check `xz` version when upgrading `avro`. https://github.com/apache/avro/blob/3a9e5a789b5165e0c8c4da799c387fdf84bfb75e/lang/java/pom.xml#L59 https://github.com/apache/avro/blob/3a9e5a789b5165e0c8c4da799c387fdf84bfb75e/lang/java/avro/pom.xml#L238-L242 The release notes as follows: - https://git.tukaani.org/?p=xz-java.git;a=blob;f=NEWS;hb=HEAD No Pass Github Actions Closes apache#38538 from LuciferYang/SPARK-41031. Authored-by: yangjie01 <[email protected]> Signed-off-by: Sean Owen <[email protected]> (cherry picked from commit e9503c8) Signed-off-by: Sean Owen <[email protected]>
1 parent 797e2d9 commit b01dd4c

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
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
@@ -263,7 +263,7 @@ xbean-asm9-shaded/4.20//xbean-asm9-shaded-4.20.jar
263263
xercesImpl/2.12.2//xercesImpl-2.12.2.jar
264264
xml-apis/1.4.01//xml-apis-1.4.01.jar
265265
xmlenc/0.52//xmlenc-0.52.jar
266-
xz/1.8//xz-1.8.jar
266+
xz/1.9//xz-1.9.jar
267267
zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
268268
zookeeper-jute/3.6.2//zookeeper-jute-3.6.2.jar
269269
zookeeper/3.6.2//zookeeper-3.6.2.jar

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar
250250
velocity/1.5//velocity-1.5.jar
251251
wildfly-openssl/1.0.7.Final//wildfly-openssl-1.0.7.Final.jar
252252
xbean-asm9-shaded/4.20//xbean-asm9-shaded-4.20.jar
253-
xz/1.8//xz-1.8.jar
253+
xz/1.9//xz-1.9.jar
254254
zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
255255
zookeeper-jute/3.6.2//zookeeper-jute-3.6.2.jar
256256
zookeeper/3.6.2//zookeeper-3.6.2.jar

pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1440,10 +1440,14 @@
14401440
</exclusion>
14411441
</exclusions>
14421442
</dependency>
1443+
<!--
1444+
SPARK-41031: `xz` is marked as optional in the dependency tree of `avro`,
1445+
we need to manually check `xz` version when upgrading `avro`.
1446+
-->
14431447
<dependency>
14441448
<groupId>org.tukaani</groupId>
14451449
<artifactId>xz</artifactId>
1446-
<version>1.8</version>
1450+
<version>1.9</version>
14471451
</dependency>
14481452
<!-- See SPARK-23654 for info on this dependency;
14491453
It is used to keep javax.activation at v1.1.1 after dropping

0 commit comments

Comments
 (0)