Andy Wilkinson
b645eb32ac
Remove deprecated code that was to be removed in 3.2
...
Closes gh-36034
2023-06-23 18:14:22 +01:00
Andy Wilkinson
357c67a999
Merge branch '3.1.x'
2023-06-23 15:58:51 +01:00
Andy Wilkinson
3f7fe25cb9
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36044
2023-06-23 15:58:36 +01:00
Andy Wilkinson
2fae5de245
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36043
2023-06-23 15:50:02 +01:00
Andy Wilkinson
d2966e1cbf
Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
...
See gh-35915
2023-06-23 12:38:12 +01:00
ThomazPassarelli
f9da30faf1
Replace calls to verifyComplete() to avoid indefinite blocking
...
See gh-35915
2023-06-23 12:16:26 +01:00
Andy Wilkinson
1e17d8eeea
Upgrade to Liquibase 4.22.0
...
Closes gh-35956
2023-06-19 16:30:52 +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
Marc Leroux
b61834c92d
Replace Mockito argument captors with assertArg
...
See gh-35015
2023-05-05 11:34:55 +02: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
Phillip Webb
a890323758
Merge branch '3.0.x'
2023-05-02 14:52:42 -07:00
Phillip Webb
0f242ab3f7
Merge branch '2.7.x' into 3.0.x
2023-05-02 14:52:16 -07:00
Phillip Webb
6b646f6a8e
Update copyright year of changed files
2023-05-02 14:52:12 -07:00
Moritz Halbritter
d7a9f87b64
Disable Neo4j tests on aarch64 linux and mac
...
See gh-35228
2023-05-02 13:40:59 +02:00
Andy Wilkinson
9a0b5e0178
Merge branch '3.0.x'
...
Closes gh-35173
2023-04-26 12:48:50 +01:00
Andy Wilkinson
7ee1622995
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35172
2023-04-26 12:48:16 +01:00
Andy Wilkinson
6b9bc012a5
Check that BPP and BFPP bean methods won't cause eager initialization
...
Closes gh-35164
2023-04-26 11:47:03 +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
Stephane Nicoll
6876556b60
Upgrade to Json Path 2.8.0
...
Closes gh-34878
2023-04-06 16:25:23 +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
Moritz Halbritter
0a080736d8
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34017
2023-01-31 10:50:30 +01:00
Johnny Lim
5eeb429e44
Polish
...
See gh-33966
2023-01-31 10:48:30 +01:00
Krzysztof Krason
d3efd7e091
Use try with close
...
See gh-33987
2023-01-26 20:36:38 -08:00
Krzysztof Krason
0e68cae57f
Use instanceof patterns
...
See gh-33987
2023-01-26 20:36:25 -08:00
Krzysztof Krason
6e46423983
Use diamond operators
...
See gh-33987
2023-01-26 20:35:08 -08:00
Moritz Halbritter
f72f3579d0
Merge branch '2.7.x'
...
Closes gh-33919
2023-01-20 09:37:54 +01:00
Johnny Lim
ebde850031
Add Javadoc since to OperationParameter.getAnnotation()
...
See gh-33914
2023-01-20 09:36:57 +01:00
Phillip Webb
71efc55bf9
Merge branch '2.7.x'
2023-01-18 16:31:53 -08:00