Skip to content

Commit 8cec796

Browse files
spring-buildsspring-builds
committed
Update SNAPSHOT to 3.1.10
1 parent 8757e54 commit 8cec796

File tree

16 files changed

+43
-42
lines changed

16 files changed

+43
-42
lines changed

‎README.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ from the `file` menu.
110110

111111
== Contributing
112112

113-
:spring-cloud-build-branch: master
113+
:spring-cloud-build-branch: 3.1.x
114114

115115
Spring Cloud is released under the non-restrictive Apache 2.0 license,
116116
and follows a very standard Github development process, using Github
@@ -127,7 +127,7 @@ author credit if we do. Active contributors might be asked to join the core tea
127127
given the ability to merge pull requests.
128128

129129
=== Code of Conduct
130-
This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of
130+
This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/3.1.x/docs/src/main/asciidoc/code-of-conduct.adoc[code of
131131
conduct]. By participating, you are expected to uphold this code. Please report
132132
unacceptable behavior to [email protected].
133133

@@ -138,7 +138,7 @@ added after the original pull request but before a merge.
138138
* Use the Spring Framework code format conventions. If you use Eclipse
139139
you can import formatter settings using the
140140
`eclipse-code-formatter.xml` file from the
141-
https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
141+
https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
142142
Cloud Build] project. If using IntelliJ, you can use the
143143
https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
144144
Plugin] to import the same file.
@@ -234,7 +234,7 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i
234234
It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
235235

236236
```bash
237-
$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig
237+
$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/.editorconfig -o .editorconfig
238238
$ touch .springformat
239239
```
240240

@@ -243,7 +243,7 @@ $ touch .springformat
243243
==== Intellij IDEA
244244

245245
In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
246-
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.
246+
The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/3.1.x/spring-cloud-build-tools[Spring Cloud Build] project.
247247

248248
.spring-cloud-build-tools/
249249
----
@@ -282,10 +282,10 @@ To have Intellij work with Checkstyle, you have to install the `Checkstyle` plug
282282

283283
image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle]
284284

285-
Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
285+
Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
286286

287-
- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
288-
- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
287+
- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
288+
- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
289289
- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
290290

291291
IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.

‎docs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.cloud</groupId>
88
<artifactId>spring-cloud-gateway</artifactId>
9-
<version>3.1.10-SNAPSHOT</version>
9+
<version>3.1.10</version>
1010
</parent>
1111
<artifactId>spring-cloud-gateway-docs</artifactId>
1212
<packaging>jar</packaging>

‎docs/src/main/asciidoc/_configprops.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@
134134
|spring.cloud.gateway.routes | | List of Routes.
135135
|spring.cloud.gateway.set-status.original-status-header-name | | The name of the header which contains http code of the proxied request.
136136
|spring.cloud.gateway.streaming-media-types | |
137+
|spring.cloud.gateway.trusted-proxies | | Regular expression defining proxies that are trusted when they appear in a Forwarded or X-Forwarded header.
137138
|spring.cloud.gateway.x-forwarded.enabled | `+++true+++` | If the XForwardedHeadersFilter is enabled.
138139
|spring.cloud.gateway.x-forwarded.for-append | `+++true+++` | If appending X-Forwarded-For as a list is enabled.
139140
|spring.cloud.gateway.x-forwarded.for-enabled | `+++true+++` | If X-Forwarded-For is enabled.

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.springframework.cloud</groupId>
88
<artifactId>spring-cloud-gateway</artifactId>
9-
<version>3.1.10-SNAPSHOT</version>
9+
<version>3.1.10</version>
1010
<packaging>pom</packaging>
1111

1212
<name>Spring Cloud Gateway</name>
@@ -54,8 +54,8 @@
5454
<blockhound.version>1.0.6.RELEASE</blockhound.version>
5555
<java.version>1.8</java.version>
5656
<junit-pioneer.version>1.0.0</junit-pioneer.version>
57-
<spring-cloud-circuitbreaker.version>2.1.8-SNAPSHOT</spring-cloud-circuitbreaker.version>
58-
<spring-cloud-commons.version>3.1.8-SNAPSHOT</spring-cloud-commons.version>
57+
<spring-cloud-circuitbreaker.version>2.1.8</spring-cloud-circuitbreaker.version>
58+
<spring-cloud-commons.version>3.1.9</spring-cloud-commons.version>
5959
<testcontainers.version>1.17.6</testcontainers.version>
6060
<kotlin-maven-plugin.version>1.6.21</kotlin-maven-plugin.version>
6161
</properties>

