diff --git a/LICENSE-binary b/LICENSE-binary index aaa7a93867fc9..a5c3904478d5e 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 6553a8dfe3e85..dd439e372d405 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 733ca0c2bb596..449081ad36081 100644 --- a/iotdb-client/session/pom.xml +++ b/iotdb-client/session/pom.xml @@ -59,6 +59,11 @@ tsfile ${tsfile.version} + + at.yawk.lz4 + lz4-java + runtime + org.apache.iotdb iotdb-thrift @@ -121,6 +126,15 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + at.yawk.lz4:lz4-java + + + diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml index 210a08d636634..80bebe90f779c 100644 --- a/iotdb-core/datanode/pom.xml +++ b/iotdb-core/datanode/pom.xml @@ -289,7 +289,7 @@ Java-WebSocket - org.lz4 + at.yawk.lz4 lz4-java diff --git a/pom.xml b/pom.xml index 8942576d982b4..eecb8978762c8 100644 --- a/pom.xml +++ b/pom.xml @@ -115,7 +115,7 @@ 4.13.2 1.3.16 - 1.8.0 + 1.10.0 3.6.0 1.8 1.8 @@ -320,6 +320,18 @@ bcpkix-jdk18on ${bouncycastle.version} + + org.apache.tsfile + tsfile + ${tsfile.version} + + + + org.lz4 + lz4-java + + + org.apache.ratis ratis-server @@ -492,7 +504,7 @@ ${zstd-jni.version} - org.lz4 + at.yawk.lz4 lz4-java ${lz4-java.version}