Yanming Zhou
0871feb0d9
Polish javadoc of TestImage for consistency
...
See gh-42426
2024-09-25 13:59:35 +02:00
Moritz Halbritter
3ec55b2157
Merge branch '3.3.x'
...
Closes gh-42447
2024-09-25 13:56:45 +02:00
Moritz Halbritter
003b182d95
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42446
2024-09-25 13:56:33 +02:00
Yanming Zhou
72d68a2cb8
Remove duplicated dependency
...
See gh-42442
2024-09-25 13:56:01 +02:00
Phillip Webb
7b3077280c
Merge branch '3.3.x'
...
Closes gh-42441
2024-09-24 14:32:48 -07:00
Phillip Webb
100bedc07d
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42440
2024-09-24 14:29:09 -07:00
Phillip Webb
ad72411e2b
Apply conventions plugin to all subprojects
...
Closes gh-42438
2024-09-24 14:26:32 -07:00
Phillip Webb
72f379a5b2
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42434
2024-09-24 13:01:05 -07:00
Phillip Webb
eafe61c4ca
Backport upgrade to Gradle 8.10.1
...
Cherry-pick commits d756bf4e86 , 083ac67d13 and 162c929a80 to
upgrade to Gradle 8.10.1.
Closes gh-42433
2024-09-24 12:55:29 -07:00
Andy Wilkinson
6806276b64
Retain jOOQ configuration bean when used defines a DSLContext bean
...
Closes gh-42400
2024-09-23 18:31:46 +01:00
Andy Wilkinson
97ff6e2ef1
Merge branch '3.3.x'
...
Closes gh-42422
2024-09-23 15:24:10 +01:00
Andy Wilkinson
9c6a744fc9
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42421
2024-09-23 15:23:51 +01:00
Andy Wilkinson
2aea7caf36
Remove use of reflection in Artemis connection factory creation
...
Fixes gh-42414
2024-09-23 14:08:35 +01:00
Phillip Webb
9b49e93f62
Polish 'Improve exception message to hint that you might need a '-spring' file'
...
See gh-42405
2024-09-22 20:35:13 -07:00
Dmytro Nosan
86ce051bb5
Improve exception message to hint that you might need a '-spring' file
...
See gh-42405
2024-09-22 20:33:55 -07:00
Phillip Webb
9b72e1f506
Merge branch '3.3.x'
...
Closes gh-42419
2024-09-22 20:31:08 -07:00
Johnny Lim
a0dc929e6c
Add Javadoc @Since for new PrometheusScrapeEndpoint constructor
...
See gh-42406
2024-09-22 20:30:31 -07:00
Phillip Webb
60f615849d
Polish 'Remove duplicated file.getName() call'
...
See gh-42411
2024-09-22 19:59:22 -07:00
choi-hyeseong
bd223e8bea
Remove duplicated file.getName() call
...
Update `WebServerPortFileWriter` so that `file.getName()` is only called
once.
See gh-42411
2024-09-22 19:56:59 -07:00
Phillip Webb
21b0bdec12
Merge branch '3.3.x'
...
Closes gh-42418
2024-09-22 17:52:42 -07:00
Phillip Webb
593862b082
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42417
2024-09-22 17:52:37 -07:00
arefbehboudi
0d3fceec5d
Polish
...
See gh-42413
2024-09-22 17:45:59 -07:00
Andy Wilkinson
3952d63369
Revert "Merge branch '3.3.x'"
...
This reverts commit ba0ef11b6b , reversing
changes made to d380ada4b2 .
See gh-42389
2024-09-20 11:08:37 +01:00
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
Yanming Zhou
7c8a6740c1
Remove redundant @Test annotation
...
See gh-42393
2024-09-20 10:22:47 +02: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
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
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
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
Johnny Lim
94e8c5db36
Polish gh-39957 and gh-41444
...
See gh-42359
2024-09-19 11:37:11 +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