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
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
Johnny Lim
5a205dbfd1
Polish
...
See gh-36620
2023-07-28 11:35:33 +01: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
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
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
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
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
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
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
Phillip Webb
1de7edb615
Remove accidentally committed code
2023-06-16 15:21:03 -07:00
Phillip Webb
5d6a507142
Merge branch '3.0.x' into 3.1.x
2023-06-16 14:35:23 -07:00
Phillip Webb
c192fb85b2
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35922
2023-06-15 14:26:55 -07:00
Phillip Webb
4c8b93b37d
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35920
2023-06-15 14:26:36 -07:00
Phillip Webb
137f4ee451
Support reporting of custom Log4J2 log levels from the LoggersEndpoint
...
Support custom Log4J2 log levels by changing `LoggerConfiguration` so
that it can now report levels using a `LevelConfiguration` object
rather than the limited `LogLevel` enum.
The `Log4J2LoggingSystem` class now uses `LevelConfiguration.ofCustom`
for custom logging levels, rather than throwing an exception.
The `LoggersEndpoint` has also been updated so that it can return the
custom logger name.
Fixes gh-35227
2023-06-15 14:03:22 -07:00
Moritz Halbritter
ebbb4d319d
Polish
2023-06-07 10:53:03 +02:00
Phillip Webb
e3ed87d165
Merge branch '3.0.x'
2023-05-12 13:21:52 -07:00
Phillip Webb
92e420a098
Merge branch '2.7.x' into 3.0.x
2023-05-12 13:14:12 -07:00
Phillip Webb
e9c4a5d663
Polish
2023-05-12 13:01:30 -07:00
Andy Wilkinson
8494ad82cd
Merge branch '3.0.x'
...
Closes gh-35255
2023-05-03 17:45:17 +01:00
Andy Wilkinson
0776d01f16
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35254
2023-05-03 17:44:49 +01:00
Andy Wilkinson
fad24d5ced
Fix handling of default port in mail health indicator
...
Fixes gh-35247
2023-05-03 17:33:37 +01:00
Stephane Nicoll
2dcb849c0f
Merge branch '3.0.x'
...
Closes gh-34939
2023-04-11 16:39:00 +02:00
Stephane Nicoll
320db790e7
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34938
2023-04-11 16:38:46 +02:00
Stephane Nicoll
4b8829364e
Polish "Use removeIf rather than Iterator-based removal"
...
See gh-34762
2023-04-11 16:32:26 +02:00
SeasonPan
0d13e31827
Use removeIf rather than Iterator-based removal
...
See gh-34762
2023-04-11 16:20:43 +02:00
Phillip Webb
3dbc3a1943
Merge branch '3.0.x'
2023-03-23 23:01:32 -07:00
Mortitz Halbritter
42187e7bff
Polish
2023-03-23 23:00:58 -07:00
Phillip Webb
da925242f3
Polish 'Add SanitizableData.withSanitizedValue method'
...
See gh-34615
2023-03-15 15:17:52 -07:00
Rohan Goyal
f789c9a56e
Add SanitizableData.withSanitizedValue method
...
See gh-34615
2023-03-15 15:10:51 -07:00
Phillip Webb
0b15962aca
Merge branch '2.7.x' into 3.0.x
2023-02-22 18:36:16 -08:00
Phillip Webb
c4de86c244
Merge branch '2.7.x' into 3.0.x
2023-02-21 23:17:57 -08:00
Phillip Webb
df5898a146
Reformat code following spring-javaformat upgrade
2023-02-21 22:53:27 -08:00
abilan
dbbc0de25b
Remove hints for Spring Integration Graph
...
Related to spring-projects/spring-integration#3994
Spring Integration's `IntegrationGraphServer` can be used without
actuator or even Spring Boot at all. It is more natural to have
respective reflection hints exposed by Spring Integration itself.
See related GH issue and its fix which just does a migration of the
remove code from `IntegrationGraphEndpoint`.
See gh-33924
2023-02-14 19:44:34 +00:00
Moritz Halbritter
81c8574bca
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34070
2023-02-06 10:38:57 +01:00
Moritz Halbritter
33288493aa
Remove exception field from Health class
...
Closes gh-34030
2023-02-06 10:38:26 +01:00