Andy Wilkinson
43d623e696
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27527
2021-07-29 18:47:31 +01:00
Andy Wilkinson
7eb5f35f2f
Make WebTestClient creation back off when no HTTP client available
...
Fixes gh-27520
2021-07-29 18:45:53 +01:00
Andy Wilkinson
533bb24b55
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27525
2021-07-29 17:42:26 +01:00
Andy Wilkinson
ad2d9c0ab1
Customize Cassandra's configuration to reduce container startup time
...
Closes gh-27524
2021-07-29 17:33:56 +01:00
Andy Wilkinson
85054723f0
Reinstate GradleProjectBuilder for compatibility with JDK17-ea32
...
See gh-27521
2021-07-29 17:22:59 +01:00
Andy Wilkinson
ca5af2d456
Test our Gradle plugin against Gradle 7.2-rc-1
...
Closes gh-27521
2021-07-29 12:05:14 +01:00
Stephane Nicoll
f2f4a40a2d
Upgrade Ubuntu version in CI images
...
Closes gh-27517
2021-07-29 07:12:27 +02:00
Stephane Nicoll
dc07e67e6e
Merge branch '2.4.x' into 2.5.x
2021-07-29 07:11:33 +02:00
Stephane Nicoll
08006c2894
Upgrade Ubuntu version in CI images
...
Closes gh-27519
2021-07-29 07:11:14 +02:00
Stephane Nicoll
e02da55d6d
Merge branch '2.3.x' into 2.4.x
2021-07-29 07:10:31 +02:00
Stephane Nicoll
9c71e92c37
Upgrade Ubuntu version in CI images
...
Closes gh-27518
2021-07-29 07:10:13 +02:00
Andy Wilkinson
30f63cc0cf
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27510
2021-07-27 14:37:16 +01:00
Andy Wilkinson
ade922baec
Stabilize LiveReloadServerTests
...
Closes gh-27503
2021-07-27 14:36:31 +01:00
Andy Wilkinson
08e26c97aa
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27505
2021-07-27 11:02:20 +01:00
Andy Wilkinson
031a036c9f
Customize security filter registration in separate management context
...
Fixes gh-27372
2021-07-27 10:57:38 +01:00
Stephane Nicoll
c624421475
Merge branch '2.4.x' into 2.5.x
2021-07-27 08:59:07 +02:00
Stephane Nicoll
6d0f5d5f21
Upgrade to Spring Integration 5.4.9
...
Closes gh-27500
2021-07-27 08:48:10 +02:00
Stephane Nicoll
d31653e3c3
Upgrade to Spring Kafka 2.6.10
...
Closes gh-27501
2021-07-27 08:47:52 +02:00
Andy Wilkinson
4e30265334
Merge branch '2.4.x' into 2.5.x
2021-07-26 19:54:38 +01:00
Andy Wilkinson
4247131192
Start building against Spring Integration 5.4.9 snapshots
...
See gh-27500
2021-07-26 19:53:51 +01:00
Andy Wilkinson
9127588082
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27497
2021-07-26 15:36:52 +01:00
Andy Wilkinson
ea6cb74ccf
Ignore Spring Boot when finding dependency upgrades
...
Closes gh-27447
2021-07-26 15:36:08 +01:00
Andy Wilkinson
04dc62904f
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27495
2021-07-26 15:23:17 +01:00
Andy Wilkinson
5d9da7206e
Limit use of deprecated mainClassName in Gradle plugin tests
...
Closes gh-27320
2021-07-26 15:21:44 +01:00
Andy Wilkinson
c45ccb3a37
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27492
2021-07-26 14:25:52 +01:00
Andy Wilkinson
aebe52853f
Switch from vito/oci-build-task to concourse/oci-build-task
...
Closes gh-27421
2021-07-26 14:19:05 +01:00
Andy Wilkinson
1bf466702b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27490
2021-07-26 13:53:31 +01:00
Andy Wilkinson
0326fa47b7
Make DataJpaTestSchemaCredentialsIntegrationTests create the schema
...
Closes gh-26106
2021-07-26 13:51:23 +01:00
Andy Wilkinson
a71d19bce7
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27488
2021-07-26 11:26:08 +01:00
Andy Wilkinson
f91604eb72
Merge pull request #27482 from billyto
...
* gh-27482:
Polish "Sanitize URIs with non-alpha characters in their schemes"
Sanitize URIs with non-alpha characters in their schemes
Closes gh-27482
2021-07-26 11:25:58 +01:00
Andy Wilkinson
388068cdff
Polish "Sanitize URIs with non-alpha characters in their schemes"
...
See gh-27482
2021-07-26 11:13:58 +01:00
Billy Tobon
bafa9c4784
Sanitize URIs with non-alpha characters in their schemes
...
See gh-27482
2021-07-26 11:03:18 +01:00
Andy Wilkinson
dead33a90a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27484
2021-07-24 09:44:18 +01:00
Andy Wilkinson
cff1827e27
Stabilize socketChannelClosedTriggersTunnelClose
...
Closes gh-27483
2021-07-24 09:43:41 +01:00
Andy Wilkinson
3e1f992a51
Merge branch '2.4.x' into 2.5.x
2021-07-23 19:45:27 +01:00
Andy Wilkinson
14db8aec95
Skip server tests on Java 16 as Gradle Plugin is not available
...
See gh-27476
2021-07-23 19:44:29 +01:00
Andy Wilkinson
27ae302905
Merge branch '2.4.x' into 2.5.x
2021-07-23 17:40:20 +01:00
Andy Wilkinson
931409cdd4
Update copyright header in changed files
2021-07-23 17:39:55 +01:00
Andy Wilkinson
bd3aec4f80
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27478
2021-07-23 17:30:27 +01:00
Andy Wilkinson
d9a24f32b4
Rework spring-boot-server-tests to avoid using Maven
...
Closes gh-27476
2021-07-23 17:30:07 +01:00
Andy Wilkinson
eaca9c7a83
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27473
2021-07-23 13:09:27 +01:00
Andy Wilkinson
ee07d6c3ca
Increase response timeout for server-bound WebTestClients
...
Closes gh-27472
2021-07-23 13:06:25 +01:00
Andy Wilkinson
589a22eb0d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27470
2021-07-23 11:02:24 +01:00
Andy Wilkinson
9e81fb3e38
Fix race condition in Jetty graceful shutdown tests
...
Some of the Jetty graceful shutdown tests were flaky due to the way
in which Jetty behaves when it is stopped.
Stopping the Jetty web server interrupts the thread that's handling
the active request. This initiates a race between the request-handling
thread which will decrement the number of active requests and the
main thread which expects an active request to cause the shutdown
result to be REQUESTS_ACTIVE. The test passes when the main thread
wins and fails as a request is active which it's checked. When the
request-handling thread wins the test fails as the count of active
requests has been deprecated before it is checked.
The blocking servlet that's used to stall a request and keep it
active needs to be updated to ignore the thread being interrupted
and continue waiting. This will ensure that a request remains active
until the main thread has checked the active request count and
determine the result of the shutdown.
Closes gh-27464
2021-07-23 10:30:17 +01:00
Phillip Webb
807582ec06
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27466
2021-07-22 18:07:18 -07:00
Phillip Webb
8ebeedbf93
Upgrade to Artifactory Resource 0.0.17
...
Closes gh-27465
2021-07-22 18:05:50 -07:00
Andy Wilkinson
4b74399486
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27462
2021-07-22 15:40:11 +01:00
Andy Wilkinson
62db4c76f1
Fix problems with gradle-plugin-publishing
...
Closes gh-27461
2021-07-22 15:39:46 +01:00
Spring Buildmaster
2400e4e591
Next development version (v2.5.4-SNAPSHOT)
2021-07-22 13:51:31 +00:00
Andy Wilkinson
e2c6929d2b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27459
2021-07-22 12:14:21 +01:00