Skip to content

Commit fbc06e3

Browse files
KyleAureKyleAure
authored
Merge pull request #31432 from KyleAure/testcontainers-1.21.0
2 parents 33314ba + 2ae70b4 commit fbc06e3

File tree

7 files changed

+34
-34
lines changed

7 files changed

+34
-34
lines changed

‎dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,17 @@
144144
<dependency>
145145
<groupId>com.github.docker-java</groupId>
146146
<artifactId>docker-java-api</artifactId>
147-
<version>3.4.0</version>
147+
<version>3.5.0</version>
148148
</dependency>
149149
<dependency>
150150
<groupId>com.github.docker-java</groupId>
151151
<artifactId>docker-java-transport-zerodep</artifactId>
152-
<version>3.4.0</version>
152+
<version>3.5.0</version>
153153
</dependency>
154154
<dependency>
155155
<groupId>com.github.docker-java</groupId>
156156
<artifactId>docker-java-transport</artifactId>
157-
<version>3.4.0</version>
157+
<version>3.5.0</version>
158158
</dependency>
159159
<dependency>
160160
<groupId>com.github.mwiede</groupId>
@@ -4914,57 +4914,57 @@
49144914
<dependency>
49154915
<groupId>org.testcontainers</groupId>
49164916
<artifactId>database-commons</artifactId>
4917-
<version>1.20.3</version>
4917+
<version>1.21.0</version>
49184918
</dependency>
49194919
<dependency>
49204920
<groupId>org.testcontainers</groupId>
49214921
<artifactId>db2</artifactId>
4922-
<version>1.20.3</version>
4922+
<version>1.21.0</version>
49234923
</dependency>
49244924
<dependency>
49254925
<groupId>org.testcontainers</groupId>
49264926
<artifactId>jdbc</artifactId>
4927-
<version>1.20.3</version>
4927+
<version>1.21.0</version>
49284928
</dependency>
49294929
<dependency>
49304930
<groupId>org.testcontainers</groupId>
49314931
<artifactId>kafka</artifactId>
4932-
<version>1.20.3</version>
4932+
<version>1.21.0</version>
49334933
</dependency>
49344934
<dependency>
49354935
<groupId>org.testcontainers</groupId>
49364936
<artifactId>mongodb</artifactId>
4937-
<version>1.20.3</version>
4937+
<version>1.21.0</version>
49384938
</dependency>
49394939
<dependency>
49404940
<groupId>org.testcontainers</groupId>
49414941
<artifactId>mssqlserver</artifactId>
4942-
<version>1.20.3</version>
4942+
<version>1.21.0</version>
49434943
</dependency>
49444944
<dependency>
49454945
<groupId>org.testcontainers</groupId>
49464946
<artifactId>oracle-free</artifactId>
4947-
<version>1.20.3</version>
4947+
<version>1.21.0</version>
49484948
</dependency>
49494949
<dependency>
49504950
<groupId>org.testcontainers</groupId>
49514951
<artifactId>oracle-xe</artifactId>
4952-
<version>1.20.3</version>
4952+
<version>1.21.0</version>
49534953
</dependency>
49544954
<dependency>
49554955
<groupId>org.testcontainers</groupId>
49564956
<artifactId>postgresql</artifactId>
4957-
<version>1.20.3</version>
4957+
<version>1.21.0</version>
49584958
</dependency>
49594959
<dependency>
49604960
<groupId>org.testcontainers</groupId>
49614961
<artifactId>selenium</artifactId>
4962-
<version>1.20.3</version>
4962+
<version>1.21.0</version>
49634963
</dependency>
49644964
<dependency>
49654965
<groupId>org.testcontainers</groupId>
49664966
<artifactId>testcontainers</artifactId>
4967-
<version>1.20.3</version>
4967+
<version>1.21.0</version>
49684968
</dependency>
49694969
<dependency>
49704970
<groupId>org.testng</groupId>

