Commit Graph

43425 Commits

Author SHA1 Message Date
Andy Wilkinson
50d8b20d6c Re-enable forward merge issues for merges into main 2023-06-23 16:01:26 +01:00
Andy Wilkinson
357c67a999 Merge branch '3.1.x' 2023-06-23 15:58:51 +01:00
Andy Wilkinson
3f7fe25cb9 Merge branch '3.0.x' into 3.1.x
Closes gh-36044
2023-06-23 15:58:36 +01:00
Andy Wilkinson
2fae5de245 Merge branch '2.7.x' into 3.0.x
Closes gh-36043
2023-06-23 15:50:02 +01:00
Andy Wilkinson
7b0aa7dcbb Merge pull request #35915 from ThomazPassarelli
* gh-35915:
  Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
  Replace calls to verifyComplete() to avoid indefinite blocking

Closes gh-35915
2023-06-23 14:44:44 +01:00
Andy Wilkinson
d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
See gh-35915
2023-06-23 12:38:12 +01:00
ThomazPassarelli
f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking
See gh-35915
2023-06-23 12:16:26 +01:00
Moritz Halbritter
8f7fdc507e Polish CorrelationIdFormatter 2023-06-23 08:26:32 +02:00
Jonatan Ivanov
228b8eb8e4
Polish log correlation docs
Docs related to gh-33280 (log correlation) and
gh-35593 (application name in each log line) need some polishing:
- Fix project names
- Show how to avoid having the application name duplicated in logs
- Call out that a trailing space is needed in the correlation pattern

Closes gh-36035
See gh-33280
See gh-35593
2023-06-22 14:51:02 -07:00
Andy Wilkinson
89164ddf5f Merge branch '3.1.x' 2023-06-22 14:12:54 +01:00
Andy Wilkinson
e33cec5488 Merge branch '3.0.x' into 3.1.x 2023-06-22 14:12:43 +01:00
Andy Wilkinson
de9f249ef9 Merge branch '2.7.x' into 3.0.x 2023-06-22 14:12:21 +01:00
Spring Builds
efd903b0a8 Next development version (v3.1.2-SNAPSHOT) 2023-06-22 12:40:55 +00:00
Spring Builds
dbd925e9db Next development version (v3.0.9-SNAPSHOT) 2023-06-22 11:19:10 +00:00
Spring Builds
cee73cebd4 Next development version (v2.7.14-SNAPSHOT) 2023-06-22 10:00:16 +00:00
Andy Wilkinson
6f95900775 Merge branch '3.1.x' 2023-06-22 10:04:23 +01:00
Andy Wilkinson
5c53bda650 Merge branch '3.0.x' into 3.1.x
Closes gh-36025
2023-06-22 10:04:11 +01:00
Andy Wilkinson
1596f69601 Merge branch '2.7.x' into 3.0.x
Closes gh-36023
2023-06-22 10:03:46 +01:00
Andy Wilkinson
fff30efed5 Configure timeouts on staging builds
Closes gh-36022
2023-06-22 10:02:53 +01:00
Phillip Webb
493777d3c9 Include the application name on each log line when it is available
Update Logback and Log4J2 so that they include the application name on
each log line. If `spring.application.name` had not been set, or if
`logging.include-application-name` is `false` then the name is not
logged.

Closes gh-35593
2023-06-22 00:40:51 -07:00
Jonatan Ivanov
c1b295fd71 Log correlation IDs when Micrometer tracing is being used
Add support for logging correlation IDs with Logback or Log4J2 whenever
Micrometer tracing is being used.

The `LoggingSystemProperties` class now accepts a defualt value resolver
which will be used whenever a value isn't in the environment. The
`AbstractLoggingSystem` provides a resolver that supports the
`logging.pattern.correlation` property and will return a value whenever
`LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY` is set.

Using `LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY` allows us to
provide a consistent width for the correlation ID, even when it's
missing from the MDC.

The exact correlation pattern returned will depend on the `LoggingSytem`
implementation. Currently Logback and Log4J2 are supported and both
make use of a custom converter which delegates to a new
`CorrelationIdFormatter` class.

Closes gh-33280
2023-06-22 00:28:45 -07:00
Phillip Webb
b6120d504a Replace LoggingSystemProperties constants with an Enum
Extract contants from `LoggingSystemProperty` and
`LogbackLoggingSystemProperties` in enum classes.

