Skip to content

Commit 7e5cc6e

Browse files
committed
Switch to at.yawk.lz4:lz4-java:1.10.0 (#16871)
1 parent 20e7241 commit 7e5cc6e

File tree

4 files changed

+34
-4
lines changed

4 files changed

+34
-4
lines changed

LICENSE-binary

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ conditions of the following licenses.
213213
The binary distribution of this product bundles these dependencies under the
214214
following license. See licenses/ for text of these licenses.
215215

216-
Apache Software Foundation License 2.0
216+
Apache License 2.0
217217
--------------------------------------
218218
commons-cli:commons-cli:1.5.0
219219
commons-codec:commons-codec:1.16.1
@@ -227,7 +227,7 @@ com.fasterxml.jackson.core:jackson-annotations:2.15.4
227227
com.fasterxml.jackson.core:jackson-core:2.15.4
228228
com.fasterxml.jackson.core:jackson-databind:2.15.4
229229
jakarta.inject:jakarta.inject:2.6.1
230-
org.lz4:lz4-java:1.8.0
230+
at.yawk.lz4:lz4-java:1.10.0
231231
com.github.stephenc.jcip:jcip-annotations:1.0-1
232232
com.github.ben-manes.caffeine:caffeine:2.9.3
233233
org.eclipse.jetty:jetty-http:9.4.56.v20240826

iotdb-client/session/pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@
5959
<artifactId>tsfile</artifactId>
6060
<version>${tsfile.version}</version>
6161
</dependency>
62+
<dependency>
63+
<groupId>at.yawk.lz4</groupId>
64+
<artifactId>lz4-java</artifactId>
65+
<scope>runtime</scope>
66+
</dependency>
6267
<dependency>
6368
<groupId>org.apache.iotdb</groupId>
6469
<artifactId>iotdb-thrift</artifactId>
@@ -121,6 +126,15 @@
121126
</execution>
122127
</executions>
123128
</plugin>
129+
<plugin>
130+
<groupId>org.apache.maven.plugins</groupId>
131+
<artifactId>maven-dependency-plugin</artifactId>
132+
<configuration>
133+
<usedDependencies>
134+
<usedDependency>at.yawk.lz4:lz4-java</usedDependency>
135+
</usedDependencies>
136+
</configuration>
137+
</plugin>
124138
</plugins>
125139
</build>
126140
<profiles>

iotdb-core/datanode/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,10 @@
303303
<groupId>org.java-websocket</groupId>
304304
<artifactId>Java-WebSocket</artifactId>
305305
</dependency>
306+
<dependency>
307+
<groupId>at.yawk.lz4</groupId>
308+
<artifactId>lz4-java</artifactId>
309+
</dependency>
306310
<dependency>
307311
<groupId>junit</groupId>
308312
<artifactId>junit</artifactId>

pom.xml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<junit.version>4.13.2</junit.version>
119119
<!-- This was the last version to support Java 8 -->
120120
<logback.version>1.3.16</logback.version>
121-
<lz4-java.version>1.8.0</lz4-java.version>
121+
<lz4-java.version>1.10.0</lz4-java.version>
122122
<maven.assembly.version>3.6.0</maven.assembly.version>
123123
<maven.compiler.source>1.8</maven.compiler.source>
124124
<maven.compiler.target>1.8</maven.compiler.target>
@@ -318,6 +318,18 @@
318318
<artifactId>commons-io</artifactId>
319319
<version>${commons-io.version}</version>
320320
</dependency>
321+
<dependency>
322+
<groupId>org.apache.tsfile</groupId>
323+
<artifactId>tsfile</artifactId>
324+
<version>${tsfile.version}</version>
325+
<!-- Once tsfile switch to at.yawk.lz4:lz4-java, remove the following part -->
326+
<exclusions>
327+
<exclusion>
328+
<groupId>org.lz4</groupId>
329+
<artifactId>lz4-java</artifactId>
330+
</exclusion>
331+
</exclusions>
332+
</dependency>
321333
<dependency>
322334
<groupId>org.apache.ratis</groupId>
323335
<artifactId>ratis-server</artifactId>
@@ -509,7 +521,7 @@
509521
<version>${zstd-jni.version}</version>
510522
</dependency>
511523
<dependency>
512-
<groupId>org.lz4</groupId>
524+
<groupId>at.yawk.lz4</groupId>
513525
<artifactId>lz4-java</artifactId>
514526
<version>${lz4-java.version}</version>
515527
</dependency>

0 commit comments

Comments
 (0)