‎spring-cloud-gateway-dependencies/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<parent>
77
<artifactId>spring-cloud-dependencies-parent</artifactId>
88
<groupId>org.springframework.cloud</groupId>
9-
<version>3.1.10-SNAPSHOT</version>
9+
<version>3.1.9</version>
1010
<relativePath/>
1111
</parent>
1212

1313
<artifactId>spring-cloud-gateway-dependencies</artifactId>
14-
<version>3.1.10-SNAPSHOT</version>
14+
<version>3.1.10</version>
1515
<packaging>pom</packaging>
1616

1717
<name>spring-cloud-gateway-dependencies</name>

‎spring-cloud-gateway-integration-tests/grpc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>org.springframework.cloud</groupId>
1919
<artifactId>spring-cloud-gateway-integration-tests</artifactId>
20-
<version>3.1.10-SNAPSHOT</version>
20+
<version>3.1.10</version>
2121
<relativePath>..</relativePath> <!-- lookup parent from repository -->
2222
</parent>
2323

‎spring-cloud-gateway-integration-tests/http2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.springframework.cloud</groupId>
1818
<artifactId>spring-cloud-gateway-integration-tests</artifactId>
19-
<version>3.1.10-SNAPSHOT</version>
19+
<version>3.1.10</version>
2020
<relativePath>..</relativePath> <!-- lookup parent from repository -->
2121
</parent>
2222

‎spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.springframework.cloud</groupId>
1818
<artifactId>spring-cloud-gateway-integration-tests</artifactId>
19-
<version>3.1.10-SNAPSHOT</version>
19+
<version>3.1.10</version>
2020
<relativePath>..</relativePath> <!-- lookup parent from repository -->
2121
</parent>
2222

‎spring-cloud-gateway-integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.springframework.cloud</groupId>
1818
<artifactId>spring-cloud-gateway</artifactId>
19-
<version>3.1.10-SNAPSHOT</version>
19+
<version>3.1.10</version>
2020
<relativePath>..</relativePath> <!-- lookup parent from repository -->
2121
</parent>
2222

‎spring-cloud-gateway-mvc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.cloud</groupId>
1313
<artifactId>spring-cloud-gateway</artifactId>
14-
<version>3.1.10-SNAPSHOT</version>
14+
<version>3.1.10</version>
1515
<relativePath>..</relativePath>
1616
</parent>
1717

‎spring-cloud-gateway-sample/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.springframework.cloud</groupId>
1818
<artifactId>spring-cloud-gateway</artifactId>
19-
<version>3.1.10-SNAPSHOT</version>
19+
<version>3.1.10</version>
2020
<relativePath>..</relativePath> <!-- lookup parent from repository -->
2121
</parent>
2222

‎spring-cloud-gateway-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>spring-cloud-gateway</artifactId>
10-
<version>3.1.10-SNAPSHOT</version>
10+
<version>3.1.10</version>
1111
<relativePath>..</relativePath> <!-- lookup parent from repository -->
1212
</parent>
1313
<artifactId>spring-cloud-gateway-server</artifactId>

‎spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/DefaultNettyHttpForwardedHeaderHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ final class DefaultNettyHttpForwardedHeaderHandler implements BiFunction<Connect
7171
@Deprecated
7272
static final String FORWARDED_HEADER_VALIDATION = "reactor.netty.http.server.forwarded.strictValidation";
7373
static final boolean DEFAULT_FORWARDED_HEADER_VALIDATION = Boolean
74-
.parseBoolean(System.getProperty(FORWARDED_HEADER_VALIDATION, "true"));
74+
.parseBoolean(System.getProperty(FORWARDED_HEADER_VALIDATION, "true"));
7575

