Switch MySQL 5.7 to 8 as 5.7 is EOL

jedla97 · Feb 21, 2024 · cf60c3b · cf60c3b
1 parent 5c3c7c6
commit cf60c3b
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 7 deletions.
diff --git 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
@@ -272,7 +272,6 @@
                                 <redpanda.image>redpandadata/redpanda:v23.3.4</redpanda.image>
                                 <postgresql.latest.image>${postgresql.latest.image}</postgresql.latest.image>
                                 <elastic.7x.image>docker.io/library/elasticsearch:7.17.17</elastic.7x.image>
-                                <mysql.57.image>docker.io/library/mysql:5.7.44</mysql.57.image>
                                 <mysql.upstream.80.image>docker.io/library/mysql:8.0</mysql.upstream.80.image>
                                 <mysql.80.image>${mysql.80.image}</mysql.80.image>
                                 <mariadb.10.image>docker.io/library/mariadb:10.11</mariadb.10.image>

diff --git a/...transactions/src/test/java/io/quarkus/ts/transactions/MysqlTransactionGeneralUsageIT.java b/...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/...anache/src/test/java/io/quarkus/ts/reactive/rest/data/panache/MySqlPanacheResourceIT.java b/...anache/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/...ql-app-compatibility/src/test/java/io/quarkus/ts/sqldb/compatibility/MySqlDatabaseIT.java b/...ql-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
@@ -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
@@ -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