Closes gh-36015
2023-06-22 00:28:22 -07:00
Phillip Webb
3a796aedea Merge branch '3.1.x' 2023-06-22 00:28:01 -07:00
Phillip Webb
31f218c4e0 Merge branch '3.0.x' into 3.1.x 2023-06-22 00:27:51 -07:00
Phillip Webb
9db3c5a2f7 Polish 2023-06-22 00:24:39 -07:00
Phillip Webb
16265e925d Merge branch '3.1.x' 2023-06-21 23:44:18 -07:00
Phillip Webb
8ac5dc7ea3 Merge branch '3.0.x' into 3.1.x
Closes gh-36017
2023-06-21 23:44:06 -07:00
Phillip Webb
f7af1bab5b Upgrade to Spring WS 4.0.5
Closes gh-36010
2023-06-21 23:40:28 -07:00
Phillip Webb
64525fb566 Merge branch '3.1.x' 2023-06-21 16:49:32 -07:00
Phillip Webb
eb72d7e9f1 Merge branch '3.0.x' into 3.1.x 2023-06-21 16:49:24 -07:00
Phillip Webb
5c8ed944ca Start building against Spring WS 4.0.5 snapshots
See gh-36010
2023-06-21 16:49:12 -07:00
Andy Wilkinson
9e2c32a5db Merge branch '3.1.x' 2023-06-21 20:56:47 +01:00
Andy Wilkinson
d789d3df1e Merge branch '3.0.x' into 3.1.x 2023-06-21 20:56:28 +01:00
Andy Wilkinson
86c6cc7e3a Merge branch '2.7.x' into 3.0.x 2023-06-21 20:56:14 +01:00
Andy Wilkinson
f6841c3c16 Revert "Start building against Spring WS 3.1.7 snapshots"
This reverts commit 5e963b02a7.

See gh-35732
2023-06-21 20:55:10 +01:00
Phillip Webb
212acf44f7 Merge branch '3.1.x' 2023-06-21 12:28:20 -07:00
Phillip Webb
7a2fc9e636 Fix checkstyle violation
See gh-35914
2023-06-21 12:27:56 -07:00
Phillip Webb
2ce36b15b3 Merge branch '3.1.x' 2023-06-21 12:11:07 -07:00
Phillip Webb
eb91a9270c Merge pull request #35914 from fcappi
* pr/35914:
  Polish 'Apply SslConfigurer in addition to configured mappers'
  Apply SslConfigurer in addition to configured mappers

Closes gh-35914
2023-06-21 12:10:48 -07:00
Phillip Webb
3c7fbf3423 Polish 'Apply SslConfigurer in addition to configured mappers'
See gh-35914
2023-06-21 12:10:36 -07:00
Fernando Cappi
e6b5322f3e Apply SslConfigurer in addition to configured mappers
Update `ReactorClientHttpConnectorFactory` to that SSL configuration
is applied in addition to any configured mappers.

Prior to this commit, SSL configuration would prevent configured
mappers from being applied.

See gh-35914
2023-06-21 12:10:36 -07:00
Andy Wilkinson
7f5351c7b0 Merge branch '3.1.x' 2023-06-21 19:06:32 +01:00
Andy Wilkinson
b770ffc160 Fully prepare connection when using SSL bundle
Fixes gh-36007
2023-06-21 19:05:44 +01:00
Andy Wilkinson
295702003d Merge branch '3.1.x' 2023-06-21 15:29:38 +01:00
Andy Wilkinson
7266d4863b Merge branch '3.0.x' into 3.1.x
Closes gh-36009
2023-06-21 15:29:23 +01:00
Andy Wilkinson
39c382713b Initialize WebSocket infrastructure when using WebFlux and Jetty
In Spring Framework 5.x with Jetty 9, the reactive
JettyRequestUpgradeStrategy was able to initialize Jetty's WebSocket
infrastructure itself. With Jetty 10 this is no longer possible and
Boot must perform the initialization as part of preparing the
reactive JettyWebServer.

This commit updates the reactive WebSocket auto-configuration to
initialize Jetty's WebSocket infrastructure as part of creating the
reactive JettyWebServer.

Fixes gh-33347
2023-06-21 14:59:50 +01:00
Andy Wilkinson
fc403f4f18 Merge branch '3.1.x' 2023-06-21 13:15:06 +01:00
Andy Wilkinson
d3522a78a8 Merge branch '3.0.x' into 3.1.x 2023-06-21 13:14:46 +01:00
Andy Wilkinson
641f00f24c Disable test when Java version is too high
Gradle 7.3.3 does not support Java 20 so the test that verifies that
the plugin fails fast when running on a version of Gradle that it
does not support needs to be disabled on Java 20 and later.

See gh-35931
2023-06-21 13:12:20 +01:00
Andy Wilkinson
68aec97ee7 Merge branch '3.1.x' 2023-06-21 12:44:06 +01:00