diff --git a/build.gradle b/build.gradle index 375f11c0fd..4aa4d9bb2a 100644 --- a/build.gradle +++ b/build.gradle @@ -100,7 +100,7 @@ ext { smackVersion = '4.4.5' springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-M3' springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-M4' - springGraphqlVersion = '1.0.0-SNAPSHOT' + springGraphqlVersion = '1.0.0' springKafkaVersion = '3.0.0-M4' springRetryVersion = '1.3.3' springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M4' 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 fd85e20381..1d8802653e 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 @@ -34,11 +34,7 @@ import org.springframework.integration.test.util.TestUtils; public interface MySqlContainerTest { @Container - MySQLContainer MY_SQL_CONTAINER = - new MySQLContainer<>( - DockerImageName.parse(TestUtils.dockerRegistryFromEnv() + "mysql") - .asCompatibleSubstituteFor("mysql")) - .withReuse(true); + MySQLContainer MY_SQL_CONTAINER = new MySQLContainer<>("mysql").withReuse(true); static String getDriverClassName() { diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java index a074bb4fb4..37db43bf8c 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java @@ -33,7 +33,7 @@ public interface MosquittoContainerTest { @Container GenericContainer MOSQUITTO_CONTAINER = - new GenericContainer<>(TestUtils.dockerRegistryFromEnv() + "eclipse-mosquitto:2.0.12") + new GenericContainer<>("eclipse-mosquitto:2.0.12") .withCommand("mosquitto -c /mosquitto-no-auth.conf") .withReuse(true) .withExposedPorts(1883); diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java index d4ca636537..fbede0cb83 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java @@ -375,10 +375,6 @@ public abstract class TestUtils { ctx.updateLoggers(); } - public static String dockerRegistryFromEnv() { - return Optional.ofNullable(System.getenv("DOCKER_REGISTRY_URL")).orElse(""); - } - public static class LevelsContainer { private final Map, Level> classLevels;