Andy Wilkinson
391b643d8d
Revert "Merge branch '3.2.x' into 3.3.x"
...
This reverts commit d86160d362 , reversing
changes made to 70d2907351 .
See gh-42388
2024-09-20 11:07:30 +01:00
Andy Wilkinson
b4702612de
Revert "Increase timeouts in ZipkinWebClientSenderTests"
...
This reverts commit 0aeea6f069 .
See gh-42375
2024-09-20 11:06:18 +01:00
Andy Wilkinson
4a7d6c445a
Merge branch '3.3.x'
...
Closes gh-42398
2024-09-20 10:33:17 +01:00
Andy Wilkinson
a1593585e3
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42397
2024-09-20 10:33:02 +01:00
Andy Wilkinson
267a642e0f
Reduce duplicate binding of meters to user-defined composites
...
Fixes gh-42396
2024-09-20 10:32:20 +01:00
Moritz Halbritter
ee322d69f1
Merge branch '3.3.x'
...
Closes gh-42394
2024-09-20 10:25:54 +02:00
Moritz Halbritter
de2defc74e
Merge pull request #42393 from quaff
...
* pr/42393:
Remove redundant @Test annotation
Closes gh-42393
2024-09-20 10:23:01 +02:00
Yanming Zhou
7c8a6740c1
Remove redundant @Test annotation
...
See gh-42393
2024-09-20 10:22:47 +02:00
Phillip Webb
84e6594770
Patch gulp-vinyl-zip to improve error messages
...
Update Antora `package.json` to patch `@vscode+gulp-vinyl-zip` in order
to provide better error messages.
See gh-42392
2024-09-19 20:02:03 -07:00
Andy Wilkinson
ba0ef11b6b
Merge branch '3.3.x'
...
Closes gh-42389
2024-09-19 19:10:06 +01:00
Andy Wilkinson
d86160d362
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42388
2024-09-19 19:09:52 +01:00
Andy Wilkinson
0aeea6f069
Increase timeouts in ZipkinWebClientSenderTests
...
This is an attempt to stabilize the tests. They are currently flaky
due to a timeout that appears to occur because the mock web server isn't
responding quickly enough. A larger timeout will either confirm this if
the tests stabilize or indicate that the problem has a different cause
if they do not stabilize.
Closes gh-42375
2024-09-19 19:06:53 +01:00
Andy Wilkinson
d380ada4b2
Merge branch '3.3.x'
...
Closes gh-42387
2024-09-19 19:06:23 +01:00
Andy Wilkinson
70d2907351
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42386
2024-09-19 19:06:12 +01:00
Andy Wilkinson
319e33f786
Make a single scrape attempt, protected by Awaitility
...
Using a single scrape attempt that is protected by Awaitility should
protect against instability of the OpenTelemetry Collector instance
running in the container and will hopefully stabilize the test.
This commit has also increased the timeout for a successful response
to 30 seconds and removed the configuration of the configuration of
the polling delay and interval as the values being set were the same
as the defaults.
Closes gh-42377
2024-09-19 19:06:05 +01:00
Andy Wilkinson
c6c4651337
Merge branch '3.3.x'
...
Closes gh-42385
2024-09-19 19:05:25 +01:00
Andy Wilkinson
7b427f4d3b
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42384
2024-09-19 19:05:12 +01:00
Andy Wilkinson
87c647cf65
Reduce log output of SampleJettyApplicationTests
...
Closes gh-42376
2024-09-19 19:04:59 +01:00
Andy Wilkinson
24a5b04c28
Merge branch '3.3.x'
...
Closes gh-42383
2024-09-19 19:04:00 +01:00
Andy Wilkinson
61ce431761
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42382
2024-09-19 19:03:11 +01:00
Andy Wilkinson
0e7bdb3e8b
Remove note about graceful shutdown requiring Tomcat 9.0.33
...
Since the note was added, we've upgraded to and now require Tomcat
10.1 so it no longer applies.
Closes gh-42373
2024-09-19 19:02:56 +01:00
Andy Wilkinson
1c65bb1d21
Merge branch '3.3.x'
...
Closes gh-42381
2024-09-19 19:02:17 +01:00
Andy Wilkinson
d4f7cb7bae
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42380
2024-09-19 19:02:03 +01:00
Andy Wilkinson
41bcda8429
Document support for Java 23
...
Closes gh-42374
2024-09-19 14:23:32 +01:00
Stéphane Nicoll
e950801afb
Merge pull request #42341 from nosan
...
* pr/42341:
Polish "Add option for configuring max messages per task"
Add option for configuring max messages per task
Closes gh-42341
2024-09-19 14:26:46 +02:00
Stéphane Nicoll
e930a963ad
Polish "Add option for configuring max messages per task"
...
See gh-42341
2024-09-19 14:19:01 +02:00
Dmytro Nosan
09b57eff76
Add option for configuring max messages per task
...
See gh-42341
2024-09-19 14:12:24 +02:00
Stéphane Nicoll
e133ea3dfc
Merge branch '3.3.x'
2024-09-19 13:46:48 +02:00
Stéphane Nicoll
ae898ed383
Next development version (v3.3.5-SNAPSHOT)
2024-09-19 13:46:37 +02:00
Andy Wilkinson
6346d4fd6b
Accommodate absence of last execution
...
A task's last execution is absent if it has not yet been executed.
This commit updates the documentation test to accommodate this
possibility.
See gh-42351
2024-09-19 12:03:04 +01:00
Andy Wilkinson
627c691616
Document the reason for deprecation of clean-on-validation-error
...
See gh-42295
2024-09-19 11:22:08 +01:00
Andy Wilkinson
814369e8b0
Enable graceful shutdown by default
...
Closes gh-37495
2024-09-19 10:58:53 +01:00
Stéphane Nicoll
543bb806bb
Merge pull request #42359 from izeye
...
* pr/42359:
Polish gh-39957 and gh-41444
Closes gh-42359
2024-09-19 11:37:44 +02:00
Johnny Lim
94e8c5db36
Polish gh-39957 and gh-41444
...
See gh-42359
2024-09-19 11:37:11 +02:00
Stéphane Nicoll
e3aac5d442
Merge branch '3.3.x'
2024-09-19 10:18:51 +02:00
Stéphane Nicoll
4e860f1f4d
Merge branch '3.2.x' into 3.3.x
2024-09-19 10:17:38 +02:00
Stéphane Nicoll
d137191494
Next development version (v3.2.11-SNAPSHOT)
2024-09-19 10:17:23 +02:00
Phillip Webb
d72a9d9eb5
Allow EndpointRequest to match additional paths
...
Add `toAdditionalPaths(...)` methods on the servlet and reactive
`EndpointRequest` classes to support matching of additional paths.
A new `AdditionalPathsMapper` interface provides the mappings between
endpoint IDs and any additional paths that they might use. The existing
`AutoConfiguredHealthEndpointGroups` class has been updated to implement
the interface.
Auto-configurations have also been updated so that additional health
endpoint paths (typically `/livez` and `/readyz`) are permitted
when using Spring Security without any custom configuration.
Fixes gh-40962
2024-09-18 23:47:13 -07:00
Phillip Webb
f5b6514bef
Allow additional context interfaces to be defined for testing
...
Update `AssertableApplicationContext` and `ApplicationContextRunner`
implementations to support additional `ApplicationContext` interfaces.
Closes gh-42369
2024-09-18 23:47:13 -07:00
Stéphane Nicoll
8ac3528b89
Upgrade to SendGrid 4.10.3
...
Closes gh-42368
2024-09-19 08:15:40 +02:00
Stéphane Nicoll
ced82a854c
Upgrade to Zipkin Reporter 3.4.2
...
Closes gh-42367
2024-09-19 08:15:36 +02:00
Stéphane Nicoll
25e45831ea
Merge branch '3.3.x'
2024-09-19 08:13:59 +02:00
Stéphane Nicoll
97dd01e28a
Upgrade to SendGrid 4.10.3
...
Closes gh-42366
2024-09-19 07:48:46 +02:00
Stéphane Nicoll
1b3b3aaef4
Upgrade to Hibernate 6.5.3.Final
...
Closes gh-42365
2024-09-19 07:48:42 +02:00
Stéphane Nicoll
c2adc3b6cb
Upgrade to Zipkin Reporter 3.4.2
...
Closes gh-42364
2024-09-19 07:48:38 +02:00
Stéphane Nicoll
1ee174167f
Merge branch '3.3.x'
...
Closes gh-42363
2024-09-19 07:44:14 +02:00
Stéphane Nicoll
0271b24e0e
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42362
2024-09-19 07:44:03 +02:00
Stéphane Nicoll
ae8315e90a
Use Liberica for Java 23 CI
...
Closes gh-42354
2024-09-19 07:39:35 +02:00
Phillip Webb
d7c6589b5e
Make `PulsarContainerFactoryCustomizers` package private
...
See gh-42182
2024-09-18 18:31:40 -07:00
Andy Wilkinson
47134974fc
Revert "Start building against Spring Session 3.4.0 snapshots"
...
This reverts commit 0ce4170612 .
See gh-42149
2024-09-18 19:09:54 +01:00