Commit Graph

42255 Commits

Author SHA1 Message Date
Scott Frederick eeeb2ad72a Merge branch '2.7.x' into 3.0.x
Closes gh-36049
2023-06-23 15:19:44 -06:00
Scott Frederick 5ecca4be36 Merge pull request #35986 from izeye
* gh-35986:
  Remove redundant Files.delete() calls in tests

Closes gh-35986
2023-06-23 15:19:16 -06:00
Johnny Lim 4a2c9d99dc Remove redundant Files.delete() calls in tests
See gh-35986
2023-06-23 15:14:59 -06: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
Andy Wilkinson de9f249ef9 Merge branch '2.7.x' into 3.0.x 2023-06-22 14:12:21 +01: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 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 9db3c5a2f7 Polish 2023-06-22 00:24:39 -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 5c8ed944ca Start building against Spring WS 4.0.5 snapshots
See gh-36010
2023-06-21 16:49:12 -07: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
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 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 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 35ee52275e Upgrade to Spring Integration 6.0.6
Closes gh-35740
2023-06-21 11:06:49 +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
Stephane Nicoll 0c46af9452 Merge branch '2.7.x' into 3.0.x 2023-06-20 17:46:03 +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
Stephane Nicoll e7f6faf6ae Upgrade to Hazelcast 5.1.7
Closes gh-35989
2023-06-20 16:59:23 +02:00
Stephane Nicoll cb5330fd11 Upgrade to Spring Session Bom 2021.2.2
Closes gh-35731
2023-06-20 16:57:04 +02:00
Stephane Nicoll b0af370038 Upgrade to Spring Security 5.7.9
Closes gh-35730
2023-06-20 16:57:03 +02:00
Stephane Nicoll f206f1807f Upgrade to Netty 4.1.94.Final
Closes gh-35988
2023-06-20 16:57:03 +02:00
Stephane Nicoll 0dd93de05d Upgrade to Hazelcast 5.1.7
Closes gh-35987
2023-06-20 16:56:56 +02:00
Moritz Halbritter 975e2d110c Polish CompositePropagationFactory
Remove shaded Guava import
2023-06-19 21:03:05 +02:00
Stephane Nicoll 0a23e724ee Merge branch '2.7.x' into 3.0.x 2023-06-17 17:17:31 +02:00
Stephane Nicoll 607c155d4c Upgrade to Spring Retry 2.0.2
Closes gh-35742
2023-06-17 17:14:33 +02:00
Stephane Nicoll 3194edefbd Upgrade to Spring LDAP 3.0.4
Closes gh-35741
2023-06-17 17:14:32 +02:00
Stephane Nicoll 381857b3d3 Upgrade to Spring Data Bom 2022.0.7
Closes gh-35738
2023-06-17 17:14:32 +02:00
Stephane Nicoll 33341f241d Upgrade to Spring Data Bom 2021.2.13
Closes gh-35728
2023-06-17 17:03:11 +02:00
Stephane Nicoll b4b6477899 Upgrade to Spring AMQP 2.4.13
Closes gh-35727
2023-06-17 17:03:10 +02:00
Phillip Webb af846da69b Merge branch '2.7.x' into 3.0.x
Closes gh-35933
2023-06-16 16:14:52 -07:00
Phillip Webb efa072204a Don't migrate properties that cause a circular reference
Update `PropertiesMigrationReporter` so that properties are only
migrated automatically when they don't cause a circular reference.

Fixes gh-35919
2023-06-16 16:14:41 -07:00
Phillip Webb 2f39ebfe89 Polish 2023-06-16 15:23:12 -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
Scott Frederick fbba2df7bf Enable Gradle plugin tests on Java 20
Closes gh-35931
2023-06-16 16:10:24 -05:00