Merge pull request #2040 from scireum/feature/SE-13995_db_upgrades

Version upgrades

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
@@ -18,7 +18,7 @@ services:
  hostname: mongo
 
  mariadb:
- image: mariadb:11.4.2-noble
+ image: mariadb:11.4.3-noble
  ports:
  - "3306"
  environment:

pom.xml

@@ -49,33 +49,19 @@
  <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>
  <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>
@@ -87,23 +73,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 +122,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 +137,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>

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();
  }
 
  /**

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