Commit Graph

13018 Commits

Author SHA1 Message Date
Stephane Nicoll 7286c33f53 Document default behaviour of DataJpaTest#showSql
Closes gh-25843
2021-04-12 14:14:36 +02:00
Andy Wilkinson eda9fe4952 Fix group IDs of HttpCore v4 and v5 dependency management
See gh-26004
2021-04-12 10:41:57 +01:00
Andy Wilkinson ba2583900f Provide auto-configuration for using Apache HttpClient 5 with WebClient
Closes gh-26004
2021-04-12 08:44:27 +01:00
Stephane Nicoll b2d167c186 Upgrade to Undertow 2.2.7.Final
Closes gh-26020
2021-04-12 08:57:57 +02:00
Stephane Nicoll d9d051053d Upgrade to Sun Mail 1.6.7
Closes gh-26018
2021-04-12 08:57:54 +02:00
Stephane Nicoll cddc0b625b Upgrade to Netty tcNative 2.0.38.Final
Closes gh-26017
2021-04-12 08:57:52 +02:00
Stephane Nicoll df9b17104c Upgrade to Netty 4.1.63.Final
Closes gh-26016
2021-04-12 08:57:51 +02:00
Stephane Nicoll 50922949bd Upgrade to MIMEPull 1.9.14
Closes gh-26015
2021-04-12 08:57:49 +02:00
Stephane Nicoll 8097d22821 Upgrade to Lombok 1.18.20
Closes gh-26014
2021-04-12 08:57:48 +02:00
Stephane Nicoll 20f47b3149 Upgrade to Jetty 9.4.39.v20210325
Closes gh-26012
2021-04-12 08:57:45 +02:00
Stephane Nicoll 3906719382 Upgrade to Jetty Reactive HTTPClient 1.1.7
Closes gh-26011
2021-04-12 08:57:43 +02:00
Stephane Nicoll 1bc2c3658a Upgrade to Jaybird 3.0.11
Closes gh-26010
2021-04-12 08:57:42 +02:00
Stephane Nicoll 6b98be6db9 Upgrade to Jakarta Mail 1.6.7
Closes gh-26009
2021-04-12 08:57:40 +02:00
Stephane Nicoll 4d8382b25c Upgrade to Hibernate 5.4.30.Final
Closes gh-26008
2021-04-12 08:57:38 +02:00
Stephane Nicoll 3f2cebd545 Upgrade to Dropwizard Metrics 4.1.19
Closes gh-26007
2021-04-12 08:57:37 +02:00
Stephane Nicoll 2d6c6282d9 Upgrade to AppEngine SDK 1.9.88
Closes gh-26006
2021-04-12 08:57:33 +02:00
dreis2211 ea55ca9971 Remove unused method parameters
See gh-25986
2021-04-12 08:40:13 +02:00
izeye 4987880afa Polish
See gh-25980
2021-04-12 08:37:02 +02:00
Andy Wilkinson 0a8da4fd7d Polish "Provide health for an AbstractRoutingDataSource's resolved targets"
See gh-25708
2021-04-10 11:12:10 +01:00
bono007 13600c3367 Provide health for an AbstractRoutingDataSource's resolved targets
See gh-25708
2021-04-10 11:12:01 +01:00
Stephane Nicoll 710a905187 Start building against Spring Integration 5.5.0-RC1 snapshots
See gh-25929
2021-04-10 11:00:47 +02:00
dreis2211 db79fe8b2c Test our Gradle Plugin against Gradle 7.0
See gh-25997
2021-04-10 10:48:44 +02:00
Phillip Webb f03f74ff0a Add Spring Data Repository metrics support
Add support for Spring Data Repository metrics by integrating with
Spring Data's new `RepositoryMethodInvocationListener` support.

Closes gh-22217
2021-04-09 23:49:25 -07:00
Phillip Webb 1893f935b4 Rework 'Supported Metrics' reference documentation
Rework the 'Supported Metrics' documentation to improve consistency
access subsections. Details about the `@Timer` annotation have been
pulled into a new section so that they can be referenced rather than
repeated.

See gh-22217
2021-04-09 23:46:33 -07:00
Phillip Webb 9f16491535 Rework @Timer annotation support
Rework existing `@Timer` annotation support to remove duplicate code
and offer general purpose utilities that can be used in future metrics
support.

