Skip to content

Commit 1947646

Browse files
dongjoon-hyunLuciferYang
authored andcommitted
[SPARK-49234][BUILD] Upgrade xz to 1.10
### What changes were proposed in this pull request? This PR aims to upgrade `xz` to `1.10` independently from Apache Avro change. ### Why are the changes needed? `1.10` is the latest minor version update with new improvements (like `ARM64`, `optimized classes for Java >= 9`) and bug fixes. - https://github.com/tukaani-project/xz-java/blob/master/NEWS.md#110-2024-07-29 Note that the license is also changed from `Public Domain` to `BSD Zero Clause`. > Licensing change: From version 1.10 onwards, XZ for Java is under the BSD Zero Clause License (0BSD). 1.9 and older are in the public domain and obviously remain so; the change only affects the new releases. ### Does this PR introduce _any_ user-facing change? No behavior change. ### How was this patch tested? Pass the CIs. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #47750 from dongjoon-hyun/SPARK-49234. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: yangjie01 <[email protected]>
1 parent 3632732 commit 1947646

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

LICENSE-binary

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,11 @@ Python Software Foundation License
422422
python/pyspark/loose_version.py
423423

424424

425+
BSD 0-Clause
426+
------------
427+
org.tukaani:xz
428+
429+
425430
BSD 2-Clause
426431
------------
427432
com.github.luben:zstd-jni
@@ -520,12 +525,6 @@ org.glassfish.hk2:hk2-locator
520525
org.glassfish.hk2:hk2-utils
521526
org.glassfish.hk2:osgi-resource-locator
522527

523-
524-
Public Domain
525-
-------------
526-
org.tukaani:xz
527-
528-
529528
Creative Commons CC0 1.0 Universal Public Domain Dedication
530529
-----------------------------------------------------------
531530
(see LICENSE-CC0.txt)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar
271271
wildfly-openssl/1.1.3.Final//wildfly-openssl-1.1.3.Final.jar
272272
xbean-asm9-shaded/4.25//xbean-asm9-shaded-4.25.jar
273273
xmlschema-core/2.3.1//xmlschema-core-2.3.1.jar
274-
xz/1.9//xz-1.9.jar
274+
xz/1.10//xz-1.10.jar
275275
zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
276276
zookeeper-jute/3.9.2//zookeeper-jute-3.9.2.jar
277277
zookeeper/3.9.2//zookeeper-3.9.2.jar

licenses/LICENSE-xz.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Permission to use, copy, modify, and/or distribute this
2+
software for any purpose with or without fee is hereby granted.
3+
4+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
5+
WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
6+
WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
7+
THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
8+
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
9+
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
10+
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
11+
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1608,7 +1608,7 @@
16081608
<dependency>
16091609
<groupId>org.tukaani</groupId>
16101610
<artifactId>xz</artifactId>
1611-
<version>1.9</version>
1611+
<version>1.10</version>
16121612
</dependency>
16131613
<!-- See SPARK-23654 for info on this dependency;
16141614
It is used to keep javax.activation at v1.1.1 after dropping

0 commit comments

Comments
 (0)