Phillip Webb
e4772cf3b7
Update copyright year of changed files
2 years ago
Andy Wilkinson
c483e662a9
Merge branch '2.6.x' into 2.7.x
...
Closes gh-33255
2 years ago
Andy Wilkinson
fc9c036c88
Create git commit time with epoch seconds rather than milliseconds
...
Closes gh-33237
2 years ago
Phillip Webb
733638cf89
Merge branch '2.6.x' into 2.7.x
...
Closes gh-33168
2 years ago
Phillip Webb
2a989b31aa
Create Environment and apply ConversionService to management contexts
...
Update `ManagementContextFactory` implementations to create an
appropriate `Environment` type and to apply the `ConversionService`
from the parent context.
Prior to this commit, the management context `Environment` would not
be able to convert values from a `configtree:` source due to a missing
converter.
Fixes gh-32941
2 years ago
Phillip Webb
ea10a64a0c
Merge branch '2.6.x' into 2.7.x
2 years ago
Phillip Webb
f423a26dd5
Polish
2 years ago
Phillip Webb
0ef03d725f
Merge branch '2.6.x' into 2.7.x
2 years ago
Phillip Webb
a431ae04e6
Polish
2 years ago
Andy Wilkinson
394ae76b04
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32989
2 years ago
Andy Wilkinson
fcd3413ba0
Allow histograms to be disabled for Lettuce metrics
...
Closes gh-32985
2 years ago
Andy Wilkinson
3ef633b096
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32543
2 years ago
Andy Wilkinson
84a25c7dcf
Configure Log4j2 classpath overrides consistently
...
Closes gh-32537
2 years ago
Andy Wilkinson
9f5b7db553
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32535
2 years ago
Andy Wilkinson
be48f37a83
Fix LogbackMetrics auto-config test with Logback and Log4j2 on cp
...
Closes gh-32533
2 years ago
Andy Wilkinson
144fdaa703
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32283
2 years ago
Andy Wilkinson
78f4242e46
Build with Gradle 7.5 while still supporting Gradle 6.8+
...
Closes gh-32281
2 years ago
Phillip Webb
e88a682220
Merge branch '2.6.x' into 2.7.x
2 years ago
Phillip Webb
85697ac482
Update copyright year of changed files
2 years ago
Stephane Nicoll
ca63a6e9ad
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32099
2 years ago
Stephane Nicoll
191593cf15
Review Git contribution documentation
...
Closes gh-31904
2 years ago
Andy Wilkinson
700460c322
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31971
2 years ago
Andy Wilkinson
fa73b73898
Fail build on missing configuration property descriptions
...
Closes gh-31916
2 years ago
Madhura Bhave
2884ec81e9
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31926
2 years ago
Madhura Bhave
cc15eb0b96
Configure existing probes at additional path when necessary
...
Fixes gh-30612
2 years ago
Stephane Nicoll
53a652ec65
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31883
2 years ago
Adrian Bob
aad9c8906a
Disable auto-detection in tests that start Hazelcast
...
This commit updates test configurations to disable auto-detection of
Hazelcast instances.
See gh-31863
2 years ago
Stephane Nicoll
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
2 years ago
Phillip Webb
a4ef6a7c5c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31865
2 years ago
Phillip Webb
f8412847dc
Update copyright year for "Fix typos in code and documentation"
...
See gh-31734
2 years ago
Marc Wrobel
dbfc6bded4
Fix typos in code and documentation
...
See gh-31734
2 years ago
Phillip Webb
3931e82841
Merge branch '2.6.x' into 2.7.x
2 years ago
Phillip Webb
4bcec6e0ee
Polish
2 years ago
Andy Wilkinson
2e98cafcca
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31818
2 years ago
Andy Wilkinson
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
2 years ago
Andy Wilkinson
10e19d504a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31804
2 years ago
Andy Wilkinson
628c2cd0b1
Ensure JMX endpoints are uniquely named in a context hierarchy
...
Closes gh-31718
2 years ago
Stephane Nicoll
b8647551cb
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31704
2 years ago
Johnny Lim
b17cb9b92b
Polish gh-31231
...
See gh-31540
2 years ago
Andy Wilkinson
1c2b0ae705
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31693
2 years ago
Andy Wilkinson
7c55639167
Depend on log4j-api directly rather than via Elastic's transitives
...
Closes gh-31692
2 years ago
Andy Wilkinson
1e08f545d0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31525
2 years ago
Andy Wilkinson
f49b16c645
Upgrade to Spring Java Format 0.0.34
...
Closes gh-31524
2 years ago
Phillip Webb
d64f601dfd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31501
2 years ago
Phillip Webb
aed4c47adb
Polish CompositeHandlerExceptionResolver
...
See gh-31495
2 years ago
Guirong Hu
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
2 years ago
Phillip Webb
7c91ebb1b0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31408
2 years ago
Phillip Webb
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
2 years ago
Phillip Webb
e0947459b6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31384
2 years ago
Phillip Webb
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
2 years ago