Commit Graph

1681 Commits

Author SHA1 Message Date
Scott Frederick
efb5cb0bcd Merge branch '3.1.x'
Closes gh-38044
2023-10-25 13:53:19 -05:00
Scott Frederick
16c975a9c7 Merge branch '3.0.x' into 3.1.x
Closes gh-38043
2023-10-25 13:53:06 -05:00
Scott Frederick
627c93adcf Merge branch '2.7.x' into 3.0.x
Closes gh-38042
2023-10-25 13:52:54 -05:00
Scott Frederick
eae95f8d17 Handle null host value in MailHealthIndicator
If both the host and port are omitted from the mail properties, the
`location` field will be omitted from the health indicator details.

Fixes gh-38007
2023-10-25 13:52:36 -05:00
Phillip Webb
d47f8bf945 Update copyright year of changed files 2023-10-19 23:20:43 -07:00
Phillip Webb
548b0ea91f Fix failing exception assertion
See gh-37964
2023-10-19 22:05:59 -07:00
Phillip Webb
abdad1cabe Constently use assertThatExceptionOf... assertions
Closes gh-37964
2023-10-19 20:17:26 -07:00
Andy Wilkinson
5280cfeec0 Adapt to breaking API change in Micrometer
See gh-37703
2023-10-10 17:56:56 +01:00
Andy Wilkinson
f6c88662b4 Merge branch '3.1.x'
Closes gh-37144
2023-08-30 13:36:01 +01:00
Andy Wilkinson
e6fcde4af5 Merge branch '3.0.x' into 3.1.x
Closes gh-37143
2023-08-30 13:35:40 +01:00
Andy Wilkinson
a8e37b5cc5 Merge branch '2.7.x' into 3.0.x
Closes gh-37142
2023-08-30 13:34:12 +01:00
hakan-krgn
6d9ce8a3b5 Polish code and javadoc
See gh-37112
2023-08-30 13:31:58 +01:00
Phillip Webb
8edec21a6f Update copyright year of changed files 2023-08-13 20:44:44 -07:00
Moritz Halbritter
62fb45f75f Replace contains/put/get pattern with computeIfAbsent 2023-08-08 13:12:47 +02:00
Moritz Halbritter
ed9169501e Polish 2023-08-08 13:12:47 +02:00
Stephane Nicoll
37d8760652 Merge branch '3.1.x'
Closes gh-36739
2023-08-04 14:36:27 +02:00
Stephane Nicoll
1df70c9f9b Merge branch '3.0.x' into 3.1.x
Closes gh-36738
2023-08-04 14:36:15 +02:00
Stephane Nicoll
6ee002456d Merge branch '2.7.x' into 3.0.x
Closes gh-36737
2023-08-04 14:36:04 +02:00
Stephane Nicoll
747dbc35fe Warmup connection pool in ConnectionPoolMetricsTests
Closes gh-36474
2023-08-04 14:29:59 +02:00
Moritz Halbritter
02a7c22f40 Revert "Use virtual threads in JmsHealthIndicator if enabled"
This reverts commit 6fc585c5d2.
2023-08-03 17:25:28 +02:00
Moritz Halbritter
a843aca821 Revert "Polish"
This reverts commit 25eb3c8c18.
2023-08-03 17:25:15 +02:00
Moritz Halbritter
25eb3c8c18 Polish 2023-08-03 11:16:16 +02:00
Moritz Halbritter
6fc585c5d2 Use virtual threads in JmsHealthIndicator if enabled
Closes gh-36694
2023-08-03 10:32:42 +02:00
Johnny Lim
5a205dbfd1 Polish
See gh-36620
2023-07-28 11:35:33 +01:00
Stephane Nicoll
746cb00833 Merge branch '3.1.x'
Closes gh-36517
2023-07-24 13:00:57 +02:00
Stephane Nicoll
48622f2b7d Merge branch '3.0.x' into 3.1.x
Closes gh-36516
2023-07-24 13:00:47 +02:00
Stephane Nicoll
74349d1192 Merge branch '2.7.x' into 3.0.x
Closes gh-36515
2023-07-24 13:00:38 +02:00
fzyzcjy
e67bca121b Fix description of started and ready time metrics
See gh-36507
2023-07-24 12:57:06 +02:00
Andy Wilkinson
3affb3342e Deprecate auto-configuration for InfluxDB
Closes gh-35190
2023-07-20 13:31:10 +01:00
Stephane Nicoll
289d458a60 Start building against Spring Framework 6.1.0-M3 snapshots
See gh-36443
2023-07-18 15:04:42 +02:00
Stephane Nicoll
783bfb62e2 Merge branch '3.1.x'
Closes gh-36420
2023-07-17 10:04:14 +02:00
Stephane Nicoll
d2912c6442 Update copyright year of changed files
See gh-36306
2023-07-17 09:40:57 +02:00
Christoph Dreis
8321887d6a Fix typos
See gh-36306
2023-07-17 09:40:16 +02:00
Andy Wilkinson
3b2551619f Merge branch '3.1.x' 2023-07-07 12:19:23 +01:00
Andy Wilkinson
1085c1707e Merge branch '3.0.x' into 3.1.x 2023-07-07 12:19:15 +01:00
Andy Wilkinson
732424f7cb Polish 2023-07-07 12:19:05 +01:00
Andy Wilkinson
8ed2ef5640 Merge branch '3.1.x'
Closes gh-36277
2023-07-07 12:07:25 +01:00
Andy Wilkinson
c4157bb515 Merge branch '3.0.x' into 3.1.x
Closes gh-36276
2023-07-07 12:07:07 +01:00
Andy Wilkinson
cc80bb78fe Merge branch '2.7.x' into 3.0.x
Closes gh-36275
2023-07-07 12:06:51 +01:00
Andy Wilkinson
52f732920b Support multiple health groups with an additional path with Jersey
This commit knowingly makes breaking API changes to
JerseyHealthEndpointAdditionalPathResourceFactory. We considered
other options but they all had the potential to be backwards
incompatible in one way or another. Faced with that situation we
concluded that the likelihood of anyone using the modified API
directly is small enough to warrant making the breaking changes.
If it becomes apparent that we have misjudged things we can revisit
the changes in the future.

