From 6ccf39a975e07784fa8549cdbd170b07df0c45d4 Mon Sep 17 00:00:00 2001
From: Sergey Chernov <sergey.chernov@clickhouse.com>
Date: Tue, 6 Jan 2026 15:32:25 -0800
Subject: [PATCH 1/2] upgraded lz4 version

---
 clickhouse-data/pom.xml                             |  2 +-
 clickhouse-http-client/pom.xml                      | 13 +++++++------
 clickhouse-jdbc/pom.xml                             |  2 +-
 clickhouse-r2dbc/pom.xml                            |  2 +-
 client-v2/pom.xml                                   |  2 +-
 .../java/com/clickhouse/client/ClientTests.java     |  2 +-
 pom.xml                                             | 10 ++--------
 7 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/clickhouse-data/pom.xml b/clickhouse-data/pom.xml
index c378760f2..9fa5c1173 100644
--- a/clickhouse-data/pom.xml
+++ b/clickhouse-data/pom.xml
@@ -67,7 +67,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.lz4</groupId>
+            <groupId>at.yawk.lz4</groupId>
             <artifactId>lz4-java</artifactId>
             <optional>true</optional>
         </dependency>
diff --git a/clickhouse-http-client/pom.xml b/clickhouse-http-client/pom.xml
index 6dc2844c0..2be719d36 100644
--- a/clickhouse-http-client/pom.xml
+++ b/clickhouse-http-client/pom.xml
@@ -43,11 +43,6 @@
             <artifactId>dec</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.lz4</groupId>
-            <artifactId>lz4-pure-java</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.tukaani</groupId>
             <artifactId>xz</artifactId>
@@ -95,6 +90,12 @@
             <version>3.13.0</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>at.yawk.lz4</groupId>
+            <artifactId>lz4-java</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -119,7 +120,7 @@
                                 <includes>
                                     <include>com.clickhouse:clickhouse-data</include>
                                     <include>com.clickhouse:clickhouse-client</include>
-                                    <include>org.lz4:lz4-pure-java</include>
+                                    <include>at.yawk.lz4:lz4-java</include>
                                 </includes>
                             </artifactSet>
                             <relocations>
diff --git a/clickhouse-jdbc/pom.xml b/clickhouse-jdbc/pom.xml
index f4c53dc46..eca3f043c 100644
--- a/clickhouse-jdbc/pom.xml
+++ b/clickhouse-jdbc/pom.xml
@@ -84,7 +84,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.lz4</groupId>
+            <groupId>at.yawk.lz4</groupId>
             <artifactId>lz4-java</artifactId>
             <version>${lz4.version}</version>
         </dependency>
diff --git a/clickhouse-r2dbc/pom.xml b/clickhouse-r2dbc/pom.xml
index 8cde41323..13c4c62f9 100644
--- a/clickhouse-r2dbc/pom.xml
+++ b/clickhouse-r2dbc/pom.xml
@@ -60,7 +60,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.lz4</groupId>
+            <groupId>at.yawk.lz4</groupId>
             <artifactId>lz4-java</artifactId>
         </dependency>
 
diff --git a/client-v2/pom.xml b/client-v2/pom.xml
index 2908cadfb..0c6409cdf 100644
--- a/client-v2/pom.xml
+++ b/client-v2/pom.xml
@@ -53,7 +53,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.lz4</groupId>
+            <groupId>at.yawk.lz4</groupId>
             <artifactId>lz4-java</artifactId>
             <version>${lz4.version}</version>
         </dependency>
diff --git a/client-v2/src/test/java/com/clickhouse/client/ClientTests.java b/client-v2/src/test/java/com/clickhouse/client/ClientTests.java
index d78953cac..310a4edcf 100644
--- a/client-v2/src/test/java/com/clickhouse/client/ClientTests.java
+++ b/client-v2/src/test/java/com/clickhouse/client/ClientTests.java
@@ -206,7 +206,7 @@ public void testLoadingServerContext() throws Exception {
     @Test(groups = {"integration"})
     public void testDisableNative() {
         try (Client client = newClient().disableNativeCompression(true).build()) {
-            Assert.assertTrue(client.toString().indexOf("JavaUnsafe") != -1);
+            Assert.assertTrue(client.toString().contains("JavaSafe") || client.toString().contains("JavaUnsafe"));
         }
     }
 
diff --git a/pom.xml b/pom.xml
index 74eabf15e..d5a1a8314 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
         <jctools.version>4.0.1</jctools.version>
         <opencensus.version>0.31.1</opencensus.version>
         <protobuf.version>3.23.4</protobuf.version>
-        <lz4.version>1.8.0</lz4.version>
+        <lz4.version>1.10.2</lz4.version>
         <msgpack.version>0.9.5</msgpack.version>
         <roaring-bitmap.version>0.9.47</roaring-bitmap.version>
         <slf4j.version>2.0.7</slf4j.version>
@@ -189,17 +189,11 @@
                 <artifactId>commons-lang3</artifactId>
                 <version>${commons-lang3.version}</version>
             </dependency>
-
             <dependency>
-                <groupId>org.lz4</groupId>
+                <groupId>at.yawk.lz4</groupId>
                 <artifactId>lz4-java</artifactId>
                 <version>${lz4.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.lz4</groupId>
-                <artifactId>lz4-pure-java</artifactId>
-                <version>${lz4.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm</artifactId>

From bafb3c50e272e02350b8726129765bf73aaca908 Mon Sep 17 00:00:00 2001
From: Sergey Chernov <sergey.chernov@clickhouse.com>
Date: Wed, 7 Jan 2026 14:17:32 -0800
Subject: [PATCH 2/2] Made lz4 direct optional dep. for clickhouse http client

---
 clickhouse-http-client/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clickhouse-http-client/pom.xml b/clickhouse-http-client/pom.xml
index 2be719d36..2d2accbf2 100644
--- a/clickhouse-http-client/pom.xml
+++ b/clickhouse-http-client/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>at.yawk.lz4</groupId>
             <artifactId>lz4-java</artifactId>
-            <scope>test</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>