4830 Commits

Author SHA1 Message Date
Andy Wilkinson
ba8b1717fb Merge branch '3.0.x' into 3.1.x
Closes gh-36099
2023-06-27 20:30:47 +01:00
Andy Wilkinson
79cd3a027a Merge branch '2.7.x' into 3.0.x
Closes gh-36098
2023-06-27 20:30:24 +01:00
Andy Wilkinson
9e1f2c4257 Tolerate Flway 9.20
Closes gh-36029
2023-06-27 20:22:24 +01:00
Andy Wilkinson
98d459d76c Revert "Merge branch '3.1.x'"
See gh-36092
2023-06-27 14:16:20 +01:00
Andy Wilkinson
6851904651 Merge branch '3.1.x'
Closes gh-36092
2023-06-27 14:03:09 +01:00
Andy Wilkinson
9a57611ef5 Merge branch '3.0.x' into 3.1.x
Closes gh-36091
2023-06-27 14:02:57 +01:00
Andy Wilkinson
ffbef7bb80 Test server.max-http-request-header-size with Undertow
Closes gh-36047
2023-06-27 13:50:04 +01:00
Andy Wilkinson
b645eb32ac Remove deprecated code that was to be removed in 3.2
Closes gh-36034
2023-06-23 18:14:22 +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
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
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
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
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
1e17d8eeea Upgrade to Liquibase 4.22.0
Closes gh-35956
2023-06-19 16:30:52 +01:00
Andy Wilkinson
454aae92d6 Upgrade to Flyway 9.19.4
Closes gh-35948
2023-06-19 16:07:41 +01:00
Phillip Webb
23eb7ec1f8 Merge branch '3.1.x' 2023-06-16 14:35:44 -07:00
Phillip Webb
5d6a507142 Merge branch '3.0.x' into 3.1.x 2023-06-16 14:35:23 -07:00
Phillip Webb
48e13af8c4 Merge branch '2.7.x' into 3.0.x 2023-06-16 14:34:54 -07:00
Phillip Webb
b8d2c279ee Update copyright year of changed files 2023-06-16 14:32:43 -07:00
Phillip Webb
854b29b8fb Polish 2023-06-16 14:32:14 -07:00
Phillip Webb
13f16da716 Merge branch '3.1.x' 2023-06-16 14:00:12 -07:00
Phillip Webb
baddf4c857 Merge branch '3.0.x' into 3.1.x 2023-06-16 13:54:01 -07:00
Jonatan Ivanov
85934c3919
Merge branch '3.1.x'
Closes gh-35930
2023-06-16 13:03:08 -07:00
Johnny Lim
06157837e5
Polish
See gh-35872
2023-06-16 12:39:03 -07:00
Phillip Webb
691b549e36 Merge branch '2.7.x' into 3.0.x 2023-06-16 10:18:43 -07:00
Phillip Webb
f3f8610539 Polish 2023-06-16 10:17:08 -07:00
Andy Wilkinson
2c06f274dc Merge branch '3.1.x' 2023-06-15 12:21:08 +01:00
Andy Wilkinson
cb36df47c8 Merge branch '3.0.x' into 3.1.x
Closes gh-35905
2023-06-15 12:20:55 +01:00
Andy Wilkinson
6def7252d6 Merge branch '2.7.x' into 3.0.x
Closes gh-35904
2023-06-15 12:20:27 +01:00
Andy Wilkinson
088006ff60 Use ephemeral port for Hazelcast
When Hazelcast is started on a fixed port and that port is already in
use, it does not fail to start which makes the problem hard to
detect. A symptom of the problem is that clients will not be able to
connect and will either retry indefinitely or will timeout depending
on their configuration.

This commit updates the Hazelcast client tests to start the Hazelcast
instance on an ephemeral port and to customize the client
configuration with the instance's address before use. This should
allow the client tests to work reliably in an environment where
Hazelcast's default port is already in use.

Closes gh-35903
2023-06-15 12:19:34 +01:00
Moritz Halbritter
140c37ceba Enable virtual threads on Jetty
Closes gh-35703
2023-06-15 11:01:11 +02:00
Moritz Halbritter
3e4a9f5204 Add property to limit maximum connections for Jetty
Closes gh-35899
2023-06-15 09:42:51 +02:00
Moritz Halbritter
f81787e65d Enable virtual threads on Tomcat
Closes gh-35704
2023-06-15 08:30:09 +02:00
Moritz Halbritter
6e604ad65c Implement @ConditionalOnVirtualThreads
Closes gh-35892
2023-06-15 08:30:09 +02:00
Scott Frederick
4950e2a6b7 Merge branch '3.1.x' 2023-06-13 16:42:38 -05:00
Scott Frederick
7e6452edee Fix Redis URL property userinfo parsing
Fixes gh-35850
2023-06-13 16:42:19 -05:00
Stephane Nicoll
8589401b65 Merge branch '3.1.x' 2023-06-10 10:23:45 +02:00
Stephane Nicoll
27ee605f91 Upgrade to Tomcat 10.1.9
Closes gh-35819
2023-06-10 10:11:29 +02:00
Stephane Nicoll
02a601eae3 Fix checkstyle violation 2023-06-10 08:52:54 +02:00
Scott Frederick
07c57577b0 Merge branch '3.1.x' 2023-06-09 12:01:25 -05:00
Scott Frederick
767ec4e22e Support encrypted PKCS8 private keys in SSL bundles
Properties `ssl.bundle.pem.mybundle.keystore.private-key-password`
and `ssl.bundle.pem.mybundle.truststore.private-key-password` have
been added for configuring the password required to decrypt an
encrypted private key.

Only PKCS8 private keys with encryption are supported. PKCS1 and EC
private keys with encryption are much more complex to decrypt, and
are not supported.

Fixes gh-35652
2023-06-09 11:52:36 -05:00
Stephane Nicoll
261cb721e9 Fix checkstyle violation 2023-06-09 17:02:10 +02:00