‎dev/cnf/oss_dependencies.maven

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.15.2
2424
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2
2525
com.fasterxml.jackson.module:jackson-module-parameter-names:2.15.2
2626
com.fasterxml.woodstox:woodstox-core:6.5.1
27-
com.github.docker-java:docker-java-api:3.4.0
28-
com.github.docker-java:docker-java-transport-zerodep:3.4.0
29-
com.github.docker-java:docker-java-transport:3.4.0
27+
com.github.docker-java:docker-java-api:3.5.0
28+
com.github.docker-java:docker-java-transport-zerodep:3.5.0
29+
com.github.docker-java:docker-java-transport:3.5.0
3030
com.github.mwiede:jsch:0.2.18
3131
com.google.errorprone:error_prone_annotations:2.4.0
3232
com.google.guava:guava:32.0.1-android
@@ -978,17 +978,17 @@ org.springframework:spring-webmvc:6.1.14
978978
org.springframework:spring-websocket:4.3.13.RELEASE
979979
org.springframework:spring-websocket:5.3.39
980980
org.springframework:spring-websocket:6.1.14
981-
org.testcontainers:database-commons:1.20.3
982-
org.testcontainers:db2:1.20.3
983-
org.testcontainers:jdbc:1.20.3
984-
org.testcontainers:kafka:1.20.3
985-
org.testcontainers:mongodb:1.20.3
986-
org.testcontainers:mssqlserver:1.20.3
987-
org.testcontainers:oracle-free:1.20.3
988-
org.testcontainers:oracle-xe:1.20.3
989-
org.testcontainers:postgresql:1.20.3
990-
org.testcontainers:selenium:1.20.3
991-
org.testcontainers:testcontainers:1.20.3
981+
org.testcontainers:database-commons:1.21.0
982+
org.testcontainers:db2:1.21.0
983+
org.testcontainers:jdbc:1.21.0
984+
org.testcontainers:kafka:1.21.0
985+
org.testcontainers:mongodb:1.21.0
986+
org.testcontainers:mssqlserver:1.21.0
987+
org.testcontainers:oracle-free:1.21.0
988+
org.testcontainers:oracle-xe:1.21.0
989+
org.testcontainers:postgresql:1.21.0
990+
org.testcontainers:selenium:1.21.0
991+
org.testcontainers:testcontainers:1.21.0
992992
org.testng:testng:7.5.1
993993
org.yaml:snakeyaml:2.0
994994
software.amazon.jdbc:aws-advanced-jdbc-wrapper:2.2.3

‎dev/fattest.simplicity/bnd.bnd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ test.project: true
6969
generate.replacement: true
7070

7171
# These are the images used by the org.testcontainers and componenttest.topology.database.container packages
72-
fat.test.container.images: testcontainers/ryuk:0.9.0, testcontainers/sshd:1.2.0, testcontainers/vnc-recorder:1.3.0,\
72+
fat.test.container.images: testcontainers/ryuk:0.11.0, testcontainers/sshd:1.2.0, testcontainers/vnc-recorder:1.3.0,\
7373
icr.io/db2_community/db2:12.1.1.0, ghcr.io/gvenzl/oracle-free:23-full-faststart,\
7474
public.ecr.aws/docker/library/postgres:17-alpine, public.ecr.aws/docker/library/alpine:3.17,\
7575
mcr.microsoft.com/mssql/server:2022-latest

‎dev/fattest.simplicity/src/componenttest/containers/ImageVerifier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public final class ImageVerifier {
5555
}
5656

5757
//Add images from the testcontainers project (tracked in fattest.simplicity/bnd.bnd)
58-
for (String image : Arrays.asList("testcontainers/ryuk:0.9.0", "testcontainers/sshd:1.2.0", "testcontainers/vnc-recorder:1.3.0",
58+
for (String image : Arrays.asList("testcontainers/ryuk:0.11.0", "testcontainers/sshd:1.2.0", "testcontainers/vnc-recorder:1.3.0",
5959
"public.ecr.aws/docker/library/alpine:3.17")) {
6060
_expectedImages.add(DockerImageName.parse(image));
6161
}

‎dev/io.openliberty.org.testcontainers/bnd.bnd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
bVersion: 1.0
1515

1616
#Common Versions
17-
testContainerVersion: 1.20.3
18-
dockerJavaVersion: 3.4.0
17+
testContainerVersion: 1.21.0
18+
dockerJavaVersion: 3.5.0
1919

2020
Bundle-Name: FAT Testcontainer Bundle
2121
Bundle-SymbolicName: io.openliberty.org.testcontainers

‎dev/io.openliberty.org.testcontainers/cache/externals

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public.ecr.aws/docker/library/python:3.11.6
4848
ryanesch/acme-boulder:1.2
4949
seleniarm/standalone-chromium:4.8.3
5050
selenium/standalone-chrome:4.8.3
51-
testcontainers/ryuk:0.9.0
51+
testcontainers/ryuk:0.11.0
5252
testcontainers/sshd:1.2.0
5353
testcontainers/vnc-recorder:1.3.0
5454
zachhein/krb5-server:0.2

‎dev/io.openliberty.org.testcontainers/cache/images

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ wasliberty-infrastructure-docker/otel/opentelemetry-collector:0.74.0
3333
wasliberty-infrastructure-docker/ryanesch/acme-boulder:1.2
3434
wasliberty-infrastructure-docker/seleniarm/standalone-chromium:4.8.3
3535
wasliberty-infrastructure-docker/selenium/standalone-chrome:4.8.3
36-
wasliberty-infrastructure-docker/testcontainers/ryuk:0.9.0
36+
wasliberty-infrastructure-docker/testcontainers/ryuk:0.11.0
3737
wasliberty-infrastructure-docker/testcontainers/sshd:1.2.0
3838
wasliberty-infrastructure-docker/testcontainers/vnc-recorder:1.3.0
3939
wasliberty-infrastructure-docker/zachhein/krb5-server:0.2

0 commit comments

Comments
 (0)