See gh-23112
See gh-22217
2021-04-09 23:39:39 -07:00
Phillip Webb 3d7e5e3abd Polish 2021-04-09 23:38:32 -07:00
Phillip Webb efba7076ba Fix title case capitalization 2021-04-09 23:38:12 -07:00
Scott Frederick 5bc35e8f44 Extract XML example from Maven plugin adoc file
See gh-25993
2021-04-09 14:22:51 -05:00
Scott Frederick e27d4848dd Merge branch '2.4.x'
Closes gh-25993
2021-04-09 14:12:36 -05:00
Scott Frederick 6a7f1f1c56 Merge branch '2.3.x' into 2.4.x
Closes gh-25992
2021-04-09 14:11:47 -05:00
Scott Frederick e19443093d Document runtime JVM configuration when building an image
Fixes gh-21478
2021-04-09 14:06:24 -05:00
Stephane Nicoll c1ebe40c56 Polish "Add reference to Bitcoin Spring Boot starter"
See gh-25943
2021-04-09 16:09:01 +02:00
Thebora Kompanioni f7c5ece35e Add reference to Bitcoin Spring Boot starter
See gh-25943
2021-04-09 16:09:01 +02:00
Andy Wilkinson 048463742d Merge branch '2.4.x'
See gh-25985
2021-04-09 15:06:13 +01:00
Andy Wilkinson 06168bb130 Polish FileSystemWatcherTests
See gh-25982
2021-04-09 15:05:29 +01:00
dreis2211 21ece1ea30 Remove Gradle 5.6.x support from docs
See gh-25981
2021-04-09 14:44:35 +01:00
Andy Wilkinson 91473cc326 Merge branch '2.4.x'
Closes gh-25983
2021-04-09 14:40:56 +01:00
Andy Wilkinson 638aa87d13 Merge branch '2.3.x' into 2.4.x
Closes gh-25982
2021-04-09 14:40:34 +01:00
Andy Wilkinson 02e6b7c89c Make FileSystemWatcherTests more robust
Previously, several tests in FileSystemWatcherTests assumed that all
of the changes detected by the watcher would be grouped into a single
change set. This assumption breaks down when a test runs slowly (due
to CPU or IO contention, for example), and making changes to the file
system takes long then the watcher's polling interval. When this
happens, the changes will be split across two (or more).

This commit attempts to make the tests more robust. The tests now
tolerate multiple changes sets by combining them and asserting that
across the n change sets, only the expected changes were detected.

