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

Rely on the official ENV var for Docker repo

Browse Source 
* Remove obsolete `TestUtils.dockerRegistryFromEnv()`
* Upgrade to Spring GraphQL `1.0.0`
This commit is contained in:
Artem Bilan
2022-05-18 13:04:13 -04:00
parent f5ab0c1665
commit ed6f26104f
4 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

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

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

@@ -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() {

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

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

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

@@ -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<Class<?>, Level> classLevels;