From 00807d47e2880e780b1430c3aba3a588490572da Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 10 Oct 2017 16:50:23 -0400 Subject: [PATCH] Upgrade to Spring Security 5.0 M5 * Rename tests in WebFlux module to have `WebFlux` prefix instead of `Http` --- build.gradle | 2 +- ...xml => WebFluxOutboundChannelAdapterParserTests-context.xml} | 0 ...Tests.java => WebFluxOutboundChannelAdapterParserTests.java} | 2 +- ...ontext.xml => WebFluxOutboundGatewayParserTests-context.xml} | 0 ...yParserTests.java => WebFluxOutboundGatewayParserTests.java} | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/{HttpOutboundChannelAdapterParserTests-context.xml => WebFluxOutboundChannelAdapterParserTests-context.xml} (100%) rename spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/{HttpOutboundChannelAdapterParserTests.java => WebFluxOutboundChannelAdapterParserTests.java} (98%) rename spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/{HttpOutboundGatewayParserTests-context.xml => WebFluxOutboundGatewayParserTests-context.xml} (100%) rename spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/{HttpOutboundGatewayParserTests.java => WebFluxOutboundGatewayParserTests.java} (99%) diff --git a/build.gradle b/build.gradle index 58490a6b4b..47b1f7ee16 100644 --- a/build.gradle +++ b/build.gradle @@ -134,7 +134,7 @@ subprojects { subproject -> springDataMongoVersion = '2.0.0.RELEASE' springDataRedisVersion = '2.0.0.RELEASE' springGemfireVersion = '2.0.0.RELEASE' - springSecurityVersion = '5.0.0.M4' + springSecurityVersion = '5.0.0.M5' springSocialTwitterVersion = '2.0.0.M4' springRetryVersion = '1.2.1.RELEASE' springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.RELEASE' diff --git a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/HttpOutboundChannelAdapterParserTests-context.xml b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundChannelAdapterParserTests-context.xml similarity index 100% rename from spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/HttpOutboundChannelAdapterParserTests-context.xml rename to spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundChannelAdapterParserTests-context.xml diff --git a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/HttpOutboundChannelAdapterParserTests.java b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundChannelAdapterParserTests.java similarity index 98% rename from spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/HttpOutboundChannelAdapterParserTests.java rename to spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundChannelAdapterParserTests.java index 9af4f6505b..c75653b0e4 100644 --- a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/HttpOutboundChannelAdapterParserTests.java +++ b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundChannelAdapterParserTests.java @@ -45,7 +45,7 @@ import org.springframework.web.reactive.function.client.WebClient; */ @RunWith(SpringRunner.class) @DirtiesContext -public class HttpOutboundChannelAdapterParserTests { +public class WebFluxOutboundChannelAdapterParserTests { @Autowired @Qualifier("reactiveMinimalConfig") diff --git a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/HttpOutboundGatewayParserTests-context.xml b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundGatewayParserTests-context.xml similarity index 100% rename from spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/HttpOutboundGatewayParserTests-context.xml rename to spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundGatewayParserTests-context.xml diff --git a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/HttpOutboundGatewayParserTests.java b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundGatewayParserTests.java similarity index 99% rename from spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/HttpOutboundGatewayParserTests.java rename to spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundGatewayParserTests.java index 2c229aa733..6995a6abcf 100644 --- a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/HttpOutboundGatewayParserTests.java +++ b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundGatewayParserTests.java @@ -49,7 +49,7 @@ import org.springframework.web.reactive.function.client.WebClient; */ @RunWith(SpringRunner.class) @DirtiesContext -public class HttpOutboundGatewayParserTests { +public class WebFluxOutboundGatewayParserTests { @Autowired @Qualifier("reactiveMinimalConfig")