Commit Graph

50613 Commits

Author SHA1 Message Date
Madhura Bhave
977140053b Merge pull request #24325 from dreis2211
* pr/24325:
  Remove System.out.println in DevToolsPropertyDefaultsPostProcessor

Closes gh-24325
2020-12-03 16:25:57 -08:00
dreis2211
faec47d332 Remove System.out.println in DevToolsPropertyDefaultsPostProcessor
See gh-24325
2020-12-03 16:25:03 -08:00
Madhura Bhave
13a5ec169c Merge pull request #24323 from dreis2211
* pr/24323:
  Remove deprecated ExposeExcludePropertyEndpointFilter

Closes gh-24323
2020-12-03 16:18:49 -08:00
dreis2211
3e2d0c6d86 Remove deprecated ExposeExcludePropertyEndpointFilter
See gh-24323
2020-12-03 16:18:35 -08:00
Madhura Bhave
d041c7d6b9 Document the granularity for property document imports
Closes gh-22987
2020-12-03 12:17:53 -08:00
Madhura Bhave
932fb65107 Correct external application properties load order
Fixes gh-24308
2020-12-03 11:55:51 -08:00
Madhura Bhave
6c6e339dbb Merge branch '2.3.x'
Closes gh-24316
2020-12-02 10:57:05 -08:00
Madhura Bhave
f569d7616d Merge branch '2.2.x' into 2.3.x
Closes gh-24315
2020-12-02 10:56:23 -08:00
Madhura Bhave
7b38b0ed11 Add SDKMAN to pipeline
Closes gh-11987
2020-12-02 10:52:41 -08:00
Phillip Webb
3dc03ac275 Refine non-optional classpath location checking
Update `StandardConfigDataLocationResolver` to no longer check if
directories exist for classpath resources. Unfortunately checking for
the parent directory of a `ClassPathResource` isn't always possible
without resorting something similar to the
`PathMatchingResourcePatternResolver` which would add a lot of
complexity to the resolver.

In order to ensure that non-optional locations are always resolved,
the `ConfigDataEnvironment` now checks that all imported locations
have been loaded.

Closes gh-24143
2020-12-01 21:33:59 -08:00
Scott Frederick
01478a25b4 Handle wrapper types in Env actuator
This commit modifies the actuator `EnvironmentEndpoint` to allow
primitive wrapper types to be serialized in the response data
structure.

Fixes gh-24307
2020-12-01 15:12:13 -06:00
Stephane Nicoll
bd7e89be1a Start building against Spring Framework 5.3.2 snapshots
See gh-24278
2020-11-30 17:18:35 +01:00
Stephane Nicoll
7c59d8a32f Start building against Reactor 2020.0.2 snapshots
See gh-24275
2020-11-30 17:17:27 +01:00
Stephane Nicoll
7bdeda6b6c Merge branch '2.3.x' 2020-11-30 17:14:08 +01:00
Stephane Nicoll
065fde2996 Start building against Spring Framework 5.2.12 snapshots
See gh-24277
2020-11-30 16:42:38 +01:00
Stephane Nicoll
5f81882305 Start building against Reactor Dysprosium-SR15 snapshots
See gh-24274
2020-11-30 16:41:32 +01:00
Stephane Nicoll
98f6e19610 Merge branch '2.2.x' into 2.3.x 2020-11-30 16:40:39 +01:00
Stephane Nicoll
9763ba56ba Start building against Spring Framework 5.2.12 snapshots
See gh-24276
2020-11-30 16:04:27 +01:00
Stephane Nicoll
afeb9f29d4 Start building against Reactor Dysprosium-SR15 snasphots
See gh-24273
2020-11-30 14:32:15 +01:00
Stephane Nicoll
23543b078c Merge pull request #24268 from JimStockwell
* pr/24268:
  Mark OriginTrackedPropertiesLoader#isNewDocument private

Closes gh-24268
2020-11-27 09:22:41 +01:00
Jim Stockwell
728e474f7f Mark OriginTrackedPropertiesLoader#isNewDocument private
See gh-24268
2020-11-27 09:16:01 +01:00
Stephane Nicoll
e6ccbfb017 Merge branch '2.3.x'
Closes gh-24259
2020-11-26 09:02:33 +01:00
Stephane Nicoll
b4a1030b97 Merge pull request #24257 from JimStockwell
* pr/24257:
  Fix ErrorAttributeOptions#getIncludes Javadoc

Closes gh-24257
2020-11-26 09:02:18 +01:00
Jim Stockwell
bb7ad30de4 Fix ErrorAttributeOptions#getIncludes Javadoc
See gh-24257
2020-11-26 09:00:52 +01:00
Stephane Nicoll
4fe4480629 Merge pull request #24245 from joca-bt
* pr/24245:
  Fix typo

Closes gh-24245
2020-11-25 14:57:59 +01:00
João Guerra
1d6bacf1c8 Fix typo
See gh-24245
2020-11-25 14:57:14 +01:00
Stephane Nicoll
39953bb36c Merge pull request #24152 from gesellix
* pr/24152:
  Polish "Check that WebClient is available"
  Check that WebClient is available

Closes gh-24152
2020-11-25 14:55:13 +01:00
Stephane Nicoll
f248cfe79c Polish "Check that WebClient is available"
See gh-24152
2020-11-25 14:52:47 +01:00
Tobias Gesellchen
f6255cc691 Check that WebClient is available
This commit reinstanties the isWeBClientPresent() check so that
WebTestClientContextCustomizer is only added if a web client is
available.

