root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
38,993 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

1702 Commits

Author SHA1 Message Date
Andy Wilkinson 144fdaa703 Merge branch '2.6.x' into 2.7.x 
Closes gh-32283
 2022-09-09 15:14:40 +01:00
Andy Wilkinson 78f4242e46 Build with Gradle 7.5 while still supporting Gradle 6.8+ 
Closes gh-32281
 2022-09-09 15:13:43 +01:00
Phillip Webb e88a682220 Merge branch '2.6.x' into 2.7.x 2022-09-08 19:37:52 -07:00
Phillip Webb 85697ac482 Update copyright year of changed files 2022-09-08 19:36:59 -07:00
Stephane Nicoll ca63a6e9ad Merge branch '2.6.x' into 2.7.x 
Closes gh-32099
 2022-08-17 09:10:02 +02:00
Stephane Nicoll 191593cf15 Review Git contribution documentation 
Closes gh-31904
 2022-08-17 08:58:56 +02:00
Andy Wilkinson 700460c322 Merge branch '2.6.x' into 2.7.x 
Closes gh-31971
 2022-08-03 14:58:07 +01:00
Andy Wilkinson fa73b73898 Fail build on missing configuration property descriptions 
Closes gh-31916
 2022-08-03 14:45:42 +01:00
Madhura Bhave 2884ec81e9 Merge branch '2.6.x' into 2.7.x 
Closes gh-31926
 2022-07-29 11:33:17 -07:00
Madhura Bhave cc15eb0b96 Configure existing probes at additional path when necessary 
Fixes gh-30612
 2022-07-29 11:31:19 -07:00
Stephane Nicoll 53a652ec65 Merge branch '2.6.x' into 2.7.x 
Closes gh-31883
 2022-07-27 09:23:05 +02:00
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
 2022-07-27 08:16:48 +02:00
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
 2022-07-27 08:15:53 +02:00
Phillip Webb a4ef6a7c5c Merge branch '2.6.x' into 2.7.x 
Closes gh-31865
 2022-07-26 12:13:16 +01:00
Phillip Webb f8412847dc Update copyright year for "Fix typos in code and documentation" 
See gh-31734
 2022-07-26 12:08:30 +01:00
Marc Wrobel dbfc6bded4 Fix typos in code and documentation 
See gh-31734
 2022-07-26 12:08:07 +01:00
Phillip Webb 3931e82841 Merge branch '2.6.x' into 2.7.x 2022-07-26 10:50:42 +01:00
Phillip Webb 4bcec6e0ee Polish 2022-07-26 10:50:01 +01:00
Andy Wilkinson 2e98cafcca Merge branch '2.6.x' into 2.7.x 
Closes gh-31818
 2022-07-20 21:01:47 +01:00
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
 2022-07-20 20:52:02 +01:00
Andy Wilkinson 10e19d504a Merge branch '2.6.x' into 2.7.x 
Closes gh-31804
 2022-07-20 10:17:39 +01:00
Andy Wilkinson 628c2cd0b1 Ensure JMX endpoints are uniquely named in a context hierarchy 
Closes gh-31718
 2022-07-20 10:15:52 +01:00
Stephane Nicoll b8647551cb Merge branch '2.6.x' into 2.7.x 
Closes gh-31704
 2022-07-13 13:50:17 +02:00
Johnny Lim b17cb9b92b Polish gh-31231 
See gh-31540
 2022-07-13 13:49:13 +02:00
Andy Wilkinson 1c2b0ae705 Merge branch '2.6.x' into 2.7.x 
Closes gh-31693
 2022-07-12 14:28:10 +01:00
Andy Wilkinson 7c55639167 Depend on log4j-api directly rather than via Elastic's transitives 
Closes gh-31692
 2022-07-12 14:27:56 +01:00
Andy Wilkinson 1e08f545d0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31525
 2022-06-24 13:05:06 +01:00
Andy Wilkinson f49b16c645 Upgrade to Spring Java Format 0.0.34 
Closes gh-31524
 2022-06-24 12:57:52 +01:00
Phillip Webb d64f601dfd Merge branch '2.6.x' into 2.7.x 
Closes gh-31501
 2022-06-22 16:31:52 -07:00
