Commit Graph

27432 Commits

Author SHA1 Message Date
Stephane Nicoll
12d78b26b9 Merge branch '2.2.x' into 2.3.x
Closes gh-22626
2020-07-28 16:29:36 +02:00
Stephane Nicoll
16aa8fbc88 Fix actuator dependency on Jackson JSR 310 module
This commit harmonizes dependency declarations for Jackson in the
actuator. Both Jackson and JSR 310 are back to optional in the core
actuator module and mandatory when using the auto-configuration.

Closes gh-22624
2020-07-28 16:26:11 +02:00
Andy Wilkinson
7a67ce997f Merge branch '2.2.x' into 2.3.x 2020-07-28 15:19:35 +01:00
Andy Wilkinson
8035af90f0 Merge branch '2.1.x' into 2.2.x 2020-07-28 15:19:23 +01:00
Andy Wilkinson
f2d27047e2 Correct the version of the GE Maven Extension 2020-07-28 15:19:06 +01:00
Andy Wilkinson
d6490da88b Merge branch '2.2.x' into 2.3.x
Closes gh-22622
2020-07-28 14:37:07 +01:00
Andy Wilkinson
856c55b188 List DevTools in section overview of multi-page documentation
Closes gh-22591
2020-07-28 14:36:23 +01:00
Andy Wilkinson
1ef4e6a951 Merge branch '2.2.x' into 2.3.x 2020-07-28 13:35:48 +01:00
Andy Wilkinson
5ac4a8a5e6 Merge branch '2.1.x' into 2.2.x
Closes gh-22620
2020-07-28 13:35:19 +01:00
Andy Wilkinson
68e2a9baa7 Merge pull request #22614 from runningcode
* gh-22614:
  Upgrade to Gradle Enterperise Maven Extension 1.6.0

Closes gh-22614
2020-07-28 13:35:03 +01:00
Nelson Osacky
d438f69eef Upgrade to Gradle Enterperise Maven Extension 1.6.0
See gh-22614
2020-07-28 13:34:28 +01:00
Andy Wilkinson
f7357aaf73 Merge pull request #22616 from dreis2211
* gh-22616:
  Add ElasticsearchReactiveHealthIndicator to docs

Closes gh-22616
2020-07-28 13:26:30 +01:00
dreis2211
be8a70936d Add ElasticsearchReactiveHealthIndicator to docs
See gh-22616
2020-07-28 13:25:04 +01:00
Andy Wilkinson
a2ce39d7eb Merge branch '2.2.x' into 2.3.x
Closes gh-22617
2020-07-28 13:22:32 +01:00
Andy Wilkinson
3212b942a0 Merge pull request #22598 from dreis2211
* gh-22598:
  Fix link to Elasticsearch health indicator

Closes gh-22598
2020-07-28 13:21:31 +01:00
dreis2211
c405b8b9c9 Fix link to Elasticsearch health indicator
See gh-22598
2020-07-28 13:21:09 +01:00
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
f4afd076c9 Merge pull request #22604 from ttddyy
* gh-22604:
  Polish "Use milliseconds when configuring awaitTerminationPeriod"
  Use milliseconds when configuring awaitTerminationPeriod

Closes gh-22604
2020-07-28 09:15:03 +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
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
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