From 3513c45b4bb7e09d95370d452fc255f724ca0cfc Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 3 May 2021 14:43:10 +0200 Subject: [PATCH] Upgrade to MySQL 8.0. Switch to a newer MySQL version to use TLSv1.2 as newer JRE versions no longer support TLSv1/TLSv1.1. Closes #594. --- .../data/r2dbc/testing/MySqlTestSupport.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/springframework/data/r2dbc/testing/MySqlTestSupport.java b/src/test/java/org/springframework/data/r2dbc/testing/MySqlTestSupport.java index 64d422d..bf859dd 100644 --- a/src/test/java/org/springframework/data/r2dbc/testing/MySqlTestSupport.java +++ b/src/test/java/org/springframework/data/r2dbc/testing/MySqlTestSupport.java @@ -28,7 +28,6 @@ import org.springframework.data.r2dbc.testing.ExternalDatabase.ProvidedDatabase; import org.testcontainers.containers.MySQLContainer; -import com.github.jasync.r2dbc.mysql.MysqlConnectionFactoryProvider; import com.mysql.cj.jdbc.MysqlDataSource; /** @@ -98,7 +97,7 @@ public class MySqlTestSupport { .database("mysql") // .username("root") // .password("my-secret-pw") // - .jdbcUrl("jdbc:mysql://localhost:3306/mysql") // + .jdbcUrl("jdbc:mysql://localhost:3306/mysql?allowPublicKeyRetrieval=true") // .build(); } @@ -110,7 +109,7 @@ public class MySqlTestSupport { if (testContainerDatabase == null) { try { - MySQLContainer container = new MySQLContainer(MySQLContainer.IMAGE + ":" + MySQLContainer.DEFAULT_TAG); + MySQLContainer container = new MySQLContainer("mysql:8.0.24"); container.start(); testContainerDatabase = ProvidedDatabase.builder(container) // @@ -144,7 +143,7 @@ public class MySqlTestSupport { dataSource.setUser(database.getUsername()); dataSource.setPassword(database.getPassword()); - dataSource.setURL(database.getJdbcUrl() + "?useSSL=false"); + dataSource.setURL(database.getJdbcUrl() + "?useSSL=false&allowPublicKeyRetrieval=true"); return dataSource; }