From 2b8ab94b5ad467438afeb4c0a95b86a3d3680238 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 9 Sep 2019 15:58:31 -0400 Subject: [PATCH 1/5] Updates test to match message with pattern. This avoids changes in byte sizes. --- .../factory/RequestHeaderSizeGatewayFilterFactoryTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RequestHeaderSizeGatewayFilterFactoryTest.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RequestHeaderSizeGatewayFilterFactoryTest.java index f8a142b8..0da59e2a 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RequestHeaderSizeGatewayFilterFactoryTest.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RequestHeaderSizeGatewayFilterFactoryTest.java @@ -48,7 +48,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen @DirtiesContext public class RequestHeaderSizeGatewayFilterFactoryTest extends BaseWebClientTests { - private static final String responseMesssage = "Request Header/s size is larger than permissible limit. Request Header/s size is 73B where permissible limit is 46B"; + private static final String responseMesssage = "Request Header/s size is larger than permissible limit. Request Header/s size is \\d\\dB where permissible limit is \\d\\dB"; @Test public void setRequestSizeFilterWorks() { From 00a70104bcdadb002b167a01e45057de80db10aa Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Sep 2019 20:14:20 +0000 Subject: [PATCH 2/5] Update SNAPSHOT to 2.1.3.RELEASE --- README.adoc | 1 + docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-gateway-core/pom.xml | 2 +- spring-cloud-gateway-dependencies/pom.xml | 4 ++-- spring-cloud-gateway-mvc/pom.xml | 2 +- spring-cloud-gateway-sample/pom.xml | 2 +- spring-cloud-gateway-webflux/pom.xml | 2 +- spring-cloud-starter-gateway/pom.xml | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/README.adoc b/README.adoc index a4538b25..a0b65783 100644 --- a/README.adoc +++ b/README.adoc @@ -252,6 +252,7 @@ $ touch .springformat ==== Intellij IDEA In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. +The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project. .spring-cloud-build-tools/ ---- diff --git a/docs/pom.xml b/docs/pom.xml index ed0ff490..8dc487d4 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE spring-cloud-gateway-docs pom diff --git a/pom.xml b/pom.xml index 8105f92c..fbc4c922 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE pom Spring Cloud Gateway @@ -15,7 +15,7 @@ org.springframework.cloud spring-cloud-build - 2.1.7.BUILD-SNAPSHOT + 2.1.7.RELEASE @@ -52,8 +52,8 @@ UTF-8 UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE + 2.1.3.RELEASE 0.6 true diff --git a/spring-cloud-gateway-core/pom.xml b/spring-cloud-gateway-core/pom.xml index f0269ddd..6d4889af 100644 --- a/spring-cloud-gateway-core/pom.xml +++ b/spring-cloud-gateway-core/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-gateway-core diff --git a/spring-cloud-gateway-dependencies/pom.xml b/spring-cloud-gateway-dependencies/pom.xml index 8e8b7ba4..c8ff7ed7 100644 --- a/spring-cloud-gateway-dependencies/pom.xml +++ b/spring-cloud-gateway-dependencies/pom.xml @@ -6,12 +6,12 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.7.BUILD-SNAPSHOT + 2.1.7.RELEASE spring-cloud-gateway-dependencies - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE pom spring-cloud-gateway-dependencies diff --git a/spring-cloud-gateway-mvc/pom.xml b/spring-cloud-gateway-mvc/pom.xml index 1698323f..3070062e 100644 --- a/spring-cloud-gateway-mvc/pom.xml +++ b/spring-cloud-gateway-mvc/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. diff --git a/spring-cloud-gateway-sample/pom.xml b/spring-cloud-gateway-sample/pom.xml index c08f87e6..40f84a1b 100644 --- a/spring-cloud-gateway-sample/pom.xml +++ b/spring-cloud-gateway-sample/pom.xml @@ -16,7 +16,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. diff --git a/spring-cloud-gateway-webflux/pom.xml b/spring-cloud-gateway-webflux/pom.xml index ed1ace30..68c4b3c1 100644 --- a/spring-cloud-gateway-webflux/pom.xml +++ b/spring-cloud-gateway-webflux/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. diff --git a/spring-cloud-starter-gateway/pom.xml b/spring-cloud-starter-gateway/pom.xml index fc4e9ae9..1c21df25 100644 --- a/spring-cloud-starter-gateway/pom.xml +++ b/spring-cloud-starter-gateway/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-starter-gateway From 20990d80a46d9e7848602eef067d0752eba780de Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Sep 2019 20:15:19 +0000 Subject: [PATCH 3/5] Going back to snapshots --- README.adoc | 1 - docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-gateway-core/pom.xml | 2 +- spring-cloud-gateway-dependencies/pom.xml | 4 ++-- spring-cloud-gateway-mvc/pom.xml | 2 +- spring-cloud-gateway-sample/pom.xml | 2 +- spring-cloud-gateway-webflux/pom.xml | 2 +- spring-cloud-starter-gateway/pom.xml | 2 +- 9 files changed, 12 insertions(+), 13 deletions(-) diff --git a/README.adoc b/README.adoc index a0b65783..a4538b25 100644 --- a/README.adoc +++ b/README.adoc @@ -252,7 +252,6 @@ $ touch .springformat ==== Intellij IDEA In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. -The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project. .spring-cloud-build-tools/ ---- diff --git a/docs/pom.xml b/docs/pom.xml index 8dc487d4..ed0ff490 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT spring-cloud-gateway-docs pom diff --git a/pom.xml b/pom.xml index fbc4c922..8105f92c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT pom Spring Cloud Gateway @@ -15,7 +15,7 @@ org.springframework.cloud spring-cloud-build - 2.1.7.RELEASE + 2.1.7.BUILD-SNAPSHOT @@ -52,8 +52,8 @@ UTF-8 UTF-8 1.8 - 2.1.3.RELEASE - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT 0.6 true diff --git a/spring-cloud-gateway-core/pom.xml b/spring-cloud-gateway-core/pom.xml index 6d4889af..f0269ddd 100644 --- a/spring-cloud-gateway-core/pom.xml +++ b/spring-cloud-gateway-core/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-gateway-core diff --git a/spring-cloud-gateway-dependencies/pom.xml b/spring-cloud-gateway-dependencies/pom.xml index c8ff7ed7..8e8b7ba4 100644 --- a/spring-cloud-gateway-dependencies/pom.xml +++ b/spring-cloud-gateway-dependencies/pom.xml @@ -6,12 +6,12 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.7.RELEASE + 2.1.7.BUILD-SNAPSHOT spring-cloud-gateway-dependencies - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT pom spring-cloud-gateway-dependencies diff --git a/spring-cloud-gateway-mvc/pom.xml b/spring-cloud-gateway-mvc/pom.xml index 3070062e..1698323f 100644 --- a/spring-cloud-gateway-mvc/pom.xml +++ b/spring-cloud-gateway-mvc/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-gateway-sample/pom.xml b/spring-cloud-gateway-sample/pom.xml index 40f84a1b..c08f87e6 100644 --- a/spring-cloud-gateway-sample/pom.xml +++ b/spring-cloud-gateway-sample/pom.xml @@ -16,7 +16,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-gateway-webflux/pom.xml b/spring-cloud-gateway-webflux/pom.xml index 68c4b3c1..ed1ace30 100644 --- a/spring-cloud-gateway-webflux/pom.xml +++ b/spring-cloud-gateway-webflux/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-gateway/pom.xml b/spring-cloud-starter-gateway/pom.xml index 1c21df25..fc4e9ae9 100644 --- a/spring-cloud-starter-gateway/pom.xml +++ b/spring-cloud-starter-gateway/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-starter-gateway From 7cab2bf427fcf2858e109260776b2a33d278835a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Sep 2019 20:15:20 +0000 Subject: [PATCH 4/5] Bumping versions to 2.1.4.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-gateway-core/pom.xml | 2 +- spring-cloud-gateway-dependencies/pom.xml | 4 ++-- spring-cloud-gateway-mvc/pom.xml | 2 +- spring-cloud-gateway-sample/pom.xml | 2 +- spring-cloud-gateway-webflux/pom.xml | 2 +- spring-cloud-starter-gateway/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index ed0ff490..239b2744 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT spring-cloud-gateway-docs pom diff --git a/pom.xml b/pom.xml index 8105f92c..8f1b6bc1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT pom Spring Cloud Gateway @@ -15,7 +15,7 @@ org.springframework.cloud spring-cloud-build - 2.1.7.BUILD-SNAPSHOT + 2.1.8.BUILD-SNAPSHOT @@ -52,8 +52,8 @@ UTF-8 UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT 0.6 true diff --git a/spring-cloud-gateway-core/pom.xml b/spring-cloud-gateway-core/pom.xml index f0269ddd..b6166707 100644 --- a/spring-cloud-gateway-core/pom.xml +++ b/spring-cloud-gateway-core/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-gateway-core diff --git a/spring-cloud-gateway-dependencies/pom.xml b/spring-cloud-gateway-dependencies/pom.xml index 8e8b7ba4..61296d90 100644 --- a/spring-cloud-gateway-dependencies/pom.xml +++ b/spring-cloud-gateway-dependencies/pom.xml @@ -6,12 +6,12 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.7.BUILD-SNAPSHOT + 2.1.8.BUILD-SNAPSHOT spring-cloud-gateway-dependencies - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT pom spring-cloud-gateway-dependencies diff --git a/spring-cloud-gateway-mvc/pom.xml b/spring-cloud-gateway-mvc/pom.xml index 1698323f..816dc0b1 100644 --- a/spring-cloud-gateway-mvc/pom.xml +++ b/spring-cloud-gateway-mvc/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-gateway-sample/pom.xml b/spring-cloud-gateway-sample/pom.xml index c08f87e6..291786a1 100644 --- a/spring-cloud-gateway-sample/pom.xml +++ b/spring-cloud-gateway-sample/pom.xml @@ -16,7 +16,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-gateway-webflux/pom.xml b/spring-cloud-gateway-webflux/pom.xml index ed1ace30..a44e06f4 100644 --- a/spring-cloud-gateway-webflux/pom.xml +++ b/spring-cloud-gateway-webflux/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-gateway/pom.xml b/spring-cloud-starter-gateway/pom.xml index fc4e9ae9..f78e8467 100644 --- a/spring-cloud-starter-gateway/pom.xml +++ b/spring-cloud-starter-gateway/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-gateway - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-starter-gateway From 36ee6859917be543fb0afaff9420e864689fdc09 Mon Sep 17 00:00:00 2001 From: yuzhang <562713990@qq.com> Date: Wed, 11 Sep 2019 23:57:42 +0800 Subject: [PATCH 5/5] I think there should not import classes in log4j (#1292) Fixes #1290 --- .../support/ipresolver/XForwardedRemoteAddressResolver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java index 49945a04..ea5ea2f9 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ipresolver/XForwardedRemoteAddressResolver.java @@ -21,12 +21,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.util.Assert; +import org.springframework.util.StringUtils; import org.springframework.web.server.ServerWebExchange; /** @@ -129,7 +129,7 @@ public class XForwardedRemoteAddressResolver implements RemoteAddressResolver { return Collections.emptyList(); } List values = Arrays.asList(xForwardedValues.get(0).split(", ")); - if (values.size() == 1 && Strings.isBlank(values.get(0))) { + if (values.size() == 1 && !StringUtils.hasText(values.get(0))) { return Collections.emptyList(); } return values;