From a74f1bc8541b6ed739816305d4826535708fa221 Mon Sep 17 00:00:00 2001
From: Matthias Keck <mke@scireum.de>
Date: Tue, 15 Oct 2024 13:32:49 +0200
Subject: [PATCH 1/4] Upgrade mariadb driver and test image

Fixes: SE-13995
---
 docker-compose.yml | 2 +-
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4303d9e24..d5a901500 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
     hostname: mongo
 
   mariadb:
-    image: mariadb:11.4.2-noble
+    image: mariadb:11.4.3-noble
     ports:
       - "3306"
     environment:
diff --git a/pom.xml b/pom.xml
index 5d83792ca..5e55c7f64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.4.0</version>
+            <version>3.4.1</version>
         </dependency>
         <dependency>
             <groupId>com.clickhouse</groupId>

From 54cd8c09a44c5c0e222f7073c26e9e19ecd15e5b Mon Sep 17 00:00:00 2001
From: Matthias Keck <mke@scireum.de>
Date: Tue, 15 Oct 2024 13:35:19 +0200
Subject: [PATCH 2/4] Upgrade some 3rd party libs and redis image

Fixes: SE-13995
---
 docker-compose.yml                    |  2 +-
 pom.xml                               | 12 ++++++------
 src/test/resources/docker-compose.yml |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d5a901500..f20c5a8da 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   redis:
-    image: redis:7.2.5-alpine
+    image: redis:7.2.6-alpine
     ports:
       - "6379"
     hostname: redis
diff --git a/pom.xml b/pom.xml
index 5e55c7f64..67d3ccda5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,23 +87,23 @@
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
-            <version>2.12.1</version>
+            <version>2.14.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-sftp</artifactId>
-            <version>2.12.1</version>
+            <version>2.14.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-scp</artifactId>
-            <version>2.12.1</version>
+            <version>2.14.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.codelibs</groupId>
             <artifactId>jcifs</artifactId>
-            <version>2.1.37</version>
+            <version>2.1.39</version>
         </dependency>
         <!-- Required as the version provided by jcifs has security issues -->
         <dependency>
@@ -136,7 +136,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>
-            <version>1.12.705</version>
+            <version>1.12.771</version>
         </dependency>
         <!--
          required by aws-java-sdk-s3, can't switch to jakarta.xml.bind-api as
@@ -151,7 +151,7 @@
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
-            <version>3.10.0</version>
+            <version>3.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.rometools</groupId>
diff --git a/src/test/resources/docker-compose.yml b/src/test/resources/docker-compose.yml
index 4303d9e24..655fe743e 100644
--- a/src/test/resources/docker-compose.yml
+++ b/src/test/resources/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   redis:
-    image: redis:7.2.5-alpine
+    image: redis:7.2.6-alpine
     ports:
       - "6379"
     hostname: redis

From 89a4d65a43b4913483a803bf8d27b3e1c4568433 Mon Sep 17 00:00:00 2001
From: Matthias Keck <mke@scireum.de>
Date: Tue, 15 Oct 2024 13:38:36 +0200
Subject: [PATCH 3/4] Upgrade clickhouse driver and test image

- use http classified version that contains some shaded dependencies, an http implementation
is still required, so we add the current default one for clickhouse, apache httpclient5
- remove no longer required/not working dependencies/constraints

Fixes: SE-13995
---
 pom.xml | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 67d3ccda5..a988610ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,28 +54,14 @@
         <dependency>
             <groupId>com.clickhouse</groupId>
             <artifactId>clickhouse-jdbc</artifactId>
-            <version>0.4.6</version>
+            <version>0.6.5</version>
+            <classifier>http</classifier>
         </dependency>
+        <!-- Required for clickhouse-jdbc -->
         <dependency>
-            <groupId>org.lz4</groupId>
-            <artifactId>lz4-java</artifactId>
-            <version>1.8.0</version>
-        </dependency>
-        <!-- Included as the version provided by clickhouse has security issues -->
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.16.0</version>
-        </dependency>
-
-        <!-- Required as the version brought by clickhouse-jdbc contains security issues -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.4</version>
         </dependency>
 
         <dependency>

From a930e48b5fb7d19be6fa564ad371c654fd6c3efd Mon Sep 17 00:00:00 2001
From: Matthias Keck <mke@scireum.de>
Date: Tue, 15 Oct 2024 14:43:18 +0200
Subject: [PATCH 4/4] Replaces call of deprecated method

Fixes: SE-13995
---
 src/main/java/sirius/biz/storage/s3/ObjectStore.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/sirius/biz/storage/s3/ObjectStore.java b/src/main/java/sirius/biz/storage/s3/ObjectStore.java
index 26c4f2cee..1bcf0a772 100644
--- a/src/main/java/sirius/biz/storage/s3/ObjectStore.java
+++ b/src/main/java/sirius/biz/storage/s3/ObjectStore.java
@@ -20,6 +20,7 @@
 import com.amazonaws.services.s3.model.GetObjectRequest;
 import com.amazonaws.services.s3.model.InitiateMultipartUploadRequest;
 import com.amazonaws.services.s3.model.InitiateMultipartUploadResult;
+import com.amazonaws.services.s3.model.ListBucketsPaginatedRequest;
 import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.PartETag;
@@ -291,7 +292,11 @@ public boolean doesBucketExist(BucketName bucket) {
      * @return a list of all buckets in the given store
      */
     public List<String> listBuckets() {
-        return getClient().listBuckets().stream().map(Bucket::getName).toList();
+        return getClient().listBuckets(new ListBucketsPaginatedRequest())
+                          .getBuckets()
+                          .stream()
+                          .map(Bucket::getName)
+                          .toList();
     }
 
     /**