From 9b5ebaad8b96950ed7dac82872d14e3ddbe62297 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Tue, 14 Dec 2021 14:41:18 -0500
Subject: [PATCH] Fix MySqlContainerTest for compatibility

* Upgrade Gradle to `7.3.1`
* Upgrade Log4j to `2.16.0`
---
 build.gradle                                                 | 2 +-
 gradle/wrapper/gradle-wrapper.properties                     | 3 +--
 .../integration/jdbc/mysql/MySqlContainerTest.java           | 5 ++++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8c453b431f..3656357959 100644
--- a/build.gradle
+++ b/build.gradle
@@ -81,7 +81,7 @@ ext {
 	jythonVersion = '2.7.2'
 	kryoShadedVersion = '4.0.2'
     lettuceVersion = '6.1.5.RELEASE'
-	log4jVersion = '2.14.1'
+	log4jVersion = '2.16.0'
 	mailVersion = '1.6.7'
 	micrometerVersion = '1.7.6'
 	mockitoVersion = '3.12.4'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 85a5baceb0..84d1f85fd6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=de8f52ad49bdc759164f72439a3bf56ddb1589c4cde802d3cec7d6ad0e0ee410
\ No newline at end of file
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlContainerTest.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlContainerTest.java
index c16f25fa0e..fd85e20381 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlContainerTest.java
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlContainerTest.java
@@ -19,6 +19,7 @@ package org.springframework.integration.jdbc.mysql;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
 
 import org.springframework.integration.test.util.TestUtils;
 
@@ -34,7 +35,9 @@ public interface MySqlContainerTest {
 
 	@Container
 	MySQLContainer<?> MY_SQL_CONTAINER =
-			new MySQLContainer<>(TestUtils.dockerRegistryFromEnv() + "mysql:latest")
+			new MySQLContainer<>(
+					DockerImageName.parse(TestUtils.dockerRegistryFromEnv() + "mysql")
+							.asCompatibleSubstituteFor("mysql"))
 					.withReuse(true);