Commit Graph

27986 Commits

Author SHA1 Message Date
Andy Wilkinson
b631fa1405 Describe MongoClientSettingsBuilderCustomizer in the documentation
Closes gh-21696
2020-07-27 14:46:30 +01:00
Andy Wilkinson
b8b53a0e3b Merge branch '2.3.x'
Closes gh-22588
2020-07-27 14:12:09 +01:00
Andy Wilkinson
c2aa6cbc60 Merge branch '2.2.x' into 2.3.x
Closes gh-22587
2020-07-27 14:10:22 +01:00
Andy Wilkinson
be428ef0f2 Document the need for configuration files to have a file extension
Closes gh-22278
2020-07-27 14:09:54 +01:00
Andy Wilkinson
1efac09913 Merge branch '2.3.x'
Closes gh-22586
2020-07-27 13:37:34 +01:00
Andy Wilkinson
8ff2b9f2e8 Merge branch '2.2.x' into 2.3.x
Closes gh-22585
2020-07-27 13:37:23 +01:00
Andy Wilkinson
1b48daf1d5 Do not ignore unknown fields when invalid fields are being ignored
Previously, ignoring invalid fields would cause the failure for an
unknown field to be ignored, irrespective of the ignoreUnknownFields
attribute on `@ConfigurationProperties`.

This commit updates the NoUnboundElementsBindHandler to ensure that
any UnboundConfigurationPropertiesException is thrown rather than
being ignored when the handler has been wrapped by an
IgnoreErrorsBindHandler.

Fixes gh-22308
2020-07-27 13:28:44 +01:00
Andy Wilkinson
d16838e4b7 Merge branch '2.3.x'
Closes gh-22584
2020-07-27 13:08:40 +01:00
Andy Wilkinson
39cb912819 Merge branch '2.2.x' into 2.3.x
Closes gh-22583
2020-07-27 13:08:14 +01:00
Andy Wilkinson
41954533b2 Fix Mock|SpyBean context caching
The fix for gh-20916 updated DefinitionsParser so that the
ResolvableType for each MockBean or SpyBean field included the
implementation class from which the field was found. Where the field
was declared with a variable generic signature that was made constant
by its implementation class, this allowed the correct concrete type to
be determined. It also had the unintended side-effect of preventing two
test classes with identical `@MockBean` and `@SpyBean` configuration
from sharing a context as the resolvable types for their mock and spy
bean fields would now be different.

This commit updates DefinitionsParser to only include the
implementation class in the ResolvableType if the field's generic type
is variable. For cases where it is not variable, this restores the
behaviour prior to the fix for gh-20916.

Fixes gh-22566
2020-07-27 13:04:02 +01:00
Andy Wilkinson
4827e84a12 Merge branch '2.3.x'
Closes gh-22581
2020-07-27 11:30:34 +01:00
Andy Wilkinson
d0c75aef19 Merge branch '2.2.x' into 2.3.x
Closes gh-22580
2020-07-27 11:29:14 +01:00
Andy Wilkinson
16eaae0b2f Defer background pre-init till the environment is prepared
Previously, background pre-init was started in response to the
application starting event. This meant that it would be running while
the logging turbo filter was in place and was rejecting all logging.
As a result, any logging performed during pre-init would be lost.

This commit changes background pre-init so that it is now started
in response to the application environment prepared event. By this
point, the logging turbo filter has been removed as the logging levels
have been configured from the environment.

Closes gh-21897
2020-07-27 11:24:36 +01:00
Andy Wilkinson
3444a23765 Merge branch '2.3.x'
Closes gh-22579
2020-07-27 10:58:15 +01:00
Andy Wilkinson
f0d90020e5 Merge branch '2.2.x' into 2.3.x
Closes gh-22578
2020-07-27 10:57:58 +01:00
Andy Wilkinson
b98c3dccfd Fix property-based configuration of Undertow socket options
Previously, only UndertowOptions was used as the source of options for
both server and socket options, but it only contains server options.
As a result, attempting to configure any socket options defined by
XNIO's Options class would fail.

This commit updates the property-based configuration of options to use
UndertowOptions as the source for server options and XNIO's Options as
the source for socket options.

