Commit Graph

43287 Commits

Author SHA1 Message Date
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
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
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
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
7a2fc9e636 Fix checkstyle violation
See gh-35914
2023-06-21 12:27:56 -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
b770ffc160 Fully prepare connection when using SSL bundle
Fixes gh-36007
2023-06-21 19:05:44 +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
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
5b69580d5d Merge branch '3.0.x' into 3.1.x
Closes gh-36004
2023-06-21 12:43:48 +01:00
Andy Wilkinson
f584d6dbd9 Replace @EnableBatchProcessing in slice test examples
Using `@EnableBatchProcessing` is no longer necessary to enable
Batch's auto-configuration so it's no longer a good example when
discussing sliced tests and user configuration.

This commit replaces `@EnableBatchProcessing` with an alternative
annotation, `@EnableMongoAuditing` and updates the accompanying
text.

Closes gh-33435
2023-06-21 12:41:28 +01:00
Andy Wilkinson
660dbb9afd Fix Maven-built native images with Docker Compose dependency
Previously, we tried to prevent spring-boot-docker-compose from
causing problems with AOT and native images by excluding it from
the AOT processing classpath. This allowed AOT processing to
succeed. We cannot apply the same exclusion to the native image
classpath so spring-boot-docker-compose was still included in the
native image. This results in a failure at runtime due to missing
reflection hints.

This commit reverts that changes that excluded
spring-boot-docker-compose from the AOT processing classpath. This
allows AOT processing to generate reflection hints but reintroduces
the failure caused by the connection details bean definitions using
an instance supplier callback. To overcome this problem we disable
DockerComposeLifecycleManager during AOT processing and in a native
image. This ensures that no attempt is made to call docker compose up
and no connection details beans are defined.

Fixes gh-35676
2023-06-21 11:44:30 +01:00
Andy Wilkinson
06604ef5ed Merge branch '3.0.x' into 3.1.x 2023-06-21 11:07:00 +01:00
Andy Wilkinson
35ee52275e Upgrade to Spring Integration 6.0.6
Closes gh-35740
2023-06-21 11:06:49 +01:00
Andy Wilkinson
5384872cbd Merge branch '3.0.x' into 3.1.x
Closes gh-36003
2023-06-21 11:02:47 +01:00
Andy Wilkinson
2fd5319eda Merge branch '2.7.x' into 3.0.x
Closes gh-36002
2023-06-21 11:02:34 +01:00
Andy Wilkinson
0fb4c9a095 Prohibit upgrades to RSocket 1.1.4
Closes gh-35798
2023-06-21 10:55:48 +01:00
Andy Wilkinson
5cda56cc68 Upgrade to Spring Integration 6.1.1
Closes gh-35859
2023-06-21 10:51:42 +01:00
Andy Wilkinson
853caf9a59 Do not exclude DevTools from Maven AOT processing classpath
When excluded from the AOT processing classpath, a reflection hint
for DevTools' RestartScopeInitializer that's registered in
spring.factories is not generated. When the native image is compiled
we have no control over its classpath so DevTools is included. This
causes a failure at runtime as RestartScopeInitializer cannot be
loaded due to the missing reflection hint.

Until we have control over the native image classpath, we need to
include DevTools on the AOT processing classpath and then rely on
DevTools disabling itself in a native image which it already does.

Fixes gh-35853
2023-06-21 10:36:38 +01:00
Stephane Nicoll
9a2b9cb066 Merge branch '3.0.x' into 3.1.x 2023-06-20 17:46:14 +02:00
Stephane Nicoll
0c46af9452 Merge branch '2.7.x' into 3.0.x 2023-06-20 17:46:03 +02:00
Stephane Nicoll
75ca6030a8 Upgrade to Spring Session 3.1.1
Closes gh-35755
2023-06-20 17:29:28 +02:00
Stephane Nicoll
424e8e6924 Upgrade to Spring Security 6.1.1
Closes gh-35754
2023-06-20 17:29:28 +02:00
Stephane Nicoll
da6cbfd5fe Upgrade to Spring Kafka 3.0.8
Closes gh-36000
2023-06-20 17:29:27 +02:00
Stephane Nicoll
81f1961e27 Upgrade to Spring GraphQL 1.2.1
Closes gh-35752
2023-06-20 17:29:22 +02:00
Stephane Nicoll
a2b7fc8661 Upgrade to Spring Authorization Server 1.1.1
Closes gh-35749
2023-06-20 17:29:21 +02:00
Stephane Nicoll
8d351ffb1f Upgrade to Spring AMQP 3.0.5
Closes gh-35748
2023-06-20 17:29:21 +02:00
Stephane Nicoll
0c32ce4214 Upgrade to REST Assured 5.3.1
Closes gh-35999
2023-06-20 17:29:20 +02:00
Stephane Nicoll
a7f8b82905 Upgrade to Netty 4.1.94.Final
Closes gh-35998
2023-06-20 17:29:15 +02:00
Stephane Nicoll
b85184e358 Upgrade to Native Build Tools Plugin 0.9.23
Closes gh-35997
2023-06-20 17:29:09 +02:00
Stephane Nicoll
264c01c8db Upgrade to Infinispan 14.0.11.Final
Closes gh-35996
2023-06-20 17:29:04 +02:00
Stephane Nicoll
2815e83096 Upgrade to HttpCore5 5.2.2
Closes gh-35995
2023-06-20 17:28:58 +02:00
Stephane Nicoll
21046c0611 Upgrade to Hibernate 6.2.5.Final
Closes gh-35994
2023-06-20 17:28:53 +02:00
Stephane Nicoll
4c06dc49b3 Upgrade to Spring Session 3.0.2
Closes gh-35744
2023-06-20 16:59:47 +02:00
Stephane Nicoll
cf955671d8 Upgrade to Spring Security 6.0.4
Closes gh-35743
2023-06-20 16:59:46 +02:00
Stephane Nicoll
6066fb53ed Upgrade to Spring Kafka 3.0.8
Closes gh-35993
2023-06-20 16:59:46 +02:00
Stephane Nicoll
0b582651b3 Upgrade to Spring GraphQL 1.1.5
Closes gh-35775
2023-06-20 16:59:41 +02:00
Stephane Nicoll
1940d876c3 Upgrade to Spring AMQP 3.0.5
Closes gh-35737
2023-06-20 16:59:40 +02:00
Stephane Nicoll
a7d71a3921 Upgrade to Netty 4.1.94.Final
Closes gh-35992
2023-06-20 16:59:40 +02:00
Stephane Nicoll
b65ea1212a Upgrade to Native Build Tools Plugin 0.9.23
Closes gh-35991
2023-06-20 16:59:34 +02:00
Stephane Nicoll
3e3428af95 Upgrade to Infinispan 14.0.11.Final
Closes gh-35990
2023-06-20 16:59:29 +02:00