ea10a64a0c
Merge branch '2.6.x' into 2.7.x
2022-11-09 11:39:53 -08:00
f423a26dd5
Polish
2022-11-09 11:39:48 -08:00
0ef03d725f
Merge branch '2.6.x' into 2.7.x
2022-11-09 11:31:55 -08:00
a431ae04e6
Polish
2022-11-09 11:30:11 -08:00
394ae76b04
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32989
2022-11-03 10:44:21 +00:00
fcd3413ba0
Allow histograms to be disabled for Lettuce metrics
...
Closes gh-32985
2022-11-03 10:34:41 +00:00
3ef633b096
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32543
2022-09-29 11:39:42 +01:00
84a25c7dcf
Configure Log4j2 classpath overrides consistently
...
Closes gh-32537
2022-09-29 11:25:21 +01:00
9f5b7db553
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32535
2022-09-29 10:04:19 +01:00
be48f37a83
Fix LogbackMetrics auto-config test with Logback and Log4j2 on cp
...
Closes gh-32533
2022-09-29 10:03:52 +01:00
144fdaa703
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32283
2022-09-09 15:14:40 +01:00
78f4242e46
Build with Gradle 7.5 while still supporting Gradle 6.8+
...
Closes gh-32281
2022-09-09 15:13:43 +01:00
e88a682220
Merge branch '2.6.x' into 2.7.x
2022-09-08 19:37:52 -07:00
85697ac482
Update copyright year of changed files
2022-09-08 19:36:59 -07:00
ca63a6e9ad
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32099
2022-08-17 09:10:02 +02:00
191593cf15
Review Git contribution documentation
...
Closes gh-31904
2022-08-17 08:58:56 +02:00
700460c322
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31971
2022-08-03 14:58:07 +01:00
fa73b73898
Fail build on missing configuration property descriptions
...
Closes gh-31916
2022-08-03 14:45:42 +01:00
2884ec81e9
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31926
2022-07-29 11:33:17 -07:00
cc15eb0b96
Configure existing probes at additional path when necessary
...
Fixes gh-30612
2022-07-29 11:31:19 -07:00
53a652ec65
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31883
2022-07-27 09:23:05 +02:00
aad9c8906a
Disable auto-detection in tests that start Hazelcast
...
This commit updates test configurations to disable auto-detection of
Hazelcast instances.
See gh-31863
2022-07-27 08:16:48 +02:00
782e3f75b6
Polish Hazelcast configuration
...
This commit updates the XSD to 4.2 and removes the "tcp-ip" network
option as it is disabled by default.
See gh-31863
2022-07-27 08:15:53 +02:00
a4ef6a7c5c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31865
2022-07-26 12:13:16 +01:00
f8412847dc
Update copyright year for "Fix typos in code and documentation"
...
See gh-31734
2022-07-26 12:08:30 +01:00
dbfc6bded4
Fix typos in code and documentation
...
See gh-31734
2022-07-26 12:08:07 +01:00
3931e82841
Merge branch '2.6.x' into 2.7.x
2022-07-26 10:50:42 +01:00
4bcec6e0ee
Polish
2022-07-26 10:50:01 +01:00
2e98cafcca
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31818
2022-07-20 21:01:47 +01:00
ab2b04fafd
Find health contributors in ancestor contexts in non-reactive apps
...
Previously, health contributors in a non-reative app were found by
retrieving them from the application context rather than via
dependency injection. This results in only contributors from the
current context being found, with contributors in ancestor contexts
ignored.
This commit moves to injection of the contributors, aligning the
behaviour with that of a reactive application.
Closes gh-27308
2022-07-20 20:52:02 +01:00
10e19d504a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31804
2022-07-20 10:17:39 +01:00
628c2cd0b1
Ensure JMX endpoints are uniquely named in a context hierarchy
...
Closes gh-31718
2022-07-20 10:15:52 +01:00
b8647551cb
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31704
2022-07-13 13:50:17 +02:00
b17cb9b92b
Polish gh-31231
...
See gh-31540
2022-07-13 13:49:13 +02:00
1c2b0ae705
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31693
2022-07-12 14:28:10 +01:00
7c55639167
Depend on log4j-api directly rather than via Elastic's transitives
...
Closes gh-31692
2022-07-12 14:27:56 +01:00
1e08f545d0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31525
2022-06-24 13:05:06 +01:00
f49b16c645
Upgrade to Spring Java Format 0.0.34
...
Closes gh-31524
2022-06-24 12:57:52 +01:00
d64f601dfd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31501
2022-06-22 16:31:52 -07:00
aed4c47adb
Polish CompositeHandlerExceptionResolver
...
See gh-31495
2022-06-22 16:23:38 -07:00
3592292e4b
Use ExceptionHandler when Spring MVC uses a different management port
...
Update `CompositeHandlerExceptionResolver` to search for beans in
all contexts. Note that `BeanFactoryUtils.beansOfTypeIncludingAncestors`
cannot not be used since we need to pick up all beans, even if they
have the same name.
See gh-31495
2022-06-22 16:13:26 -07:00
7c91ebb1b0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31408
2022-06-16 15:36:00 -07:00
ae6311ddda
Prevent Logback from accidentally being used in Log4J2LoggingSystemTests
...
Update `Log4J2LoggingSystemTests` to exclude Logback and include
'log4j-slf4j-impl'. The `ModifiedClassPathClassLoader` has also been
updated so that it no longer automatically excludes `log4j` artifacts,
instead we now use `@ClassPathExclusions` on the relevant tests.
Fixes gh-19365
2022-06-16 15:35:32 -07:00
e0947459b6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31384
2022-06-14 09:38:05 -07:00
9f8a262e6b
Log a warning when a health indicator takes too long to run
...
Update `HealthEndpointSupport` so that it logs a warning if a health
indicator takes too long to respond.
Fixes gh-31231
2022-06-14 09:32:07 -07:00
12eb7a8795
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31282
2022-06-08 19:24:07 +01:00
a651061e2c
Remove SpringApplicationHierarchyTests
...
Closes gh-31281
2022-06-08 19:23:26 +01:00
935d1264e0
Merge branch '2.6.x' into 2.7.x
2022-05-26 18:13:08 +01:00
3d203d0215
Polish
2022-05-26 17:30:39 +01:00
455ee0ce22
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31177
2022-05-26 15:53:38 +01:00
Phillip Webb
Andy Wilkinson
Stephane Nicoll
Madhura Bhave
Adrian Bob
Marc Wrobel
Johnny Lim
Guirong Hu