Skip to content

Commit

Permalink
[SPARK-49234][BUILD] Upgrade xz to 1.10
Browse files Browse the repository at this point in the history
### 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 apache#47750 from dongjoon-hyun/SPARK-49234.

Authored-by: Dongjoon Hyun <dhyun@apple.com>
Signed-off-by: yangjie01 <yangjie01@baidu.com>
  • Loading branch information
dongjoon-hyun authored and attilapiros committed Oct 4, 2024
1 parent 2481dd5 commit 20335d6
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 8 deletions.
11 changes: 5 additions & 6 deletions LICENSE-binary
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,11 @@ Python Software Foundation License
python/pyspark/loose_version.py


BSD 0-Clause
------------
org.tukaani:xz


BSD 2-Clause
------------
com.github.luben:zstd-jni
Expand Down Expand Up @@ -520,12 +525,6 @@ org.glassfish.hk2:hk2-locator
org.glassfish.hk2:hk2-utils
org.glassfish.hk2:osgi-resource-locator


Public Domain
-------------
org.tukaani:xz


Creative Commons CC0 1.0 Universal Public Domain Dedication
-----------------------------------------------------------
(see LICENSE-CC0.txt)
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 @@ -271,7 +271,7 @@ univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar
wildfly-openssl/1.1.3.Final//wildfly-openssl-1.1.3.Final.jar
xbean-asm9-shaded/4.25//xbean-asm9-shaded-4.25.jar
xmlschema-core/2.3.1//xmlschema-core-2.3.1.jar
xz/1.9//xz-1.9.jar
xz/1.10//xz-1.10.jar
zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
zookeeper-jute/3.9.2//zookeeper-jute-3.9.2.jar
zookeeper/3.9.2//zookeeper-3.9.2.jar
Expand Down
11 changes: 11 additions & 0 deletions licenses/LICENSE-xz.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Permission to use, copy, modify, and/or distribute this
software for any purpose with or without fee is hereby granted.

THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1608,7 +1608,7 @@
<dependency>
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
<version>1.9</version>
<version>1.10</version>
</dependency>
<!-- See SPARK-23654 for info on this dependency;
It is used to keep javax.activation at v1.1.1 after dropping
Expand Down

0 comments on commit 20335d6

Please sign in to comment.