Update MySQL

Author: reneleonhardt

build.gradle

@@ -65,8 +65,8 @@ ext {
                     [name: '2022',  'mssql': '2022-latest',  'mssql-driver': 'default']
             ]],
             [name: 'mysql', versions: [
-                    [name: '5.7',  'mysql': '5.7',  'mysql-driver': 'default'],
-                    [name: '8.2',  'mysql': '8.2',  'mysql-driver': 'default']
+                    [name: '8.4',  'mysql': '8.4',  'mysql-driver': 'default'],
+                    [name: '9.0',  'mysql': '9.0',  'mysql-driver': 'default']
             ]],
             [name: 'mariadb', versions: [
                     [name: '10.11',  'mariadb': '10.11',  'mariadb-driver': '2.7.12'],
@@ -268,7 +268,7 @@ project(':embedded-database-spring-test') {
 
         optImplementation 'org.postgresql:postgresql:42.7.3'
         optImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.8.0.jre8'
-        optImplementation 'mysql:mysql-connector-java:8.0.33'
+        optImplementation 'com.mysql:mysql-connector-j:9.0.0'
         optImplementation 'org.mariadb.jdbc:mariadb-java-client:3.4.1'
         optImplementation 'com.h2database:h2:2.2.224'
         optImplementation 'org.hsqldb:hsqldb:2.5.2'
@@ -427,9 +427,10 @@ project(':embedded-database-spring-test') {
 
                         if (version['mysql-driver'] == null) { // optional dependencies are implicitly excluded
                             exclude group: 'mysql', module: 'mysql-connector-java'
+                            exclude group: 'com.mysql', module: 'mysql-connector-j'
                         } else if (version['mysql-driver'] != 'default') {
                             eachDependency { details ->
-                                if (details.requested.group == 'mysql' && details.requested.name == 'mysql-connector-java') {
+                                if (details.requested.group == 'com.mysql' && details.requested.name == 'mysql-connector-j') {
                                     details.useVersion "${version['mysql-driver']}"
                                 }
                             }

embedded-database-spring-test/src/main/java/io/zonky/test/db/config/EmbeddedDatabaseAutoConfiguration.java

@@ -104,7 +104,7 @@ public DatabaseProvider dockerMsSqlDatabaseProvider(DatabaseProviderFactory msSq
     @ConditionalOnMissingBean(name = "dockerMySqlDatabaseProvider")
     public DatabaseProvider dockerMySqlDatabaseProvider(DatabaseProviderFactory mySqlDatabaseProviderFactory) {
         checkDependency("org.testcontainers", "mysql", "org.testcontainers.containers.MySQLContainer");
-        checkDependency("mysql", "mysql-connector-java", "com.mysql.cj.jdbc.MysqlDataSource");
+        checkDependency("com.mysql", "mysql-connector-j", "com.mysql.cj.jdbc.MysqlDataSource");
         return mySqlDatabaseProviderFactory.createProvider(DockerMySQLDatabaseProvider.class);
     }
 

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/mysql/DockerMySQLDatabaseProvider.java

@@ -75,7 +75,7 @@ public DatabasePool load(DatabaseConfig config) {
     private final ClientConfig clientConfig;
 
     public DockerMySQLDatabaseProvider(Environment environment, ObjectProvider<List<MySQLContainerCustomizer>> containerCustomizers) {
-        String dockerImage = environment.getProperty("zonky.test.database.mysql.docker.image", "mysql:8.4");
+        String dockerImage = environment.getProperty("zonky.test.database.mysql.docker.image", "mysql:9.0");
         String tmpfsOptions = environment.getProperty("zonky.test.database.mysql.docker.tmpfs.options", "rw,noexec,nosuid");
         boolean tmpfsEnabled = environment.getProperty("zonky.test.database.mysql.docker.tmpfs.enabled", boolean.class, false);
 

embedded-database-spring-test/src/main/resources/META-INF/spring-configuration-metadata.json

@@ -153,7 +153,7 @@
       "name": "zonky.test.database.mysql.docker.image",
       "type": "java.lang.String",
       "description": "Docker image containing MySQL database.",
-      "defaultValue": "mysql:5.7"
+      "defaultValue": "mysql:9.0"
     },
     {
       "name": "zonky.test.database.mysql.docker.tmpfs.enabled",
@@ -352,9 +352,6 @@
         },
         {
           "value": "mysql:8.0"
-        },
-        {
-          "value": "mysql:5.7"
         }
       ],
       "providers": [

embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/DockerMySQLProviderWithConfigurationIntegrationTest.java

@@ -42,7 +42,7 @@
 @AutoConfigureEmbeddedDatabase(type = MYSQL)
 @ContextConfiguration
 @TestPropertySource(properties = {
-        "zonky.test.database.mysql.docker.image=mysql:5.6.48"
+        "zonky.test.database.mysql.docker.image=mysql:9.0"
 })
 public class DockerMySQLProviderWithConfigurationIntegrationTest {
 
@@ -64,6 +64,6 @@ public void testDataSource() throws SQLException {
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
         String databaseVersion = jdbcTemplate.queryForObject("select @@version", String.class);
-        assertThat(databaseVersion).startsWith("5.6.48");
+        assertThat(databaseVersion).startsWith("9.0");
     }
 }

embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/mysql/DockerMySQLDatabaseProviderTest.java

@@ -168,7 +168,7 @@ public void providersWithDifferentCustomizersShouldNotEquals() {
     @Test
     public void testConfigurationProperties() throws Exception {
         MockEnvironment environment = new MockEnvironment();
-        environment.setProperty("zonky.test.database.mysql.docker.image", "mysql:5.6.48");
+        environment.setProperty("zonky.test.database.mysql.docker.image", "mysql:9.0");
         environment.setProperty("zonky.test.database.mysql.client.properties.socketTimeout", "30");
         environment.setProperty("zonky.test.database.mysql.client.properties.description", "test description");
         environment.setProperty("zonky.test.database.mysql.client.properties.autoReconnect", "true");
@@ -184,7 +184,7 @@ public void testConfigurationProperties() throws Exception {
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 
         String databaseVersion = jdbcTemplate.queryForObject("select @@version", String.class);
-        assertThat(databaseVersion).startsWith("5.6.48");
+        assertThat(databaseVersion).startsWith("9.0");
 
         String maxConnections = jdbcTemplate.queryForObject("select @@max_connections", String.class);
         assertThat(maxConnections).isEqualTo("151");
@@ -247,4 +247,4 @@ private static int getPort(DataSource dataSource) throws SQLException {
     private static MySQLContainerCustomizer mysqlContainerCustomizer(long timeout) {
         return container -> container.withStartupTimeout(Duration.ofSeconds(timeout));
     }
-}
+}