diff --git a/README.md b/README.md index 6634c6621..bfae8cf3a 100644 --- a/README.md +++ b/README.md @@ -524,7 +524,6 @@ Container images used in the tests are: - version 16: `postgres:16.1` - version 10: `registry.redhat.io/rhel8/postgresql-10` (only if `ts.redhat.registry.enabled` is set) - MySQL: - - version 5.7: `mysql:5.7` - version 8.0: `registry.access.redhat.com/rhscl/mysql-80-rhel7` - MariaDB: - version 10.11: `mariadb:10.11` diff --git a/pom.xml b/pom.xml index e7f50461c..c5b20b8e2 100644 --- a/pom.xml +++ b/pom.xml @@ -272,7 +272,6 @@ redpandadata/redpanda:v23.3.4 ${postgresql.latest.image} docker.io/library/elasticsearch:7.17.17 - docker.io/library/mysql:5.7.44 docker.io/library/mysql:8.0 ${mysql.80.image} docker.io/library/mariadb:10.11 diff --git a/sql-db/narayana-transactions/src/test/java/io/quarkus/ts/transactions/MysqlTransactionGeneralUsageIT.java b/sql-db/narayana-transactions/src/test/java/io/quarkus/ts/transactions/MysqlTransactionGeneralUsageIT.java index e774f1d7f..2eeda82d4 100644 --- a/sql-db/narayana-transactions/src/test/java/io/quarkus/ts/transactions/MysqlTransactionGeneralUsageIT.java +++ b/sql-db/narayana-transactions/src/test/java/io/quarkus/ts/transactions/MysqlTransactionGeneralUsageIT.java @@ -16,7 +16,7 @@ public class MysqlTransactionGeneralUsageIT extends TransactionCommons { static final int MYSQL_PORT = 3306; - @Container(image = "${mysql.57.image}", port = MYSQL_PORT, expectedLog = "port: " + MYSQL_PORT) + @Container(image = "${mysql.80.image}", port = MYSQL_PORT, expectedLog = "port: " + MYSQL_PORT) static final MySqlService database = new MySqlService(); @QuarkusApplication diff --git a/sql-db/reactive-rest-data-panache/src/test/java/io/quarkus/ts/reactive/rest/data/panache/MySqlPanacheResourceIT.java b/sql-db/reactive-rest-data-panache/src/test/java/io/quarkus/ts/reactive/rest/data/panache/MySqlPanacheResourceIT.java index ec629f606..a97a7d73a 100644 --- a/sql-db/reactive-rest-data-panache/src/test/java/io/quarkus/ts/reactive/rest/data/panache/MySqlPanacheResourceIT.java +++ b/sql-db/reactive-rest-data-panache/src/test/java/io/quarkus/ts/reactive/rest/data/panache/MySqlPanacheResourceIT.java @@ -15,7 +15,7 @@ public class MySqlPanacheResourceIT extends AbstractPanacheResourceIT { static final int MYSQL_PORT = 3306; - @Container(image = "${mysql.57.image}", port = MYSQL_PORT, expectedLog = "port: " + MYSQL_PORT) + @Container(image = "${mysql.80.image}", port = MYSQL_PORT, expectedLog = "port: " + MYSQL_PORT) static MySqlService database = new MySqlService(); @QuarkusApplication diff --git a/sql-db/sql-app-compatibility/src/test/java/io/quarkus/ts/sqldb/compatibility/MySqlDatabaseIT.java b/sql-db/sql-app-compatibility/src/test/java/io/quarkus/ts/sqldb/compatibility/MySqlDatabaseIT.java index 1eb66f4e8..f1bbc71ad 100644 --- a/sql-db/sql-app-compatibility/src/test/java/io/quarkus/ts/sqldb/compatibility/MySqlDatabaseIT.java +++ b/sql-db/sql-app-compatibility/src/test/java/io/quarkus/ts/sqldb/compatibility/MySqlDatabaseIT.java @@ -17,7 +17,7 @@ public class MySqlDatabaseIT extends AbstractSqlDatabaseIT { static final int MYSQL_PORT = 3306; - @Container(image = "${mysql.57.image}", port = MYSQL_PORT, expectedLog = "port: " + MYSQL_PORT) + @Container(image = "${mysql.80.image}", port = MYSQL_PORT, expectedLog = "port: " + MYSQL_PORT) static MySqlService database = new MySqlService(); @QuarkusApplication diff --git a/sql-db/sql-app-compatibility/src/test/resources/mysql.properties b/sql-db/sql-app-compatibility/src/test/resources/mysql.properties index cf1f4cbaa..f3fc9eeb8 100644 --- a/sql-db/sql-app-compatibility/src/test/resources/mysql.properties +++ b/sql-db/sql-app-compatibility/src/test/resources/mysql.properties @@ -1,6 +1,6 @@ quarkus.datasource.db-kind=mysql quarkus.hibernate-orm.dialect=org.hibernate.community.dialect.MariaDBLegacyDialect -quarkus.datasource.db-version=5.7 +quarkus.datasource.db-version=8.0 quarkus.hibernate-orm.sql-load-script=mariadb_import.sql quarkus.hibernate-orm.database.generation=drop-and-create diff --git a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MySqlDatabaseIT.java b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MySqlDatabaseIT.java index b45c521d5..ee746f940 100644 --- a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MySqlDatabaseIT.java +++ b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MySqlDatabaseIT.java @@ -15,7 +15,7 @@ public class MySqlDatabaseIT extends AbstractSqlDatabaseIT { static final int MYSQL_PORT = 3306; - @Container(image = "${mysql.57.image}", port = MYSQL_PORT, expectedLog = "port: " + MYSQL_PORT) + @Container(image = "${mysql.80.image}", port = MYSQL_PORT, expectedLog = "port: " + MYSQL_PORT) static MySqlService database = new MySqlService(); @QuarkusApplication