From 20dfa5be5db7adfbfd05829d2dc2ad3b9b0bd291 Mon Sep 17 00:00:00 2001 From: David Nestorovic Date: Thu, 2 Nov 2023 11:04:57 +0100 Subject: [PATCH 1/4] Update postgres image --- .../org.postgresql/postgresql/42.3.4/required-docker-images.txt | 2 +- .../42.3.4/src/test/java/postgresql/PostgresqlTests.java | 2 +- .../main/resources/allowed-docker-images/Dockerfile-postgres | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/src/org.postgresql/postgresql/42.3.4/required-docker-images.txt b/tests/src/org.postgresql/postgresql/42.3.4/required-docker-images.txt index 8066292cb..d44d138ec 100644 --- a/tests/src/org.postgresql/postgresql/42.3.4/required-docker-images.txt +++ b/tests/src/org.postgresql/postgresql/42.3.4/required-docker-images.txt @@ -1 +1 @@ -postgres:15-alpine \ No newline at end of file +postgres:16-alpine \ No newline at end of file diff --git a/tests/src/org.postgresql/postgresql/42.3.4/src/test/java/postgresql/PostgresqlTests.java b/tests/src/org.postgresql/postgresql/42.3.4/src/test/java/postgresql/PostgresqlTests.java index 3ba37e7fd..fad34f5fd 100644 --- a/tests/src/org.postgresql/postgresql/42.3.4/src/test/java/postgresql/PostgresqlTests.java +++ b/tests/src/org.postgresql/postgresql/42.3.4/src/test/java/postgresql/PostgresqlTests.java @@ -60,7 +60,7 @@ static void beforeAll() throws IOException { System.out.println("Starting PostgreSQL ..."); process = new ProcessBuilder( "docker", "run", "--rm", "-p", "5432:5432", "-e", "POSTGRES_DB=" + DATABASE, "-e", "POSTGRES_USER=" + USERNAME, - "-e", "POSTGRES_PASSWORD=" + PASSWORD, "postgres:15-alpine").redirectOutput(new File("postgres-stdout.txt")) + "-e", "POSTGRES_PASSWORD=" + PASSWORD, "postgres:16-alpine").redirectOutput(new File("postgres-stdout.txt")) .redirectError(new File("postgres-stderr.txt")).start(); // Wait until connection can be established diff --git a/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-postgres b/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-postgres index acc127db3..e9abea8d2 100644 --- a/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-postgres +++ b/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-postgres @@ -1 +1 @@ -FROM postgres:15-alpine +FROM postgres:16-alpine From ccaa550b09269c1cf6d8d0604f1981efc95c9bec Mon Sep 17 00:00:00 2001 From: David Nestorovic Date: Thu, 2 Nov 2023 11:06:29 +0100 Subject: [PATCH 2/4] Update nats docker image --- tests/src/io.nats/jnats/2.16.11/required-docker-images.txt | 2 +- .../jnats/2.16.11/src/test/java/io_nats/jnats/JnatsTest.java | 2 +- .../src/main/resources/allowed-docker-images/Dockerfile-nats | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/src/io.nats/jnats/2.16.11/required-docker-images.txt b/tests/src/io.nats/jnats/2.16.11/required-docker-images.txt index 0d02d4fe5..788cdfac9 100644 --- a/tests/src/io.nats/jnats/2.16.11/required-docker-images.txt +++ b/tests/src/io.nats/jnats/2.16.11/required-docker-images.txt @@ -1 +1 @@ -nats:2.9.19 \ No newline at end of file +nats:2.10.4 \ No newline at end of file diff --git a/tests/src/io.nats/jnats/2.16.11/src/test/java/io_nats/jnats/JnatsTest.java b/tests/src/io.nats/jnats/2.16.11/src/test/java/io_nats/jnats/JnatsTest.java index 7bcfc50c2..a365f2318 100644 --- a/tests/src/io.nats/jnats/2.16.11/src/test/java/io_nats/jnats/JnatsTest.java +++ b/tests/src/io.nats/jnats/2.16.11/src/test/java/io_nats/jnats/JnatsTest.java @@ -30,7 +30,7 @@ class JnatsTest { @BeforeAll public void init() throws IOException { System.out.println("Starting NATS ..."); - process = new ProcessBuilder("docker", "run", "--rm", "-p", "4222:4222", "nats:2.9.19").inheritIO().start(); + process = new ProcessBuilder("docker", "run", "--rm", "-p", "4222:4222", "nats:2.10.4").inheritIO().start(); waitUntil(() -> { openConnection().close(); diff --git a/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-nats b/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-nats index c7fc4b0aa..039a0f10d 100644 --- a/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-nats +++ b/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-nats @@ -1 +1 @@ -FROM nats:2.9.19 +FROM nats:2.10.4 From fef493e2ecfd3cb8617d9775c166218c53f7eb79 Mon Sep 17 00:00:00 2001 From: David Nestorovic Date: Thu, 2 Nov 2023 11:07:44 +0100 Subject: [PATCH 3/4] Update mysql docker image --- .../mysql-connector-j/8.0.31/required-docker-images.txt | 2 +- .../8.0.31/src/test/java/mysql/MySQLTests.java | 2 +- .../mysql-connector-java/8.0.29/required-docker-images.txt | 2 +- .../8.0.29/src/test/java/mysql/MySQLTests.java | 2 +- .../2.0.0.Final/required-docker-images.txt | 2 +- .../hibernate_reactive_core/HibernateReactiveCoreTest.java | 2 +- tests/src/samples/docker/image-pull/required-docker-images.txt | 2 +- .../src/test/java/image/pull/DockerImagePullTests.java | 2 +- .../allowed-docker-images/Dockerfile-mysql_mysql-server | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/src/com.mysql/mysql-connector-j/8.0.31/required-docker-images.txt b/tests/src/com.mysql/mysql-connector-j/8.0.31/required-docker-images.txt index a851722df..33791774e 100644 --- a/tests/src/com.mysql/mysql-connector-j/8.0.31/required-docker-images.txt +++ b/tests/src/com.mysql/mysql-connector-j/8.0.31/required-docker-images.txt @@ -1 +1 @@ -container-registry.oracle.com/mysql/community-server:8.1 \ No newline at end of file +container-registry.oracle.com/mysql/community-server:8.2 \ No newline at end of file diff --git a/tests/src/com.mysql/mysql-connector-j/8.0.31/src/test/java/mysql/MySQLTests.java b/tests/src/com.mysql/mysql-connector-j/8.0.31/src/test/java/mysql/MySQLTests.java index 65729a5e7..2abdc6f46 100644 --- a/tests/src/com.mysql/mysql-connector-j/8.0.31/src/test/java/mysql/MySQLTests.java +++ b/tests/src/com.mysql/mysql-connector-j/8.0.31/src/test/java/mysql/MySQLTests.java @@ -51,7 +51,7 @@ static void beforeAll() throws IOException { System.out.println("Starting MySQL ..."); process = new ProcessBuilder( "docker", "run", "--rm", "-p", "3306:3306", "-e", "MYSQL_DATABASE=" + DATABASE, "-e", "MYSQL_USER=" + USERNAME, - "-e", "MYSQL_PASSWORD=" + PASSWORD, "container-registry.oracle.com/mysql/community-server:8.1").redirectOutput(new File("mysql-stdout.txt")) + "-e", "MYSQL_PASSWORD=" + PASSWORD, "container-registry.oracle.com/mysql/community-server:8.2").redirectOutput(new File("mysql-stdout.txt")) .redirectError(new File("mysql-stderr.txt")).start(); // Wait until connection can be established diff --git a/tests/src/mysql/mysql-connector-java/8.0.29/required-docker-images.txt b/tests/src/mysql/mysql-connector-java/8.0.29/required-docker-images.txt index a851722df..33791774e 100644 --- a/tests/src/mysql/mysql-connector-java/8.0.29/required-docker-images.txt +++ b/tests/src/mysql/mysql-connector-java/8.0.29/required-docker-images.txt @@ -1 +1 @@ -container-registry.oracle.com/mysql/community-server:8.1 \ No newline at end of file +container-registry.oracle.com/mysql/community-server:8.2 \ No newline at end of file diff --git a/tests/src/mysql/mysql-connector-java/8.0.29/src/test/java/mysql/MySQLTests.java b/tests/src/mysql/mysql-connector-java/8.0.29/src/test/java/mysql/MySQLTests.java index c496c2466..caa508298 100644 --- a/tests/src/mysql/mysql-connector-java/8.0.29/src/test/java/mysql/MySQLTests.java +++ b/tests/src/mysql/mysql-connector-java/8.0.29/src/test/java/mysql/MySQLTests.java @@ -51,7 +51,7 @@ static void beforeAll() throws IOException { System.out.println("Starting MySQL ..."); process = new ProcessBuilder( "docker", "run", "--rm", "-p", "3306:3306", "-e", "MYSQL_DATABASE=" + DATABASE, "-e", "MYSQL_USER=" + USERNAME, - "-e", "MYSQL_PASSWORD=" + PASSWORD, "container-registry.oracle.com/mysql/community-server:8.1").redirectOutput(new File("mysql-stdout.txt")) + "-e", "MYSQL_PASSWORD=" + PASSWORD, "container-registry.oracle.com/mysql/community-server:8.2").redirectOutput(new File("mysql-stdout.txt")) .redirectError(new File("mysql-stderr.txt")).start(); // Wait until connection can be established diff --git a/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/required-docker-images.txt b/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/required-docker-images.txt index a851722df..33791774e 100644 --- a/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/required-docker-images.txt +++ b/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/required-docker-images.txt @@ -1 +1 @@ -container-registry.oracle.com/mysql/community-server:8.1 \ No newline at end of file +container-registry.oracle.com/mysql/community-server:8.2 \ No newline at end of file diff --git a/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/src/test/java/org_hibernate_reactive/hibernate_reactive_core/HibernateReactiveCoreTest.java b/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/src/test/java/org_hibernate_reactive/hibernate_reactive_core/HibernateReactiveCoreTest.java index 6f46d9135..014620e57 100644 --- a/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/src/test/java/org_hibernate_reactive/hibernate_reactive_core/HibernateReactiveCoreTest.java +++ b/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/src/test/java/org_hibernate_reactive/hibernate_reactive_core/HibernateReactiveCoreTest.java @@ -56,7 +56,7 @@ public void init() throws IOException { logger.info("Starting MySQL ..."); process = new ProcessBuilder( "docker", "run", "--rm", "-p", "3306:3306", "-e", "MYSQL_DATABASE=" + DATABASE, "-e", "MYSQL_USER=" + USERNAME, - "-e", "MYSQL_PASSWORD=" + PASSWORD, "container-registry.oracle.com/mysql/community-server:8.1").inheritIO().start(); + "-e", "MYSQL_PASSWORD=" + PASSWORD, "container-registry.oracle.com/mysql/community-server:8.2").inheritIO().start(); waitUntil(() -> { openConnection().close(); diff --git a/tests/src/samples/docker/image-pull/required-docker-images.txt b/tests/src/samples/docker/image-pull/required-docker-images.txt index a851722df..33791774e 100644 --- a/tests/src/samples/docker/image-pull/required-docker-images.txt +++ b/tests/src/samples/docker/image-pull/required-docker-images.txt @@ -1 +1 @@ -container-registry.oracle.com/mysql/community-server:8.1 \ No newline at end of file +container-registry.oracle.com/mysql/community-server:8.2 \ No newline at end of file diff --git a/tests/src/samples/docker/image-pull/src/test/java/image/pull/DockerImagePullTests.java b/tests/src/samples/docker/image-pull/src/test/java/image/pull/DockerImagePullTests.java index b25a8d954..bf9f72115 100644 --- a/tests/src/samples/docker/image-pull/src/test/java/image/pull/DockerImagePullTests.java +++ b/tests/src/samples/docker/image-pull/src/test/java/image/pull/DockerImagePullTests.java @@ -32,7 +32,7 @@ private void runImage(String image, boolean shouldSucceed) throws Exception { @Test void pullAllowedImage() throws Exception { - runImage("container-registry.oracle.com/mysql/community-server:8.1", true); + runImage("container-registry.oracle.com/mysql/community-server:8.2", true); } @Test diff --git a/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-mysql_mysql-server b/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-mysql_mysql-server index b9f2c1dae..82be955bc 100644 --- a/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-mysql_mysql-server +++ b/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-mysql_mysql-server @@ -1 +1 @@ -FROM container-registry.oracle.com/mysql/community-server:8.1 +FROM container-registry.oracle.com/mysql/community-server:8.2 From 5c20b012c5ee7eb32355fe5e62aee4a7987f5150 Mon Sep 17 00:00:00 2001 From: David Nestorovic Date: Thu, 2 Nov 2023 11:10:01 +0100 Subject: [PATCH 4/4] Update greenmail docker image --- .../com.sun.mail/jakarta.mail/2.0.1/required-docker-images.txt | 2 +- .../2.0.1/src/test/java/com/sun/mail/JakartaMailTest.java | 2 +- .../allowed-docker-images/Dockerfile-greenmail_standalone | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/src/com.sun.mail/jakarta.mail/2.0.1/required-docker-images.txt b/tests/src/com.sun.mail/jakarta.mail/2.0.1/required-docker-images.txt index 983418a96..3a2f810d3 100644 --- a/tests/src/com.sun.mail/jakarta.mail/2.0.1/required-docker-images.txt +++ b/tests/src/com.sun.mail/jakarta.mail/2.0.1/required-docker-images.txt @@ -1 +1 @@ -greenmail/standalone:2.1.0-alpha-1 \ No newline at end of file +greenmail/standalone:2.1.0-alpha-2 \ No newline at end of file diff --git a/tests/src/com.sun.mail/jakarta.mail/2.0.1/src/test/java/com/sun/mail/JakartaMailTest.java b/tests/src/com.sun.mail/jakarta.mail/2.0.1/src/test/java/com/sun/mail/JakartaMailTest.java index 3de0025eb..aebe8bc9b 100644 --- a/tests/src/com.sun.mail/jakarta.mail/2.0.1/src/test/java/com/sun/mail/JakartaMailTest.java +++ b/tests/src/com.sun.mail/jakarta.mail/2.0.1/src/test/java/com/sun/mail/JakartaMailTest.java @@ -35,7 +35,7 @@ public class JakartaMailTest { static void beforeAll() throws IOException { System.out.println("Starting email server ..."); new ProcessBuilder("docker", "run", "--cidfile", "greenmail.cid", "-p", "3025:3025", "--rm", "-e", - "GREENMAIL_OPTS=-Dgreenmail.setup.test.all -Dgreenmail.hostname=0.0.0.0 -Dgreenmail.auth.disabled -Dgreenmail.verbose", "greenmail/standalone:2.1.0-alpha-1") + "GREENMAIL_OPTS=-Dgreenmail.setup.test.all -Dgreenmail.hostname=0.0.0.0 -Dgreenmail.auth.disabled -Dgreenmail.verbose", "greenmail/standalone:2.1.0-alpha-2") .redirectOutput(new File("greenmail-stdout.txt")) .redirectError(new File("greenmail-stderr.txt")).start(); Awaitility.await().atMost(Duration.ofSeconds(10)).until(() -> { diff --git a/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-greenmail_standalone b/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-greenmail_standalone index e0017415d..26f13fb19 100644 --- a/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-greenmail_standalone +++ b/tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-greenmail_standalone @@ -1 +1 @@ -FROM greenmail/standalone:2.1.0-alpha-1 +FROM greenmail/standalone:2.1.0-alpha-2