Skip to content

Commit ed6f261

Browse files
committed
Rely on the official ENV var for Docker repo
* Remove obsolete `TestUtils.dockerRegistryFromEnv()` * Upgrade to Spring GraphQL `1.0.0`
1 parent f5ab0c1 commit ed6f261

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ ext {
100100
smackVersion = '4.4.5'
101101
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-M3'
102102
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-M4'
103-
springGraphqlVersion = '1.0.0-SNAPSHOT'
103+
springGraphqlVersion = '1.0.0'
104104
springKafkaVersion = '3.0.0-M4'
105105
springRetryVersion = '1.3.3'
106106
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M4'

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

+1-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@
3434
public interface MySqlContainerTest {
3535

3636
@Container
37-
MySQLContainer<?> MY_SQL_CONTAINER =
38-
new MySQLContainer<>(
39-
DockerImageName.parse(TestUtils.dockerRegistryFromEnv() + "mysql")
40-
.asCompatibleSubstituteFor("mysql"))
41-
.withReuse(true);
37+
MySQLContainer<?> MY_SQL_CONTAINER = new MySQLContainer<>("mysql").withReuse(true);
4238

4339

4440
static String getDriverClassName() {

spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public interface MosquittoContainerTest {
3333

3434
@Container
3535
GenericContainer<?> MOSQUITTO_CONTAINER =
36-
new GenericContainer<>(TestUtils.dockerRegistryFromEnv() + "eclipse-mosquitto:2.0.12")
36+
new GenericContainer<>("eclipse-mosquitto:2.0.12")
3737
.withCommand("mosquitto -c /mosquitto-no-auth.conf")
3838
.withReuse(true)
3939
.withExposedPorts(1883);

spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java

-4
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,6 @@ public static void revertLogLevels(String methodName, LevelsContainer container)
375375
ctx.updateLoggers();
376376
}
377377

378-
public static String dockerRegistryFromEnv() {
379-
return Optional.ofNullable(System.getenv("DOCKER_REGISTRY_URL")).orElse("");
380-
}
381-
382378
public static class LevelsContainer {
383379

384380
private final Map<Class<?>, Level> classLevels;

0 commit comments

Comments
 (0)