Commit Graph

47291 Commits

Author SHA1 Message Date
Andy Wilkinson 849da0147d Upgrade to Spring Framework 6.1.5
Closes gh-39883
2024-03-15 16:25:29 +00:00
Andy Wilkinson abcf41e808 Upgrade to Spring Data Bom 2023.1.4
Closes gh-39882
2024-03-15 16:25:28 +00:00
Andy Wilkinson fadbca7f75 Merge branch '3.1.x' into 3.2.x 2024-03-15 16:20:57 +00:00
Andy Wilkinson c71d58f9f1 Upgrade to Spring HATEOAS 2.1.4
Closes gh-39949
2024-03-15 16:20:44 +00:00
Andy Wilkinson 323a88311f Upgrade to Spring Framework 6.0.18
Closes gh-39874
2024-03-15 16:20:39 +00:00
Andy Wilkinson b7fd2fa4ac Upgrade to Spring Data Bom 2023.0.10
Closes gh-39873
2024-03-15 16:20:38 +00:00
Andy Wilkinson f2ddf1c082 Merge branch '3.1.x' into 3.2.x
While the bug fixed in 3.1.x (gh-39942) has already been addressed as
a side-effect of the changes made in dbb24286, the change is merged
forwards here to improve the consistency of the code between branches.
2024-03-15 15:42:47 +00:00
Andy Wilkinson 81dc0cc3cf Eliminate race condition in Tomcat's graceful shutdown
There was a race condition between the thread that's waiting for
Tomcat to become inactive or the graceful shutdown to be aborted
and the thread that aborts the shutdown and stops Tomcat when the
grace period has elapsed. This race can lead to Tomcat appearing
to have become inactive before the abort of the shutdown is
noticed. When this happens, the result of the shutdown is reported
as IDLE when it should have been REQUESTS_ACTIVE. The consequences
of this are mostly benign although it does affect the log messages
that are emitted. It is also causing some of our graceful shutdown
tests to be flaky.

This commit eliminates the race condition by considering the
state of the aborted flag before logging and returning the result
of the shutdown.

Closes gh-39942
2024-03-15 15:30:41 +00:00
Moritz Halbritter d2e9d6668d Merge pull request #39946 from onobc
* pr/39946:
  Re-enable Spring Pulsar interceptor tests

Closes gh-39946
2024-03-15 11:22:32 +01:00
Chris Bono ac0d1e0ec6 Re-enable Spring Pulsar interceptor tests
The PulsarTemplate recently replaced its list of ProducerInterceptors
with a list of ProducerBuilderCustomizers that customize the builder by
adding each interceptor to the builder. The PulsarAutoConfigurationTests
previosuly relied on the previous field. This commit adjusts the tests
to instead use the Customizers testing utility to verify the
interceptors.

(cherry picked from commit 9c054a021f)