Fixes gh-22502
2020-07-27 10:47:14 +01:00
Andy Wilkinson
8a9cc64221 Merge branch '2.3.x'
Closes gh-22577
2020-07-27 10:12:09 +01:00
Andy Wilkinson
5279b90ced Merge branch '2.2.x' into 2.3.x
Closes gh-22576
2020-07-27 10:11:47 +01:00
Andy Wilkinson
1c3528f5a4 Include Jackson Modules in WebMvcTest and WebFluxTest
Fixes gh-22530
2020-07-27 10:11:29 +01:00
Andy Wilkinson
6b4114e4cf Merge branch '2.3.x'
Closes gh-22575
2020-07-27 09:59:22 +01:00
Andy Wilkinson
979aef1f68 Merge branch '2.2.x' into 2.3.x
Closes gh-22574
2020-07-27 09:59:07 +01:00
Andy Wilkinson
7b3c0a9e09 Advise against java.util.Optional configuration properties
Closes gh-21868
2020-07-27 09:58:24 +01:00
Stephane Nicoll
85ed16de13 Merge branch '2.3.x'
Closes gh-22568
2020-07-26 17:26:30 +02:00
Stephane Nicoll
6b32e62142 Fix CacheAutoConfiguration relative order for Couchbase
This commit fixes the auto-configuration of the Couchbase caching
support by configuring the cache once Spring Data Couchbase has gotten
a chance to be processed.

Closes gh-22542
2020-07-26 17:24:24 +02:00
Andy Wilkinson
edca4be021 Merge branch '2.3.x' 2020-07-26 10:09:40 +01:00
Andy Wilkinson
43524575cc Merge branch '2.2.x' into 2.3.x 2020-07-26 10:09:33 +01:00
Andy Wilkinson
162253948a Merge branch '2.1.x' into 2.2.x 2020-07-26 10:08:22 +01:00
Andy Wilkinson
25866019c9 Polish pipeline env vars used by Gradle Enterprise 2020-07-26 10:05:26 +01:00
Andy Wilkinson
04777d06d9 Merge branch '2.3.x' 2020-07-25 10:36:33 +01:00
Andy Wilkinson
8d665a1eea Merge branch '2.2.x' into 2.3.x 2020-07-25 10:36:26 +01:00
Andy Wilkinson
750777db24 Merge branch '2.1.x' into 2.2.x 2020-07-25 10:36:19 +01:00
Andy Wilkinson
5d776f2a8b Set user.name in CI builds so it's picked up by Gradle Enterprise 2020-07-25 10:33:39 +01:00
Andy Wilkinson
d5ec823454 Merge branch '2.3.x' 2020-07-25 10:29:08 +01:00
Andy Wilkinson
8b84f66132 Merge branch '2.2.x' into 2.3.x 2020-07-25 10:28:52 +01:00
Andy Wilkinson
1dfa21c99f Merge branch '2.1.x' into 2.2.x 2020-07-25 10:28:35 +01:00
Andy Wilkinson
141c59e348 Set BRANCH env var so it's available to Gradle Enterprise 2020-07-25 10:26:53 +01:00
Andy Wilkinson
4eb24754af Merge branch '2.3.x' 2020-07-25 09:14:29 +01:00
Andy Wilkinson
43316fa6b6 Merge branch '2.2.x' into 2.3.x 2020-07-25 09:14:12 +01:00
Andy Wilkinson
4a828c7db1 Merge branch '2.1.x' into 2.2.x 2020-07-25 09:10:50 +01:00
Andy Wilkinson
45d50e279e Disable build scans in custom layout sample's tests 2020-07-25 09:10:31 +01:00
Andy Wilkinson
9a4ed48627 Merge branch '2.3.x' 2020-07-25 09:07:56 +01:00
Andy Wilkinson
8eca4d9d8d Merge branch '2.2.x' into 2.3.x 2020-07-25 09:07:43 +01:00
Andy Wilkinson
ce7210c4f0 Merge branch '2.1.x' into 2.2.x
Closes gh-22563
2020-07-25 09:06:11 +01:00
Andy Wilkinson
ebfa26e3ac Merge pull request #22555 from runningcode
* gh-22555:
  Polish "Add generated-snippets as output to test goal"
  Add generated-snippets as output to test goal

Closes gh-22555
2020-07-25 09:05:05 +01:00
Andy Wilkinson
d1ea5befea Polish "Add generated-snippets as output to test goal"
See gh-22555
2020-07-25 08:27:05 +01:00
Nelson Osacky
585aed8f8f Add generated-snippets as output to test goal
The generated snippets were not declared as an output to the
`spring-boot-actuator-autoconfigure` test goal so when the test was
pulled from the cache, it did not contain the `generated-snippets`
directory. This directory is required as an input to the Asciidoctor
plugin.

See gh-22555
2020-07-25 08:26:15 +01:00
Stephane Nicoll
71fbd794fa Merge pull request #22549 from izeye
* pr/22549:
  Polish

Closes gh-22549
2020-07-25 07:26:59 +02:00
izeye
6eba7c5f10 Polish
See gh-22549
2020-07-25 07:26:49 +02:00
Stephane Nicoll
42155321cb Merge branch '2.3.x'
Closes gh-22561
2020-07-25 07:20:50 +02:00
Stephane Nicoll
7ed54bda96 Fix typo for management.health.readinessstate.enabled
Closes gh-22560
2020-07-25 07:20:06 +02:00