Phillip Webb aed4c47adb Polish CompositeHandlerExceptionResolver 
See gh-31495
 2022-06-22 16:23:38 -07:00
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
 2022-06-22 16:13:26 -07:00
Phillip Webb 7c91ebb1b0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31408
 2022-06-16 15:36:00 -07:00
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
 2022-06-16 15:35:32 -07:00
Phillip Webb e0947459b6 Merge branch '2.6.x' into 2.7.x 
Closes gh-31384
 2022-06-14 09:38:05 -07:00
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
 2022-06-14 09:32:07 -07:00
Andy Wilkinson 12eb7a8795 Merge branch '2.6.x' into 2.7.x 
Closes gh-31282
 2022-06-08 19:24:07 +01:00
Andy Wilkinson a651061e2c Remove SpringApplicationHierarchyTests 
Closes gh-31281
 2022-06-08 19:23:26 +01:00
Andy Wilkinson 935d1264e0 Merge branch '2.6.x' into 2.7.x 2022-05-26 18:13:08 +01:00
Andy Wilkinson 3d203d0215 Polish 2022-05-26 17:30:39 +01:00
Andy Wilkinson 455ee0ce22 Merge branch '2.6.x' into 2.7.x 
Closes gh-31177
 2022-05-26 15:53:38 +01:00
Andy Wilkinson ee45fd2fc8 Remove redundant throws declarations from internal APIs 
Closes gh-31176
 2022-05-26 15:47:35 +01:00
Andy Wilkinson b3a4982f31 Merge branch '2.6.x' into 2.7.x 
Closes gh-31174
 2022-05-26 14:01:23 +01:00
Andy Wilkinson cbf42dea14 Update deprecation messages to change removal version from 2.8 to 3.0 
Closes gh-30903
 2022-05-26 13:59:03 +01:00
Eddú Meléndez 154c84ffe2 Add package-info for o.s.b.a.a.metrics.graphql 
See gh-31140
 2022-05-25 13:30:29 +01:00
Andy Wilkinson 24dc525127 Fix conditions on auto-configured WebMvcMetricsFilter 
Closes gh-31150
 2022-05-23 12:50:49 +01:00
Stephane Nicoll 285378e4f9 Merge branch '2.6.x' into 2.7.x 
Closes gh-31059
 2022-05-16 16:37:21 +02:00
Stephane Nicoll 18129a5938 Merge branch '2.5.x' into 2.6.x 
Closes gh-31058
 2022-05-16 16:37:07 +02:00
Stephane Nicoll 22d187a38c Polish "Add missing configuration properties for Statsd" 
See gh-30898
 2022-05-16 16:33:22 +02:00
izeye d90ef6afb3 Add missing configuration properties for Statsd 
See gh-30898
 2022-05-16 16:28:50 +02:00
Andy Wilkinson ed705cc78e Polish 2022-05-12 12:59:12 +01:00
Andy Wilkinson 2669f8c343 Merge branch '2.6.x' into 2.7.x 
Closes gh-30997
 2022-05-12 12:47:52 +01:00
Andy Wilkinson 655ceefead Merge branch '2.5.x' into 2.6.x 
Closes gh-30996
 2022-05-12 12:47:38 +01:00
Andy Wilkinson 3f6fcac683 Polish "Extend documentation on Datadog metrics" 
See gh-30879
 2022-05-12 12:36:50 +01:00
Denis Washington 09db7e4001 Extend documentation on Datadog metrics 
- Document that an application key must be set to publish metadata
  for the exported metrics.

- Point out that using a non-US Datadog site (e.g., EU) requires
  changing the `uri` property.

See gh-30879
 2022-05-12 12:36:18 +01:00
Andy Wilkinson d0e55643b1 Polish 
Closes gh-30993
 2022-05-12 12:11:51 +01:00
Andy Wilkinson 7e88daf288 Update messages for APIs deprecated in 2.7 
In all likelihood there will not be a 2.9 release so this commit
updates the message for deprecations made in 2.7 to indicate that
removal will not occur until 3.0.

See gh-30903
 2022-05-12 11:12:09 +01:00