Closes gh-25901
2021-04-09 14:35:41 +01:00
izeye 98b0b6c4c5 Fix MongoMetricsAutoConfigurationTests
See gh-25952
2021-04-09 14:20:41 +02:00
Stephane Nicoll 719d10b6e7 Merge branch '2.4.x'
Closes gh-25979
2021-04-09 14:19:21 +02:00
dreis2211 afd4b582ed Fix typos in docs
See gh-25947
2021-04-09 14:18:53 +02:00
Stephane Nicoll c5c07185bf Upgrade to Undertow 2.1.7.Final
Closes gh-25978
2021-04-09 14:02:48 +02:00
Stephane Nicoll 02b951cab1 Upgrade to Sun Mail 1.6.7
Closes gh-25976
2021-04-09 14:02:46 +02:00
Stephane Nicoll 7e8c5fcb84 Upgrade to Spring Kafka 2.5.12.RELEASE
Closes gh-25975
2021-04-09 14:02:45 +02:00
Stephane Nicoll ae9576dfcb Upgrade to Spring Batch 4.2.6.RELEASE
Closes gh-25974
2021-04-09 14:02:44 +02:00
Stephane Nicoll f43f8f6d73 Upgrade to Spring AMQP 2.2.16.RELEASE
Closes gh-25973
2021-04-09 14:02:42 +02:00
Stephane Nicoll 4e0733e363 Upgrade to RSocket 1.0.4
Closes gh-25972
2021-04-09 14:02:41 +02:00
Stephane Nicoll 74016134b4 Upgrade to R2DBC Bom Arabba-SR9
Closes gh-25971
2021-04-09 14:02:40 +02:00
Stephane Nicoll 6c6c6aee78 Upgrade to Postgresql 42.2.19
Closes gh-25970
2021-04-09 14:02:39 +02:00
Stephane Nicoll dd9e705afb Upgrade to OAuth2 OIDC SDK 7.1.3
Closes gh-25969
2021-04-09 14:02:37 +02:00
Stephane Nicoll 877bc6d7e6 Upgrade to Netty tcNative 2.0.38.Final
Closes gh-25968
2021-04-09 14:02:36 +02:00
Stephane Nicoll 4eb20f4298 Upgrade to Netty 4.1.63.Final
Closes gh-25967
2021-04-09 14:02:35 +02:00
Stephane Nicoll 6a76ecfbc8 Upgrade to Neo4j OGM 3.2.21
Closes gh-25966
2021-04-09 14:02:33 +02:00
Stephane Nicoll 2ea065a6cf Upgrade to MongoDB 4.0.6
Closes gh-25965
2021-04-09 14:02:32 +02:00
Stephane Nicoll d2117b6b3f Upgrade to MIMEPull 1.9.14
Closes gh-25964
2021-04-09 14:02:31 +02:00
Stephane Nicoll cccb1332b3 Upgrade to Micrometer 1.5.12
Closes gh-25963
2021-04-09 14:02:29 +02:00
Stephane Nicoll f58cda7b53 Upgrade to Maven Invoker Plugin 3.2.2
Closes gh-25962
2021-04-09 14:02:28 +02:00
Stephane Nicoll 7ccebf5fb3 Upgrade to Lombok 1.18.20
Closes gh-25961
2021-04-09 14:02:27 +02:00
Stephane Nicoll 030af053ec Upgrade to Jetty 9.4.39.v20210325
Closes gh-25960
2021-04-09 14:02:26 +02:00
Stephane Nicoll e70590ecb8 Upgrade to Jetty Reactive HTTPClient 1.1.7
Closes gh-25959
2021-04-09 14:02:24 +02:00
Stephane Nicoll 7b61e0cad2 Upgrade to Jaybird 3.0.11
Closes gh-25958
2021-04-09 14:02:23 +02:00
Stephane Nicoll 894a4379f1 Upgrade to Jakarta Mail 1.6.7
Closes gh-25957
2021-04-09 14:02:22 +02:00
Stephane Nicoll 79679ff314 Upgrade to Hibernate 5.4.30.Final
Closes gh-25956
2021-04-09 14:02:21 +02:00
Stephane Nicoll 741d60563f Upgrade to Dropwizard Metrics 4.1.19
Closes gh-25955
2021-04-09 14:02:19 +02:00
Stephane Nicoll d599b0c558 Upgrade to Byte Buddy 1.10.22
Closes gh-25954
2021-04-09 14:02:18 +02:00
Stephane Nicoll bffa26fefa Upgrade to AppEngine SDK 1.9.88
Closes gh-25953
2021-04-09 14:02:17 +02:00
Stephane Nicoll d50e581403 Start building against Micrometer 1.7.0-RC1 snapshots
See gh-25934
2021-04-09 13:44:32 +02:00
Stephane Nicoll 555a3a79cb Start building against Spring WS 3.1.0-RC1 snapshots
See gh-25933
2021-04-09 13:40:17 +02:00
Stephane Nicoll 1f357f62cf Start building against Spring Session 2021.0.0-RC1 snapshots
See gh-25932
2021-04-09 13:40:17 +02:00
Stephane Nicoll fee62c41b9 Start building against Spring Security 5.5.0-RC1 snapshots
See gh-25931
2021-04-09 13:40:17 +02:00
Stephane Nicoll 03f2054984 Start building against Spring Kafka 2.7.0 snapshots
See gh-25930
2021-04-09 13:40:17 +02:00
Stephane Nicoll 3ee6a945ec Start building against Spring Data 2021.0.0 snapshots
See gh-25928
2021-04-09 12:43:14 +02:00
Stephane Nicoll 6bf6136aaf Upgrade to Jedis 3.6.0-RC1
Closes gh-25950
2021-04-09 12:43:13 +02:00
Stephane Nicoll b4ca1b9112 Start building against Spring HATEOAS 1.3.0 snapshots
See gh-25927
2021-04-09 08:57:16 +02:00
Stephane Nicoll 4290e0792b Start building against Spring Framework 5.3.6 snapshots
See gh-25926
2021-04-09 08:56:37 +02:00
Phillip Webb 7a636e5c08 Update @Timed WebFlux documentation
Closes gh-23112
2021-04-08 23:15:44 -07:00
Phillip Webb 15fe41868e Polish 'Support @Timed annotation for WebFlux'
Extract common method logic to a `HandlerMethodTimedAnnotations`
utility class and also add some caching. Also move the test code
into a single class.