7676
@Override
7777
public ConnectionInfo apply(ConnectionInfo connectionInfo, HttpRequest request) {
@@ -114,8 +114,8 @@ private ConnectionInfo parseXForwardedInfo(ConnectionInfo connectionInfo, HttpRe
114114
String hostHeader = request.headers().get(X_FORWARDED_HOST_HEADER);
115115
if (hostHeader != null) {
116116
connectionInfo = connectionInfo
117-
.withHostAddress(AddressUtils.parseAddress(hostHeader.split(",", 2)[0].trim(),
118-
getDefaultHostPort(connectionInfo.getScheme()), DEFAULT_FORWARDED_HEADER_VALIDATION));
117+
.withHostAddress(AddressUtils.parseAddress(hostHeader.split(",", 2)[0].trim(),
118+
getDefaultHostPort(connectionInfo.getScheme()), DEFAULT_FORWARDED_HEADER_VALIDATION));
119119
}
120120

121121
String portHeader = request.headers().get(X_FORWARDED_PORT_HEADER);

‎spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayAutoConfigurationTests.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -352,27 +352,27 @@ public void customHttpClientWorks() {
352352
@Test
353353
public void forwardedHeaderFiltersNotEnabledByDefault() {
354354
new ReactiveWebApplicationContextRunner()
355-
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, MetricsAutoConfiguration.class,
356-
SimpleMetricsExportAutoConfiguration.class, GatewayAutoConfiguration.class,
357-
ServerPropertiesConfig.class))
358-
.run(context -> {
359-
assertThat(context).doesNotHaveBean(XForwardedHeadersFilter.class)
360-
.doesNotHaveBean(ForwardedHeadersFilter.class);
361-
});
355+
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, MetricsAutoConfiguration.class,
356+
SimpleMetricsExportAutoConfiguration.class, GatewayAutoConfiguration.class,
357+
ServerPropertiesConfig.class))
358+
.run(context -> {
359+
assertThat(context).doesNotHaveBean(XForwardedHeadersFilter.class)
360+
.doesNotHaveBean(ForwardedHeadersFilter.class);
361+
});
362362
}
363363

364364
@Test
365365
public void forwardedHeaderFiltersEnabledWithProperties() {
366366
new ReactiveWebApplicationContextRunner()
367-
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, MetricsAutoConfiguration.class,
368-
SimpleMetricsExportAutoConfiguration.class, GatewayAutoConfiguration.class,
369-
ServerPropertiesConfig.class))
370-
.withPropertyValues("spring.cloud.gateway.forwarded.enabled=true",
371-
"spring.cloud.gateway.x-forwarded.enabled=true", "spring.cloud.gateway.trusted-proxies=.*")
372-
.run(context -> {
373-
assertThat(context).hasSingleBean(XForwardedHeadersFilter.class)
374-
.hasSingleBean(ForwardedHeadersFilter.class);
375-
});
367+
.withConfiguration(AutoConfigurations.of(WebFluxAutoConfiguration.class, MetricsAutoConfiguration.class,
368+
SimpleMetricsExportAutoConfiguration.class, GatewayAutoConfiguration.class,
369+
ServerPropertiesConfig.class))
370+
.withPropertyValues("spring.cloud.gateway.forwarded.enabled=true",
371+
"spring.cloud.gateway.x-forwarded.enabled=true", "spring.cloud.gateway.trusted-proxies=.*")
372+
.run(context -> {
373+
assertThat(context).hasSingleBean(XForwardedHeadersFilter.class)
374+
.hasSingleBean(ForwardedHeadersFilter.class);
375+
});
376376
}
377377

378378
@Configuration

‎spring-cloud-gateway-webflux/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.cloud</groupId>
1313
<artifactId>spring-cloud-gateway</artifactId>
14-
<version>3.1.10-SNAPSHOT</version>
14+
<version>3.1.10</version>
1515
<relativePath>..</relativePath>
1616
</parent>
1717

‎spring-cloud-starter-gateway/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.cloud</groupId>
88
<artifactId>spring-cloud-gateway</artifactId>
9-
<version>3.1.10-SNAPSHOT</version>
9+
<version>3.1.10</version>
1010
<relativePath>..</relativePath> <!-- lookup parent from repository -->
1111
</parent>
1212
<artifactId>spring-cloud-starter-gateway</artifactId>

0 commit comments

Comments
 (0)