This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 2db7b21bce1 Switch to at.yawk.lz4:lz4-java:1.10.0 (#16871)
2db7b21bce1 is described below
commit 2db7b21bce1f50eb4909d47b7fc4c9ca02dea7cf
Author: Haonan <[email protected]>
AuthorDate: Fri Dec 5 18:42:33 2025 +0800
Switch to at.yawk.lz4:lz4-java:1.10.0 (#16871)
---
LICENSE-binary | 4 ++--
dependencies.json | 2 +-
iotdb-client/session/pom.xml | 14 ++++++++++++++
iotdb-core/datanode/pom.xml | 2 +-
pom.xml | 16 ++++++++++++++--
5 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index aaa7a93867f..a5c3904478d 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -213,7 +213,7 @@ conditions of the following licenses.
The binary distribution of this product bundles these dependencies under the
following license. See licenses/ for text of these licenses.
-Apache Software Foundation License 2.0
+Apache License 2.0
--------------------------------------
commons-cli:commons-cli:1.5.0
com.nimbusds:content-type:2.2
@@ -223,7 +223,7 @@ com.fasterxml.jackson.core:jackson-annotations:2.16.2
com.fasterxml.jackson.core:jackson-core:2.16.2
com.fasterxml.jackson.core:jackson-databind:2.16.2
jakarta.inject:jakarta.inject:2.6.1
-org.lz4:lz4-java:1.8.0
+at.yawk.lz4:lz4-java:1.10.0
com.github.stephenc.jcip:jcip-annotations:1.0-1
com.github.ben-manes.caffeine:caffeine:2.9.3
org.eclipse.jetty:jetty-http:9.4.57.v20241219
diff --git a/dependencies.json b/dependencies.json
index 6553a8dfe3e..dd439e372d4 100644
--- a/dependencies.json
+++ b/dependencies.json
@@ -1,5 +1,6 @@
{
"dependencies": [
+ "at.yawk.lz4:lz4-java",
"cglib:cglib",
"ch.qos.logback:logback-classic",
"ch.qos.logback:logback-core",
@@ -155,7 +156,6 @@
"org.jline:jline",
"org.jvnet.mimepull:mimepull",
"org.latencyutils:LatencyUtils",
- "org.lz4:lz4-java",
"org.ops4j.pax.jdbc:pax-jdbc-common",
"org.osgi:osgi.cmpn",
"org.osgi:osgi.core",
diff --git a/iotdb-client/session/pom.xml b/iotdb-client/session/pom.xml
index 733ca0c2bb5..449081ad360 100644
--- a/iotdb-client/session/pom.xml
+++ b/iotdb-client/session/pom.xml
@@ -59,6 +59,11 @@
<artifactId>tsfile</artifactId>
<version>${tsfile.version}</version>
</dependency>
+ <dependency>
+ <groupId>at.yawk.lz4</groupId>
+ <artifactId>lz4-java</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-thrift</artifactId>
@@ -121,6 +126,15 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <usedDependencies>
+ <usedDependency>at.yawk.lz4:lz4-java</usedDependency>
+ </usedDependencies>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml
index 210a08d6366..80bebe90f77 100644
--- a/iotdb-core/datanode/pom.xml
+++ b/iotdb-core/datanode/pom.xml
@@ -289,7 +289,7 @@
<artifactId>Java-WebSocket</artifactId>
</dependency>
<dependency>
- <groupId>org.lz4</groupId>
+ <groupId>at.yawk.lz4</groupId>
<artifactId>lz4-java</artifactId>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 8942576d982..eecb8978762 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
<junit.version>4.13.2</junit.version>
<!-- This was the last version to support Java 8 -->
<logback.version>1.3.16</logback.version>
- <lz4-java.version>1.8.0</lz4-java.version>
+ <lz4-java.version>1.10.0</lz4-java.version>
<maven.assembly.version>3.6.0</maven.assembly.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
@@ -320,6 +320,18 @@
<artifactId>bcpkix-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tsfile</groupId>
+ <artifactId>tsfile</artifactId>
+ <version>${tsfile.version}</version>
+ <!-- Once tsfile switch to at.yawk.lz4:lz4-java, remove the
following part -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.lz4</groupId>
+ <artifactId>lz4-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-server</artifactId>
@@ -492,7 +504,7 @@
<version>${zstd-jni.version}</version>
</dependency>
<dependency>
- <groupId>org.lz4</groupId>
+ <groupId>at.yawk.lz4</groupId>
<artifactId>lz4-java</artifactId>
<version>${lz4-java.version}</version>
</dependency>
