Skip to content

Commit 595cb29

Browse files
committed
Update LZ4 and Netty dependencies for CVE response
The primary goal here is to address CVE-2025-12183. Netty includes a dependency on vulnerable versions of lz4-java, so update to a fixed version of Netty as well. On the C* server side, we opted to move to the new community fork of lz4-java, so match that decision here (CASSANDRA-21052). patch by Abe Ratnofsky; reviewed by Francisco Guerrero for CASSJAVA-113
1 parent e762df8 commit 595cb29

12 files changed

Lines changed: 16 additions & 16 deletions

File tree

NOTICE_binary.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ and decompression library written by Adrien Grand. It can be obtained at:
100100
* LICENSE:
101101
* license/LICENSE.lz4.txt (Apache License 2.0)
102102
* HOMEPAGE:
103-
* https://github.com/jpountz/lz4-java
103+
* https://github.com/yawkat/lz4-java
104104

105105
This product optionally depends on 'lzma-java', a LZMA Java compression
106106
and decompression library, which can be obtained at:

core-shaded/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<optional>true</optional>
7575
</dependency>
7676
<dependency>
77-
<groupId>org.lz4</groupId>
77+
<groupId>at.yawk.lz4</groupId>
7878
<artifactId>lz4-java</artifactId>
7979
<optional>true</optional>
8080
</dependency>

core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<optional>true</optional>
7474
</dependency>
7575
<dependency>
76-
<groupId>org.lz4</groupId>
76+
<groupId>at.yawk.lz4</groupId>
7777
<artifactId>lz4-java</artifactId>
7878
<optional>true</optional>
7979
</dependency>

core/src/main/resources/reference.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ datastax-java-driver {
11141114
# The name of the algorithm used to compress protocol frames.
11151115
#
11161116
# The possible values are:
1117-
# - lz4: requires net.jpountz.lz4:lz4 in the classpath.
1117+
# - lz4: requires at.yawk.lz4:lz4-java in the classpath.
11181118
# - snappy: requires org.xerial.snappy:snappy-java in the classpath.
11191119
# - the string "none" to indicate no compression (this is functionally equivalent to omitting
11201120
# the option).

core/src/test/java/com/datastax/dse/driver/internal/core/insights/PlatformInfoFinderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void should_find_dependencies_from_file() {
7777
"com.fasterxml.jackson.core:jackson-annotations", withUnverifiedRuntimeVersion("2.8.11"));
7878
expected.put("com.fasterxml.jackson.core:jackson-core", withUnverifiedRuntimeVersion("2.8.11"));
7979
expected.put("io.netty:netty-handler", withUnverifiedRuntimeVersion("4.0.56.Final"));
80-
expected.put("org.lz4:lz4-java", withUnverifiedRuntimeVersionOptional("1.4.1"));
80+
expected.put("at.yawk.lz4:lz4-java", withUnverifiedRuntimeVersionOptional("1.10.1"));
8181
expected.put("org.hdrhistogram:HdrHistogram", withUnverifiedRuntimeVersionOptional("2.1.10"));
8282
expected.put("com.github.jnr:jffi", withUnverifiedRuntimeVersion("1.2.16"));
8383
expected.put("io.netty:netty-buffer", withUnverifiedRuntimeVersion("4.0.56.Final"));

core/src/test/resources/insights/test-dependencies.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The following files have been resolved:
1717
com.fasterxml.jackson.core:jackson-core:jar:2.8.11:compile
1818
org.hdrhistogram:HdrHistogram:jar:2.1.10:compile (optional)
1919
org.ow2.asm:asm-tree:jar:5.0.3:compile
20-
org.lz4:lz4-java:jar:1.4.1:compile (optional)
20+
at.yawk.lz4:lz4-java:jar:1.10.1:compile (optional)
2121
io.netty:netty-transport:jar:4.0.56.Final:compile
2222
io.dropwizard.metrics:metrics-core:jar:3.2.2:compile
2323
io.netty:netty-common:jar:4.0.56.Final:compile

integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<scope>test</scope>
130130
</dependency>
131131
<dependency>
132-
<groupId>org.lz4</groupId>
132+
<groupId>at.yawk.lz4</groupId>
133133
<artifactId>lz4-java</artifactId>
134134
<scope>test</scope>
135135
</dependency>

manual/core/compression/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ datastax-java-driver {
4646

4747
Compression must be set before opening a session, it cannot be changed at runtime.
4848

49-
Two algorithms are supported out of the box: [LZ4](https://github.com/jpountz/lz4-java) and
49+
Two algorithms are supported out of the box: [LZ4](https://github.com/yawkat/lz4-java) and
5050
[Snappy](http://google.github.io/snappy/). The LZ4 implementation is a good first choice; it offers
5151
fallback implementations in case native libraries fail to load and
5252
[benchmarks](http://java-performance.info/performance-general-compression/) suggest that it offers
@@ -63,9 +63,9 @@ Dependency:
6363

6464
```xml
6565
<dependency>
66-
<groupId>org.lz4</groupId>
66+
<groupId>at.yawk.lz4</groupId>
6767
<artifactId>lz4-java</artifactId>
68-
<version>1.4.1</version>
68+
<version>1.10.1</version>
6969
</dependency>
7070
```
7171

manual/core/integration/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ are not available on your platform, you can exclude the following dependency:
416416

417417
#### Compression libraries
418418

419-
The driver supports compression with either [LZ4](https://github.com/jpountz/lz4-java) or
419+
The driver supports compression with either [LZ4](https://github.com/yawkat/lz4-java) or
420420
[Snappy](http://google.github.io/snappy/).
421421

422422
These dependencies are optional; you have to add them explicitly in your application in order to

osgi-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<artifactId>snappy-java</artifactId>
8080
</dependency>
8181
<dependency>
82-
<groupId>org.lz4</groupId>
82+
<groupId>at.yawk.lz4</groupId>
8383
<artifactId>lz4-java</artifactId>
8484
</dependency>
8585
<dependency>

0 commit comments

Comments
 (0)