Closes gh-36250
2023-07-07 11:21:56 +01:00
Andy Wilkinson
ce8253ea95 Merge branch '3.1.x'
Closes gh-36238
2023-07-05 09:51:35 +01:00
Andy Wilkinson
c9f8d92656 Merge branch '3.0.x' into 3.1.x
Closes gh-36237
2023-07-05 09:47:43 +01:00
Johnny Lim
0fa58c04e7 Use Stream.toList()
See gh-36167
2023-07-05 09:38:19 +01:00
Phillip Webb
1cced11ea3 Merge branch '3.1.x'
Closes gh-36161
2023-07-02 14:01:26 +01:00
Phillip Webb
dcde1fac7e Merge branch '3.0.x' into 3.1.x
Closes gh-36160
2023-07-02 14:01:08 +01:00
Phillip Webb
566549021b Merge branch '2.7.x' into 3.0.x
Closes gh-36159
2023-07-02 14:00:47 +01:00
Phillip Webb
51ee702dac Allow configprops endpoint stringify primitive wrappers
Update `ConfigurationPropertiesReportEndpoint` so that primitive
wrapper input values in the Environment are stringified for display.

Fixes gh-36076
2023-07-02 13:59:30 +01:00
Andy Wilkinson
ea73203219 Merge branch '3.1.x'
Closes gh-36130
2023-06-30 08:48:51 +01:00
Andy Wilkinson
f0fee86b62 Merge branch '3.0.x' into 3.1.x
Closes gh-36129
2023-06-30 08:48:40 +01:00
Andy Wilkinson
fa72f90a10 Avoid NPE when a PeriodicTrigger has no initial delay
Closes gh-36081
2023-06-30 08:47:34 +01:00