10300 Commits

Author SHA1 Message Date
Andy Wilkinson
c2df326f6f Merge branch '2.2.x' into 2.3.x
Closes gh-22611
2020-07-28 09:15:14 +01:00
Andy Wilkinson
ea5284ca91 Polish "Use milliseconds when configuring awaitTerminationPeriod"
See gh-22604
2020-07-28 09:03:57 +01:00
Tadaya Tsuyukubo
685a6116d1 Use milliseconds when configuring awaitTerminationPeriod
Prior to this change, TaskExecutorBuilder used seconds as its precision
to map the awaitTerminationPeriod value. This caused a loss of
millisecond information in the period.

This commit fixes the loss by converting the period to millisecond and
using setAwaitTerminationMillis to configure the executor.

See gh-22604
2020-07-28 09:01:55 +01:00
Andy Wilkinson
5471e16fce Merge branch '2.2.x' into 2.3.x
Closes gh-22608
2020-07-28 08:43:19 +01:00
Andy Wilkinson
d9b61c4aaa Update link to App Engine's Spring Boot sample
Closes gh-22607
2020-07-28 08:42:40 +01:00
Andy Wilkinson
280ecfcd47 Polish 2020-07-27 16:00:47 +01:00
Andy Wilkinson
189fa12c9d Merge branch '2.2.x' into 2.3.x
Closes gh-22596
2020-07-27 15:53:03 +01:00
Andy Wilkinson
0a01875d41 Improve documentation about swapping one technical starter for another
Closes gh-20408
2020-07-27 15:50:07 +01:00
Andy Wilkinson
4a3683f7dd Merge branch '2.2.x' into 2.3.x
Closes gh-22592
2020-07-27 15:23:55 +01:00
Andy Wilkinson
812a0ed0c6 Define the reference doc authors in a single place
Closes gh-20896
2020-07-27 15:20:59 +01:00
Andy Wilkinson
810fdf4450 Merge branch '2.2.x' into 2.3.x
Closes gh-22589
2020-07-27 14:48:33 +01:00
Andy Wilkinson
b631fa1405 Describe MongoClientSettingsBuilderCustomizer in the documentation
Closes gh-21696
2020-07-27 14:46:30 +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
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
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
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
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
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
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
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
ce7210c4f0 Merge branch '2.1.x' into 2.2.x
Closes gh-22563
2020-07-25 09:06:11 +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
7ed54bda96 Fix typo for management.health.readinessstate.enabled
Closes gh-22560
2020-07-25 07:20:06 +02:00
Andy Wilkinson
98115239b3 Only create effective bom artifact when needed
Closes gh-22143
2020-07-24 16:44:46 +01:00
Andy Wilkinson
63cac4bedd Upgrade to Micrometer 1.5.3
Closes gh-22553
2020-07-24 15:53:35 +01:00
Andy Wilkinson
1a43cd1c8e Merge branch '2.1.x' into 2.2.x
Closes gh-22551
2020-07-24 14:28:11 +01:00
Nelson Osacky
0494007893 Disable extra scans for full profile.
The extra scans were not disabled for the full profile, only the
regular profile.

See gh-22550
2020-07-24 14:27:32 +01:00
Andy Wilkinson
f4508b4059 Merge branch '2.1.x' into 2.2.x
Closes gh-22547
2020-07-24 11:54:12 +01:00
Nelson Osacky
e41a53cf85 Add Gradle Enterprise Extension
This adds build caching and build scans.

The changes required disabling scans when using the maven invoker
plugin in order to not cause duplicate build scans when invoking other
maven builds. There is also an empty `.mvn` folder in the
spring-boot-starters project to prevent duplicate build scans as well
since there is no way to pass properties to the maven-javadoc-plugin.

The checkstyle plugin was causing a cache miss with the
`propertyExpansion` because it contains an absolute path. The absolute
path is now ignored and instead the files are added as inputs to the
checkstyle plugin. This only enables the local build cache. The remote
cache is not yet enabled.

On my local machine:

./mvnw clean install build times go from about 30 minutes to about 10 minutes.
./mvnw clean install -Pfull build times go from about 60 minutes to about 13 minutes.

See gh-22089
2020-07-24 11:47:24 +01:00
Andy Wilkinson
c605a6e34b Override other variant of registerBeanDefintions
Fixes gh-22480
2020-07-24 10:33:16 +01:00
Andy Wilkinson
9c5e59371f Upgrade to Jackson 2.10.5
Closes gh-22432
2020-07-23 21:12:08 +01:00
Andy Wilkinson
39c8898008 Upgrade to MariaDB 2.6.2
Closes gh-22541
2020-07-23 21:05:32 +01:00
Andy Wilkinson
44e6cf2e55 Upgrade to AspectJ 1.9.6
Closes gh-22540
2020-07-23 21:05:31 +01:00
Andy Wilkinson
f93bae4bd3 Upgrade to Aspectj 1.9.6
Closes gh-22539
2020-07-23 21:03:51 +01:00
Andy Wilkinson
ce803cc678 Upgrade to Micrometer 1.3.11
Closes gh-22538
2020-07-23 21:03:49 +01:00
Andy Wilkinson
698db27a75 Upgrade to Aspectj 1.9.6
Closes gh-22537
2020-07-23 21:02:36 +01:00
Andy Wilkinson
db242794ec Upgrade to Micrometer 1.1.16
Closes gh-22536
2020-07-23 21:02:34 +01:00
Stephane Nicoll
e9a966a0a2 Upgrade to Groovy 2.5.13
Closes gh-22526
2020-07-23 11:06:12 +02:00
Stephane Nicoll
4f3b03afcf Merge branch '2.1.x' into 2.2.x
Closes gh-22525
2020-07-23 11:01:05 +02:00
Stephane Nicoll
0440a9a78c Upgrade to Groovy 2.5.13
Closes gh-22505
2020-07-23 10:55:47 +02:00
Phillip Webb
187d3af7fc Update copyright year of changed files 2020-07-22 17:25:17 -07:00
Phillip Webb
d2a7808098 Polish 2020-07-22 17:25:04 -07:00
Phillip Webb
217b2eff89 Merge branch '2.2.x' into 2.3.x 2020-07-22 17:03:23 -07:00