See gh-24152
2020-11-25 14:38:42 +01:00
Stephane Nicoll
b1678ee6ad Merge branch '2.3.x'
Closes gh-24251
2020-11-25 14:36:16 +01:00
Stephane Nicoll
9b992af34b Merge branch '2.2.x' into 2.3.x
Closes gh-24250
2020-11-25 14:31:30 +01:00
Stephane Nicoll
47efbd9052 Merge pull request #24208 from xJoeWoo
* pr/24208:
  Polish "Reduce redis health indicator info command result size"
  Reduce redis health indicator info command result size

Closes gh-24208
2020-11-25 14:30:39 +01:00
Stephane Nicoll
d506f0c73e Polish "Reduce redis health indicator info command result size"
See gh-24208
2020-11-25 14:27:07 +01:00
xJoeWoo
99cc3f4bfc Reduce redis health indicator info command result size
See gh-24208
2020-11-25 14:23:57 +01:00
Stephane Nicoll
8bcc3d1b09 Merge branch '2.3.x'
Closes gh-24234
2020-11-23 20:51:58 +01:00
Stephane Nicoll
c383ab7883 Merge pull request #24230 from wanderleisouza
* pr/24230:
  Polish "Allow to exclude an empty set of ErrorAttributes"
  Allow to exclude an empty set of ErrorAttributes

Closes gh-24230
2020-11-23 20:50:52 +01:00
Stephane Nicoll
016b69aa78 Polish "Allow to exclude an empty set of ErrorAttributes"
See gh-24230
2020-11-23 20:44:18 +01:00
Wanderlei Souza
6518f8f7fd Allow to exclude an empty set of ErrorAttributes
See gh-24230
2020-11-23 20:43:59 +01:00
Andy Wilkinson
e4380275e5 Merge branch '2.3.x'
Closes gh-24224
2020-11-20 12:07:01 +00:00
Andy Wilkinson
4e9f702681 Only run deployment tests when war has material changes
Closes gh-24137
2020-11-20 12:05:51 +00:00
Andy Wilkinson
11c81ad245 Merge branch '2.3.x'
Closes gh-24223
2020-11-20 11:48:51 +00:00
Andy Wilkinson
7efa1e47aa Merge branch '2.2.x' into 2.3.x
Closes gh-24222
2020-11-20 11:48:25 +00:00
Andy Wilkinson
12f2529be5 Allow actuator endpoint to have responses with custom HTTP statuses
Fixes gh-24123
2020-11-20 11:38:31 +00:00
Andy Wilkinson
1f3012b466 Merge branch '2.3.x'
Closes gh-24220
2020-11-20 11:36:45 +00:00
Andy Wilkinson
0ed7f7f40a Merge branch '2.2.x' into 2.3.x
Closes gh-24219
2020-11-20 11:36:31 +00:00
Andy Wilkinson
fbf4c8cd32 Merge pull request #24095 from artembilan
* gh-24095:
  Polish "Ensure that MeterRegistry bean is defined before SI looks for it"
  Ensure that MeterRegistry bean is defined before SI looks for it

Closes gh-24095
2020-11-20 11:36:17 +00:00
Andy Wilkinson
08b9d1da57 Polish "Ensure that MeterRegistry bean is defined before SI looks for it"
See gh-24095
2020-11-20 11:20:31 +00:00
Artem Bilan
7d712aaa2d Ensure that MeterRegistry bean is defined before SI looks for it
Previously, it was possible for Spring Integration, including its
built-in Micrometer support, to be auto-configured before the
Micrometer auto-configuration had defined the MeterRegistry bean. This
resulted in missing Spring Integration metrics.

Spring Integration is unusual in having its own built-in Micrometer
support that it configures itself. Rather than providing
auto-configuration for Integration's Micrometer support (Which isn't
needed), this commit introduces some auto-configuration that just
affects the ordering of the auto-configuration classes. This ordering
ensures that the MeterRegistry bean has been defined by Spring
Integration is auto-configured. This ensures that the MeterRegistry
bean is known to the BeanFactory when Spring Integration goes looking
for it.

See gh-24095
2020-11-20 11:18:09 +00:00
Andy Wilkinson
4a7bc3d096 Require bean name match for Locale(Context)Resolver to back off
Web MVC and WebFlux look up by name the Locale(Context)Resolver beans
that they use. Previously, the auto-configured resolvers for MVC and
WebFlux would back off when any bean of the required type was defined,
irrespective of its name. If the name of the user's bean didn't match
the name used by MVC and WebFlux to find the custom resolver, the
custom resolver would be ignored and MVC and WebFlux would use their
defaults. There was no indication of this happening in the condition
evaluation report as all it would show is that the auto-configured
resolver had backed off in favour of the custom resolver. It wouldn't
show anything to explain why the custom resolver had not been used.

This commit updates the auto-configured resolvers to be conditional
on a missing bean of the name required by MVC and WebFlux. If the
user then defines a custom resolver with a different name, the
condition evaluation report will show that the auto-configured
resolver remained as the bean name didn't match.

Fixes gh-24209
2020-11-20 10:35:30 +00:00
Madhura Bhave
e342d7d262 Fix processing of line immediately after # in properties file
Fixes gh-24158
2020-11-18 11:33:37 -08:00