SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2021-04-19 18:06:19 +00:00
parent a420416c2e
commit 65bb35aa16
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml
View File

@@ -16,7 +16,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gateway-integration-tests</artifactId>
<version>2.2.8.BUILD-SNAPSHOT</version>
<version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath> <!-- lookup parent from repository -->
</parent>

6
spring-cloud-gateway-integration-tests/mvc-failure-analyzer/src/test/java/org/springframework/cloud/gateway/sample/MvcFailureAnalyzerApplicationTests.java
View File

@@ -35,10 +35,8 @@ public class MvcFailureAnalyzerApplicationTests {
@Test
public void contextLoads(CapturedOutput output) {
assertThatThrownBy(
() -> new SpringApplication(MvcFailureAnalyzerApplication.class)
.run("--server.port=0")).hasRootCauseInstanceOf(
MvcFoundOnClasspathException.class);
assertThatThrownBy(() -> new SpringApplication(MvcFailureAnalyzerApplication.class).run("--server.port=0"))
.hasRootCauseInstanceOf(MvcFoundOnClasspathException.class);
assertThat(output).contains("Spring MVC found on classpath",
"Please remove spring-boot-starter-web dependency");
}

2
spring-cloud-gateway-integration-tests/pom.xml
View File

@@ -16,7 +16,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gateway</artifactId>
<version>2.2.8.BUILD-SNAPSHOT</version>
<version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath> <!-- lookup parent from repository -->
</parent>

6
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/support/MvcFoundOnClasspathFailureAnalyzer.java
View File

@@ -19,12 +19,10 @@ package org.springframework.cloud.gateway.support;
import org.springframework.boot.diagnostics.AbstractFailureAnalyzer;
import org.springframework.boot.diagnostics.FailureAnalysis;
public class MvcFoundOnClasspathFailureAnalyzer
extends AbstractFailureAnalyzer<MvcFoundOnClasspathException> {
public class MvcFoundOnClasspathFailureAnalyzer extends AbstractFailureAnalyzer<MvcFoundOnClasspathException> {
@Override
protected FailureAnalysis analyze(Throwable rootFailure,
MvcFoundOnClasspathException cause) {
protected FailureAnalysis analyze(Throwable rootFailure, MvcFoundOnClasspathException cause) {
String message = "Spring MVC found on classpath, which is incompatible with Spring Cloud Gateway.";
String action = "Please remove spring-boot-starter-web dependency.";
return new FailureAnalysis(message, action, cause);