See gh-39946
2024-03-15 11:00:09 +01:00
Scott Frederick f324994065 Merge branch '3.1.x' into 3.2.x
Closes gh-39846
2024-03-13 15:20:55 -05:00
Scott Frederick c83f7017c8 Upgrade CI images to ubuntu:jammy-20240227
Closes gh-39844
2024-03-13 15:20:41 -05:00
Scott Frederick 81e949d337 Merge branch '3.1.x' into 3.2.x
Closes gh-39938
2024-03-13 15:14:05 -05:00
Scott Frederick db3d282409 Upgrade CI to Docker 25.0.4
Closes gh-39937
2024-03-13 15:13:49 -05:00
Andy Wilkinson 801949303b Upgrade to Neo4j Java Driver 5.18.0
Closes gh-39936
2024-03-13 19:16:36 +00:00
Andy Wilkinson e5f571d2d2 Merge branch '3.1.x' into 3.2.x 2024-03-13 19:14:44 +00:00
Andy Wilkinson 781b14cffd Upgrade to Neo4j Java Driver 5.18.0
Closes gh-39935
2024-03-13 19:14:34 +00:00
Andy Wilkinson e2d53fa0e9 Ensure that Maven Plugin uses a consistent Framework dependency version
Fixes gh-39927
2024-03-13 18:38:38 +00:00
Andy Wilkinson 978c7d8fdc Start building against Spring Authorization Server 1.2.3 snapshots
See gh-39915
2024-03-12 20:47:02 +00:00
Andy Wilkinson db2a7865df Merge branch '3.1.x' into 3.2.x 2024-03-12 20:45:55 +00:00
Andy Wilkinson e170d0652e Start building against Spring Authorization Server 1.1.6 snapshots
See gh-39914
2024-03-12 19:18:32 +00:00
Andy Wilkinson 5dcebc33bc Upgrade to Reactor Bom 2023.0.4
Closes gh-39907
2024-03-12 11:43:03 +00:00
Andy Wilkinson 1de33a582b Upgrade to Micrometer Tracing 1.2.4
Closes gh-39880
2024-03-12 11:42:58 +00:00
Andy Wilkinson 9b792d7e9e Upgrade to Micrometer 1.12.4
Closes gh-39879
2024-03-12 11:42:58 +00:00
Andy Wilkinson ca4d103bb8 Merge branch '3.1.x' into 3.2.x 2024-03-12 11:39:29 +00:00
Andy Wilkinson 4af8f97a00 Upgrade to Reactor Bom 2022.0.17
Closes gh-39906
2024-03-12 11:39:17 +00:00
Andy Wilkinson 3e25933779 Upgrade to Micrometer Tracing 1.1.11
Closes gh-39871
2024-03-12 11:39:12 +00:00
Andy Wilkinson de086cd650 Upgrade to Micrometer 1.11.10
Closes gh-39870
2024-03-12 11:39:11 +00:00
Andy Wilkinson 004236becf Merge branch '3.1.x' into 3.2.x 2024-03-12 11:30:53 +00:00
Andy Wilkinson 5910d1d7a4 Update build badge to point to GitHub Actions
See gh-39851
2024-03-12 11:27:40 +00:00
Andy Wilkinson e7751d161e Start building against Spring Session 3.2.2 snapshots
See gh-39888
2024-03-11 19:07:04 +00:00
Andy Wilkinson 27442d285e Start building against Spring Security 6.2.3 snapshots
See gh-39887
2024-03-11 19:07:00 +00:00
Andy Wilkinson bcd8d3f4a0 Start building against Spring Pulsar 1.0.4 snapshots
See gh-39886
2024-03-11 19:06:55 +00:00
Andy Wilkinson 04a249b1e8 Start building against Spring Kafka 3.1.3 snapshots
See gh-39885
2024-03-11 19:06:51 +00:00
Andy Wilkinson 552046998f Start building against Spring Integration 6.2.3 snapshots
See gh-39884
2024-03-11 19:06:46 +00:00
Andy Wilkinson f7da605120 Start building against Spring Framework 6.1.5 snapshots
See gh-39883
2024-03-11 19:06:42 +00:00
Andy Wilkinson 15069a759c Start building against Spring Data Bom 2023.1.4 snapshots
See gh-39882
2024-03-11 19:06:37 +00:00
Andy Wilkinson 2dd6358d28 Start building against Spring AMQP 3.1.3 snapshots
See gh-39881
2024-03-11 19:06:33 +00:00
Andy Wilkinson 4c5edb51ba Start building against Micrometer Tracing 1.2.4 snapshots
See gh-39880
2024-03-11 19:06:28 +00:00
Andy Wilkinson 7ff74821ce Start building against Micrometer 1.12.4 snapshots
See gh-39879
2024-03-11 19:06:24 +00:00
Andy Wilkinson 8c0751f9b7 Merge branch '3.1.x' into 3.2.x 2024-03-11 18:12:43 +00:00
Andy Wilkinson c67be7635f Start building against Spring Session 3.1.5 snapshots
See gh-39878
2024-03-11 17:22:46 +00:00
Andy Wilkinson 15b687c889 Start building against Spring Security 6.1.8 snapshots
See gh-39877
2024-03-11 17:22:41 +00:00
Andy Wilkinson 7a511c2a10 Start building against Spring Kafka 3.0.15 snapshots
See gh-39876
2024-03-11 17:22:36 +00:00
Andy Wilkinson b978188096 Start building against Spring Integration 6.1.7 snapshots
See gh-39875
2024-03-11 17:22:32 +00:00
Andy Wilkinson 53cb242f8c Start building against Spring Framework 6.0.18 snapshots
See gh-39874
2024-03-11 17:22:28 +00:00
Andy Wilkinson bfe37b3630 Start building against Spring Data Bom 2023.0.10 snapshots
See gh-39873
2024-03-11 17:22:22 +00:00
Andy Wilkinson 4ad7f22188 Start building against Spring AMQP 3.0.12 snapshots
See gh-39872
2024-03-11 17:22:18 +00:00
Andy Wilkinson 9ae375f818 Start building against Micrometer Tracing 1.1.11 snapshots
See gh-39871
2024-03-11 17:22:13 +00:00
Andy Wilkinson 339bb3a44c Start building against Micrometer 1.11.10 snapshots
See gh-39870
2024-03-11 17:22:09 +00:00