Skip to content

Commit b02ae03

Browse files
HTHouJackieTien97
authored andcommitted
Switch to at.yawk.lz4:lz4-java:1.10.0 (#16871)
(cherry picked from commit 2db7b21)
1 parent 78a01cf commit b02ae03

File tree

5 files changed

+32
-6
lines changed

5 files changed

+32
-6
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
com.nimbusds:content-type:2.2
@@ -223,7 +223,7 @@ com.fasterxml.jackson.core:jackson-annotations:2.16.2
223223
com.fasterxml.jackson.core:jackson-core:2.16.2
224224
com.fasterxml.jackson.core:jackson-databind:2.16.2
225225
jakarta.inject:jakarta.inject:2.6.1
226-
org.lz4:lz4-java:1.8.0
226+
at.yawk.lz4:lz4-java:1.10.0
227227
com.github.stephenc.jcip:jcip-annotations:1.0-1
228228
com.github.ben-manes.caffeine:caffeine:2.9.3
229229
org.eclipse.jetty:jetty-http:9.4.57.v20241219

dependencies.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"dependencies": [
3+
"at.yawk.lz4:lz4-java",
34
"cglib:cglib",
45
"ch.qos.logback:logback-classic",
56
"ch.qos.logback:logback-core",
@@ -155,7 +156,6 @@
155156
"org.jline:jline",
156157
"org.jvnet.mimepull:mimepull",
157158
"org.latencyutils:LatencyUtils",
158-
"org.lz4:lz4-java",
159159
"org.ops4j.pax.jdbc:pax-jdbc-common",
160160
"org.osgi:osgi.cmpn",
161161
"org.osgi:osgi.core",

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@
289289
<artifactId>Java-WebSocket</artifactId>
290290
</dependency>
291291
<dependency>
292-
<groupId>org.lz4</groupId>
292+
<groupId>at.yawk.lz4</groupId>
293293
<artifactId>lz4-java</artifactId>
294294
</dependency>
295295
<dependency>

pom.xml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<junit.version>4.13.2</junit.version>
116116
<!-- This was the last version to support Java 8 -->
117117
<logback.version>1.3.16</logback.version>
118-
<lz4-java.version>1.8.0</lz4-java.version>
118+
<lz4-java.version>1.10.0</lz4-java.version>
119119
<maven.assembly.version>3.6.0</maven.assembly.version>
120120
<maven.compiler.source>1.8</maven.compiler.source>
121121
<maven.compiler.target>1.8</maven.compiler.target>
@@ -320,6 +320,18 @@
320320
<artifactId>bcpkix-jdk18on</artifactId>
321321
<version>${bouncycastle.version}</version>
322322
</dependency>
323+
<dependency>
324+
<groupId>org.apache.tsfile</groupId>
325+
<artifactId>tsfile</artifactId>
326+
<version>${tsfile.version}</version>
327+
<!-- Once tsfile switch to at.yawk.lz4:lz4-java, remove the following part -->
328+
<exclusions>
329+
<exclusion>
330+
<groupId>org.lz4</groupId>
331+
<artifactId>lz4-java</artifactId>
332+
</exclusion>
333+
</exclusions>
334+
</dependency>
323335
<dependency>
324336
<groupId>org.apache.ratis</groupId>
325337
<artifactId>ratis-server</artifactId>
@@ -492,7 +504,7 @@
492504
<version>${zstd-jni.version}</version>
493505
</dependency>
494506
<dependency>
495-
<groupId>org.lz4</groupId>
507+
<groupId>at.yawk.lz4</groupId>
496508
<artifactId>lz4-java</artifactId>
497509
<version>${lz4-java.version}</version>
498510
</dependency>

0 commit comments

Comments
 (0)