Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix MySqlContainerTest for compatibility

Browse Source 
* Upgrade Gradle to `7.3.1`
* Upgrade Log4j to `2.16.0`
This commit is contained in:
Artem Bilan
2021-12-14 14:41:18 -05:00
parent 2a3dac7ff3
commit 9b5ebaad8b
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -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'

3
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -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

5
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlContainerTest.java
View File

@@ -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);