Skip to content

Commit e57df51

Browse files
thllbernd
andauthored
Update AWS java SDK to version 2.33.13 (#23685)
* Update AWS java SDK to version 2.33.11 * Add option to specify docker image for S3MinioContainer * Update AWS SDK to 2.33.13 --------- Co-authored-by: Bernd Ahlers <[email protected]>
1 parent 35d68b3 commit e57df51

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

graylog2-server/src/test/java/org/graylog/testing/completebackend/S3MinioContainer.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import java.util.Optional;
3232

3333
public class S3MinioContainer extends GenericContainer<S3MinioContainer> {
34-
private static final String IMAGE_NAME = "minio/minio:latest";
34+
public static final String MINIO_LATEST = "minio/minio:latest";
3535
private static final int PORT = 9000;
3636
private final String accessKey;
3737
private final String secretKey;
@@ -43,12 +43,20 @@ public S3MinioContainer() {
4343
this(Network.newNetwork(), true);
4444
}
4545

46+
public S3MinioContainer(String imageName) {
47+
this(imageName, Network.newNetwork(), true);
48+
}
49+
4650
public S3MinioContainer(Network network) {
4751
this(network, false);
4852
}
4953

5054
public S3MinioContainer(Network network, final boolean closeNetwork) {
51-
super(IMAGE_NAME);
55+
this(MINIO_LATEST, network, closeNetwork);
56+
}
57+
58+
public S3MinioContainer(String imageName, Network network, final boolean closeNetwork) {
59+
super(imageName);
5260
this.closeNetwork = closeNetwork;
5361
this.network = Optional.of(network);
5462

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<auto-service.version>1.1.1</auto-service.version>
108108
<auto-value.version>1.11.0</auto-value.version>
109109
<aws-java-sdk-1.version>1.12.675</aws-java-sdk-1.version>
110-
<aws-java-sdk-2.version>2.29.52</aws-java-sdk-2.version>
110+
<aws-java-sdk-2.version>2.33.13</aws-java-sdk-2.version>
111111
<aws-kinesis-client.version>2.6.1</aws-kinesis-client.version>
112112
<aws-msk-iam-auth.version>2.3.2</aws-msk-iam-auth.version>
113113
<!-- When bumping bouncycastle.version, check if the explicit management for bcutil-jdk18on can/must be removed. -->

0 commit comments

Comments
 (0)