Andy Wilkinson 4cd850cfc0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30851
 2022-05-03 15:17:13 +01:00
Andy Wilkinson fa327a783d Merge branch '2.5.x' into 2.6.x 
Closes gh-30850
 2022-05-03 15:14:00 +01:00
Andy Wilkinson 4fd2e0c916 Polish "Fix typos" 
See gh-30773
 2022-05-03 14:09:53 +01:00
Andy Wilkinson f6d24dc1a8 Fix typos 
See gh-30773
 2022-05-03 14:09:37 +01:00
Andy Wilkinson 61cd05f74b Merge branch '2.6.x' into 2.7.x 
Closes gh-30842
 2022-05-03 11:29:03 +01:00
Andy Wilkinson f1b5f36af8 Merge branch '2.5.x' into 2.6.x 
Closes gh-30841
 2022-05-03 11:28:53 +01:00
Andy Wilkinson f8e5a534a6 Polish "Polish InfluxMetricsExportAutoConfiguration" 
See gh-30824
 2022-05-03 09:50:51 +01:00
Eddú Meléndez b0d5364efa Polish InfluxMetricsExportAutoConfiguration 
See gh-30824
 2022-05-03 09:50:06 +01:00
Moritz Halbritter b406971094 Remove hyphen from asserting-party 
spring.security.saml2.relyingparty.registration.*.asserting-party.* is
now named spring.security.saml2.relyingparty.registration.*.assertingparty.*

Closes gh-30785
 2022-04-25 15:26:38 +02:00
Phillip Webb dd5696b59b Update copyright year of changed files 2022-04-20 15:26:30 -07:00
Phillip Webb 36f1249fc6 Polish 2022-04-20 15:26:15 -07:00
Moritz Halbritter 6c400daa48 Rename 'identityprovider' property to 'asserting-party' 
Rename spring.security.saml2.relyingparty.registration.*.identity-provider.*
to spring.security.saml2.relyingparty.registration.*.asserting-party.*

The old property names are still supported, but will lead to a warning
in the logs.

Closes gh-30642
 2022-04-20 08:25:58 +02:00
Stephane Nicoll 2d663f2e94 Upgrade to Spring Data 2021.2.0-RC1 
Closes gh-30610
 2022-04-20 08:05:15 +02:00
Stephane Nicoll 69045e4eaf Polish "Allow disabling the Dynatrace instruments" 
See gh-30637
 2022-04-19 09:43:05 +02:00
Georg Pirklbauer 7a05faf079 Allow disabling the Dynatrace instruments 
Since Micrometer version 1.9.0, the Dynatrace registry uses specialized
instruments by default, which ensures data is exported in an optimal
format. By using this new flag, users can switch back to the previous
behavior, which uses the original instruments from Micrometer.

See gh-30637
 2022-04-19 09:38:37 +02:00
Andy Wilkinson ff40c8b6f5 Use MeterBinders to bind DataSource metrics 
Closes gh-30282
 2022-04-13 19:24:06 +01:00
Moritz Halbritter 6c04241ad6 Merge branch '2.6.x' into 2.7.x 
Closes gh-30652
 2022-04-13 15:00:14 +02:00
Moritz Halbritter 9e98ccd8ab Merge branch '2.5.x' into 2.6.x 
Closes gh-30651
 2022-04-13 14:59:59 +02:00
Moritz Halbritter dfc0f21932 Fix language in WavefrontProperties 
Closes gh-30649
 2022-04-13 14:59:48 +02:00
Andy Wilkinson 27a936e466 Fix Elastic health indicator without RestHighLevelClient 
Closes gh-28496
 2022-04-13 10:02:47 +01:00
Andy Wilkinson a7a71da9ef Polish "Bring back Elasticsearch RestClient auto-configuration" 
See gh-28496
 2022-04-12 21:13:05 +01:00
Filip Hrisafov eb3bf40bdb Bring back Elasticsearch RestClient auto-configuration 
Prior to this commit, Spring Boot would only auto-configure the
`RestHighLevelClient` and `RestClientBuilder` if the
`RestHighLevelClient` was present. This was done in 1d73d4ed.