See gh-23112
2021-04-08 23:01:21 -07:00
anshlykov 4ff4a9b082 Support @Timed annotation for WebFlux
Update `MetricsWebFilter` to support `@Timed` annotations on the WebFlux
handler methods or beans.

See gh-23112
2021-04-08 23:00:08 -07:00
Phillip Webb 7056a95ffc Polish 'Support system-dependent path separators'
See gh-24490
2021-04-08 20:49:02 -07:00
mederel f918a46ea2 Support system-dependent path separators
Update `StandardConfigDataLocationResolver` so that it recognizes
both `/` and `File.separator` suffixes as directories.

Prior to this commit, working with directories on Windows was awkward
since the path separator is `\`. If a directory were specified in the
form `c:\config\`, an exception was raised complaining it did not end
with '/'.

See gh-24490
2021-04-08 20:42:35 -07:00
Phillip Webb 6ad100eae6 Short circuit already covered property sources
Add an alternative `PropertySourcesPropertyResolver` that can short
circuit resolution of properties that are already covered by the
`ConfigurationPropertySourcesPropertySource`.

Prior to this commit, calling `getProperty` or `containsProperty` on an
`Environment` that has `ConfigurationPropertySources` attached could
result in two identical calls to the underlying source. The first call
would be via the adapted source, and the second would be direct. Since
we can now plug-in a custom `PropertySourcesPropertyResolver` to the
`Environment`, we can optimize resolution so that calls happen only
once.

Closes gh-17400
2021-04-08 20:29:54 -07:00
Phillip Webb 1d302f4c63 Add customer Application Environment subclasses
Add custom `ApplicationEnvironment`, `ApplicationServletEnvironment`
and `ApplicationReactiveWebEnvironment` subclasses for use with
`SpringApplication`. The subclasses all disable the resolution of
active and default profiles using properties since this is handled
directly by the `ConfigDataEnvironmentPostProcessor`.

Closes gh-24892
See gh-24890
2021-04-08 20:29:48 -07:00
Phillip Webb d938dd97bf Add with/without methods to ConfigData.Options
Add convenience methods to ConfigData.Options to allow new Options
instances to be created with options excluded or included.

See gh-25766
2021-04-08 13:21:14 -07:00
Scott Frederick 86303c017b Merge branch '2.4.x'
Closes gh-25938
2021-04-08 13:03:45 -05:00
Scott Frederick 9108b81bb2 Merge branch '2.3.x' into 2.4.x
Closes gh-25937
2021-04-08 13:03:26 -05:00
Scott Frederick 0ad7f76263 Preserve file permissions in images built by Gradle
This commit copies the file mode along with other attributes when
copying files from the source archive to the build container while
building an image using the Gradle plugin. This preserves file
permissions on any resources included in the source archive.

Fixes gh-25915
2021-04-08 12:56:41 -05:00
Brian Clozel 0929048bb4 Link build tools docs version properties section
Closes gh-25935
2021-04-08 18:18:11 +02:00
Stephane Nicoll 5aa1e683c0 Start building against Spring Session 2020.0.4 snapshots
See gh-25912
2021-04-08 18:02:04 +02:00
Stephane Nicoll 0f53663cf6 Start building against Spring Security 5.4.6 snapshots
See gh-25911
2021-04-08 18:02:03 +02:00
Stephane Nicoll aa8f5433ee Start building against Spring Data 2020.0.8 snapshots
See gh-25910
2021-04-08 18:02:03 +02:00
Stephane Nicoll f1b2db03e0 Start building against Spring Framework 5.3.6 snapshots
See gh-25909
2021-04-08 18:02:03 +02:00
Brian Clozel b4d2207902 Merge branch '2.4.x'
Closes gh-25936
2021-04-08 17:45:42 +02:00
Brian Clozel a0ee0601ef Fix SSL configuration with Reactor Netty
Prior to this commit, the SslServerCustomizer would use a Reactor Netty
API that lets users customize the SSL configuration, but later override
some of the choices with defaults.

This commits moves from the new deprecated Reactor Netty API and instead
uses a new variant that builds the defaults and lets developers override
them if they want to.

Fixes gh-25913
2021-04-08 17:09:31 +02:00
Stephane Nicoll b52902e92a Merge branch '2.4.x'
Closes gh-25923
2021-04-08 10:14:03 +02:00
Stephane Nicoll c6205f10f1 Merge branch '2.3.x' into 2.4.x
Closes gh-25922
2021-04-08 10:13:45 +02:00
Stephane Nicoll 25b7495d8e Polish "Properly close input streams when loading key stores"
See gh-25884
2021-04-08 09:25:03 +02:00
Alex Belyaev 1e3f5c342b Properly close input streams when loading key stores
See gh-25884
2021-04-08 09:21:58 +02:00
Phillip Webb e4164d0143 Fix package tangle in endpoint package
Fix package tangle in the actuator endpoint package by relocating a
few classes.

The `Producible` and `ProducibleOperationArgumentResolver` classes have
been moved from `endpoint.annotation` to `endpoint` since they aren't
directly tied to annotations.

The `ApiVersion` class has been moved from `endpoint.http` to
`endpoint` since it needs to implement `Producible` and isn't really
tied to HTTP.

Closes gh-25914
2021-04-07 16:54:37 -07:00
Phillip Webb e766c8b3a7 Revert "Switch default MVC path matching strategy"
This reverts commit ab8e599cfe.

See gh-24805
2021-04-07 15:17:02 -07:00
Phillip Webb ab8e599cfe Switch default MVC path matching strategy
Change the default `spring.mvc.pathmatch.matching-strategy` to
`PATH_PATTERN_PARSER`.

Closes gh-24805
2021-04-07 11:02:45 -07:00
Phillip Webb 455864bfa0 Allow 'servet.path' with path pattern parser
Remove the restriction previously prevented `spring.mvc.servlet.path`
from being combined with a `spring.mvc.pathmatch.matching-strategy`
of `PATH_PATTERN_PARSER`. Spring Framework supports this combination
as of v5.3.4.

See gh-24805
2021-04-07 10:59:55 -07:00
Stephane Nicoll 2a60503849 Start building against Spring Session Dragonfruit-SR3 snapshots
See gh-25907
2021-04-07 15:43:12 +02:00
Stephane Nicoll e4bf730f0b Start building against Spring Security 5.3.9 snapshots
See gh-25906
2021-04-07 15:42:42 +02:00
Stephane Nicoll b12a725977 Start building against Spring Data Neumann-SR9 snapshots
See gh-25905
2021-04-07 15:42:07 +02:00
Stephane Nicoll 80e893ebae Upgrade to Spring HATEOAS 1.1.5
Closes gh-25904
2021-04-07 15:41:34 +02:00
Stephane Nicoll aab5859fde Start building against Spring Framework 5.2.14 snapshots
See gh-25903
2021-04-07 15:41:17 +02:00
Stephane Nicoll ac1117f1a1 Start building against Reactor Reactor Dysprosium-SR19
See gh-25902
2021-04-07 15:40:40 +02:00
Andy Wilkinson 4d31182123 Polish "Add detection of Azure App Service to CloudPlatform"
See gh-25829
2021-04-07 12:34:54 +01:00
Julien Dubois 98a1017ee7 Add detection of Azure App Service to CloudPlatform
See gh-25829
2021-04-07 12:34:49 +01:00
Andy Wilkinson 8b5f914ba5 Revert "Merge branch '2.4.x'"
This reverts commit 97b26b4886, reversing
changes made to 6f9b1ed6a3.

See gh-25840
2021-04-07 10:20:23 +01:00
Andy Wilkinson e9ce20dbf4 Revert "Merge branch '2.3.x' into 2.4.x"
This reverts commit 586ce00e06, reversing
changes made to 563b8a8cec.

See gh-25839
2021-04-07 10:19:20 +01:00
Andy Wilkinson b35d1ec6e8 Revert "Use test harness for image building integration tests"
This reverts commit da9d8d6055.

See gh-25838
2021-04-07 09:30:51 +01:00
Phillip Webb 72ccab0aad Fix WebSessionManager auto-configuration order
Auto-configure `SessionAutoConfiguration` before
`WebFluxAutoConfiguration` to ensure that the correct
`WebSessionManager` bean is created.

See gh-20970
2021-04-06 22:43:42 -07:00
Phillip Webb 807ea1af0d Update copyright year of changed files 2021-04-06 14:59:52 -07:00
Phillip Webb 4b05dbf4a2 Polish 2021-04-06 14:59:13 -07:00
Andy Wilkinson 1994219399 Polish "Add config props for keep-alive timeout and max keep-alive reqs"
See gh-25815
2021-04-06 20:32:18 +01:00
Parviz Rozikov 34b94d8898 Add config props for keep-alive timeout and max keep-alive reqs
See gh-25815
2021-04-06 20:32:18 +01:00
Brian Clozel dc6b5badb8 Add SameSite session cookie config property for WebFlux
This commit adds a new `spring.webflux.session.cookie.same-site`
confuguration property that sets the default value for the "SameSite"
attribute in the WebFlux session cookies.

Closes gh-20970
2021-04-06 21:29:47 +02:00
Andy Wilkinson 73e1dd8728 Polish "Auto-configure Mongo metrics"
See gh-23990
2021-04-06 18:15:09 +01:00
bono007 81c18214d1 Auto-configure Mongo metrics
See gh-23990
2021-04-06 16:58:39 +01:00
Andy Wilkinson ef986b13e5 Polish Quartz endpoint documentation
See gh-10364
2021-04-06 16:56:17 +01:00
Stephane Nicoll b11602aeaa Polish "Add Quartz actuator endpoint"
This commit reworks the initial proposal so that jobs and triggers are
treated as first class concepts.

`/actuator/quartz` now returns the group names for jobs and triggers.

`actuator/quartz/jobs` returns the job names, keyed by the available
group names, while `/actuator/quartz/triggers` does the same for
triggers.

`/actuator/jobs/{groupName}` provides an overview of a job group. It
provides a map of job names with the class name of the job.
implementation

`/actuator/triggers/{groupName}` provides an overview of a trigger
group. There are five supported trigger implementations: cron, simple,
daily time interval, calendar interval, and custom for any other
implementation. Given that each implementation has specific settings,
triggers are split in five objects.

`/actuator/jobs/{groupName}/{jobName}` provides the full details of a
particular job. This includes a sanitized data map and a list of
triggers ordered by next fire time.

`/actuator/triggers/{groupName}/{triggerName}` provides the full details
of a particular trigger. This includes the state, its type, and a
dedicate object containing implementation-specific settings.

See gh-10364
2021-04-06 12:13:28 +02:00
Vedran Pavic 9795061360 Add Quartz actuator endpoint
See gh-10364
2021-04-06 11:36:54 +02:00
Andy Wilkinson 095ff18854 Test our Gradle plugin against Gradle 7.0-rc-2
Closes gh-25888
2021-04-06 10:30:35 +01:00
Phillip Webb a99f78c62f Merge branch '2.4.x' 2021-04-05 18:19:27 -07:00
Phillip Webb 8a04547454 Fix checkstyle violation
See gh-25766
2021-04-05 18:18:52 -07:00
Phillip Webb c6cd5117d4 Merge branch '2.4.x'
Closes gh-25887
2021-04-05 17:24:02 -07:00
Phillip Webb 5774ea3f0c Support profile specific ConfigData imports
Update the `ConfigData` import support to allow individual property
sources to be imported with a higher precedence than profile specific
imports.

Prior to this commit, imported sources would always have a higher
precedence than the file that imported them, but a lower precedence
than any profile-specific variant of the same file.

For example, given an `application.properties` that imports `myconfig`,
the contributor tree would be as follows:

	ROOT
	 +- `application.properties`
	 |    +- myconfig
	 +- `application-<profile>.properties`

The precedence would be:

	1) `application-<profile>.properties`
	2) myconfig
	3) `application.properties`

This works well for most situations, but can be confusing if import is
for a profile-specific property source. For example:

	ROOT
	 +- `application.properties`
	 |    +- myconfig
	 |    +- myconfig-<profile>
	 +- `application-<profile>.properties`

Results in the order precedence of:

	1) `application-<profile>.properties`
	2) myconfig-<profile>
	3) myconfig
	4) `application.properties`

This means that whilst `myconfig` overrides `application.properties`,
`myconfig-profile` does not override `application-<profile>.properties`.

For this specific situation, the preferable order would be:

	1) myconfig-<profile>
	2) `application-<profile>.properties`
	3) myconfig
	4) `application.properties`

To support this alternative ordering a new `PROFILE_SPECIFIC` config
data option has been added. Additionally, options may now be specified
on a per-source basis by using the `PropertySourceOptions` interface.

Fixes gh-25766
2021-04-05 15:55:03 -07:00
Stephane Nicoll d578e20b2d Merge branch '2.4.x'
Closes gh-25883
2021-04-05 09:10:56 +02:00
Tommy Ludwig 3746385f98 Polish HealthIndicators table in docs
`=======` was showing up in the header of the table, which should not
be there.

See gh-25882
2021-04-05 09:10:25 +02:00
Stephane Nicoll dd916f908f Merge branch '2.4.x'
Closes gh-25880
2021-04-04 11:19:13 +02:00
Stephane Nicoll db3dfffdca Polish contribution
See gh-25875
2021-04-04 11:15:49 +02:00
izeye 852e5778a3 Polish
See gh-25875
2021-04-04 11:12:03 +02:00
Brian Clozel 72a1eb6384 Allow to manually tag request metrics with exceptions
Prior to this commit, some exceptions handled at the controller or
handler function level would:

* not bubble up to the Spring Boot error handling support
* not be tagged as part of the request metrics

This situation is inconsistent because in general, exceptions handled at
the controller level can be considered as expected behavior.
Also, depending on how the exception is handled, the request metrics
might not be tagged with the exception.
This will be reconsidered in gh-23795.

This commit prepares a transition to the new situation. Developers can
now opt-in and set the handled exception as a request attribute. This
well-known attribute will be later read by the metrics support and used
for tagging the request metrics with the exception provided.

This mechanism is automatically used by the error handling support in
Spring Boot.

Closes gh-24028
2021-04-01 21:09:46 +02:00
Andy Wilkinson 66e9619d65 Merge branch '2.4.x'
Closes gh-25870
2021-04-01 19:21:31 +01:00
Andy Wilkinson 0005263f76 Merge branch '2.3.x' into 2.4.x
Closes gh-25869
2021-04-01 19:01:28 +01:00
Andy Wilkinson 1b91c1706e Ensure that Cassandra's DriverConfigLoader is only closed once
Fixes gh-25796
2021-04-01 18:57:35 +01:00
Andy Wilkinson 029f1b52b3 Merge branch '2.4.x'
Closes gh-25867
2021-04-01 16:51:42 +01:00
Andy Wilkinson ba28f21e27 Merge branch '2.3.x' into 2.4.x
Closes gh-25866
2021-04-01 16:51:31 +01:00
Andy Wilkinson cbf37b3a8b Use main as the branch name in info endpoint example
Closes gh-25865
2021-04-01 16:46:37 +01:00
Andy Wilkinson cbfeb18e6a Merge branch '2.4.x'
Closes gh-25864
2021-04-01 15:36:01 +01:00
Andy Wilkinson d82889f42e Merge branch '2.3.x' into 2.4.x
Closes gh-25863
2021-04-01 15:00:51 +01:00
Andy Wilkinson cf0bd0f959 Polish "Fix no such bean definition with ancestor-defined Validator"
See gh-25800
2021-04-01 15:00:10 +01:00
MatejNedic 8958101510 Fix no such bean definition with ancestor-defined Validator
See gh-25800
2021-04-01 14:59:50 +01:00
Andy Wilkinson 6a7de18101 Merge branch '2.4.x'
Closes gh-25862
2021-04-01 10:25:29 +01:00
Andy Wilkinson d1359220ed Merge branch '2.3.x' into 2.4.x
Closes gh-25861
2021-04-01 10:07:59 +01:00
Andy Wilkinson 7d632ea397 Use ApplicationContextRunner in ValidationAutoConfigurationTests
Closes gh-25859
2021-04-01 10:01:37 +01:00
Andy Wilkinson 7aabd8bf2d Ensure that class proxying is forced before AutoProxyCreator is created
Previously, using @EnableGlobalMethodSecurity would cause the
AutoProxyCreator to be created before the AOP auto-configuration had
called AopUtils.forceAutoProxyCreatorToUseClassProxying. Forcing
auto proxy creation changes the AutoProxyCreator's bean definition
so it has no effect when attempted after the creator has been created.

This commit updates the AOP auto-configuration to use a
BeanFactoryPostProcessor to force the use of class proxying. This
ensures that the changes to the auto proxy creator's bean definition
are in place before any bean creation has been performed.

Fixes gh-25413
2021-03-31 20:29:28 +01:00
Scott Frederick 5595fb2423 Polish "Extract XML examples from Maven plugin adoc files"
See gh-25534
2021-03-31 14:05:11 -05:00