This commit brings back the exposing of the `RestClient` bean in when
exposing the `RestHighLevelClient` or when the `RestHighLevelClient`
is not present. It allows for using the auto-configuration and its
customizers of the `RestClientBuilder` in a similar way as it is done
for the `RestTemplateBuilder` and the `WebClient.Builder`.

The presence of the `elasticsearch-rest-high-level-client` module is
now optional. This opens the door for potentially adding support for
the new Elasticsearch Java Client[1] that is based on the same
`RestClient`.

The health contributor and its configuration has also been updated to
only depend on the low-level RestClient.

See gh-28496

[1] https://github.com/elastic/elasticsearch-java
 2022-04-12 21:13:05 +01:00
Andy Wilkinson 6580f6c742 Align with latest changes in Micrometer 1.9 snapshots 
See gh-30605
 2022-04-12 11:47:34 +01:00
Andy Wilkinson 48f8021d88 Migrate @Local*Port annotations to spring-boot-test 
Closes gh-29589
 2022-04-12 08:48:43 +01:00
Andy Wilkinson b8b903527a Update tag keys to comply with Micrometer recommendations 
Closes gh-30536
 2022-04-11 15:21:35 +01:00
Andy Wilkinson f209d77cb2 Merge branch '2.6.x' into 2.7.x 
Closes gh-30617
 2022-04-08 14:04:43 +01:00
Andy Wilkinson d6731805b6 Merge branch '2.5.x' into 2.6.x 
Closes gh-30616
 2022-04-08 14:03:58 +01:00
Andy Wilkinson 70fa7e5e93 Make properties field final 
Closes gh-30615
 2022-04-08 14:03:29 +01:00
Stephane Nicoll 245e602ae0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30573
 2022-04-07 09:18:17 +02:00
luozhenyu 09daad0a16 Add metadata for management.endpoint.health.probes.add-additional-paths 
See gh-30562
 2022-04-07 09:14:02 +02:00
Jonatan Ivanov d0bc31a5e9 Add support for Prometheus Exemplars 
See gh-30472
 2022-04-04 13:35:38 +02:00
Moritz Halbritter 018281f3d0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30441
 2022-03-25 16:28:24 +01:00
Moritz Halbritter cee51783fd Merge branch '2.5.x' into 2.6.x 
Closes gh-30440
 2022-03-25 16:28:07 +01:00
Moritz Halbritter 24e748d5cd Remove unnecessary entries in additional config metadata 
Add the 'enabled' fields directly to the classes instead.

Closes gh-30439
 2022-03-25 16:22:47 +01:00
Moritz Halbritter 45f393b76b Merge branch '2.6.x' into 2.7.x 
Closes gh-30437
 2022-03-25 14:56:01 +01:00
Moritz Halbritter c003d5b533 Merge branch '2.5.x' into 2.6.x 
Closes gh-30436
 2022-03-25 14:55:31 +01:00
Moritz Halbritter 0ff8119a1b Sort entries in additional-spring-configuration metadata alphabetically 
Closes gh-30434
 2022-03-25 14:54:39 +01:00
Jens Wilke 774f61fcb5 Add support for cache2k in memory caching 
See gh-28498
 2022-03-21 08:22:19 +01:00
Scott Frederick a14f3ed200 Use a ConfigurationProperties class for JMX properties 
Closes gh-30327
 2022-03-18 16:32:13 -05:00
Andy Wilkinson dfd4097436 Merge branch '2.6.x' into 2.7.x 
Closes gh-30101
 2022-03-08 14:09:47 +00:00
Andy Wilkinson 5b2cc74f71 Merge branch '2.5.x' into 2.6.x 
Closes gh-30100
 2022-03-08 14:09:35 +00:00
Andy Wilkinson 708e57eafb Register metrics for wrapped R2DBC ConnectionPools 
Closes gh-30090
 2022-03-08 13:55:34 +00:00
Andy Wilkinson ff7321cc5a Polish "Support overriding the default SanitizingFunction" 
See gh-30006
 2022-03-03 14:24:51 +00:00
Guirong Hu fb9112c891 Support overriding the default SanitizingFunction 
See gh-30006
 2022-03-03 14:19:14 +00:00