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
1130f1dded
Merge branch '2.3.x'
...
Closes gh-22623
2020-07-28 14:37:16 +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
762f0a7e48
Merge branch '2.3.x'
2020-07-28 13:35:57 +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
65d45c4e25
Merge branch '2.3.x'
...
Closes gh-22619
2020-07-28 13:26:35 +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
8be8cc5452
Merge branch '2.3.x'
...
Closes gh-22618
2020-07-28 13:22:46 +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
273718c7df
Merge branch '2.3.x'
...
Closes gh-22612
2020-07-28 09:15:26 +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
a822c6fb97
Merge branch '2.3.x'
...
Closes gh-22609
2020-07-28 08:43:38 +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
Phillip Webb
84bcd0eb1e
Improve deprecated exception message
...
Update the exception message so that it includes the class name of the
implementation.
See gh-22497
2020-07-27 09:06:33 -07:00
Andy Wilkinson
1c22ec9373
Merge branch '2.3.x'
2020-07-27 16:00:54 +01:00
Andy Wilkinson
280ecfcd47
Polish
2020-07-27 16:00:47 +01:00
Andy Wilkinson
4c45c265ef
Merge branch '2.3.x'
...
Closes gh-22597
2020-07-27 15:53:21 +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
Stephane Nicoll
e6f1819e7f
Merge pull request #22301 from meistermeier
...
* pr/22301:
Polish "Add auto-configuration for Neo4j driver"
Add auto-configuration for Neo4j driver
Closes gh-22301
2020-07-27 16:49:59 +02:00
Stephane Nicoll
8c418adb9b
Polish "Add auto-configuration for Neo4j driver"
...
See gh-22301
2020-07-27 16:26:32 +02:00
Gerrit Meier
6134ff19f9
Add auto-configuration for Neo4j driver
...
This commit adds the support for creating a managed instance of the
Neo4j Java driver. The low-level support for Neo4j is helpful in
situations where the high-level abstraction of Spring Data Neo4j is not
needed.
See gh-22301
2020-07-27 16:26:32 +02:00
Andy Wilkinson
a46572a884
Merge branch '2.3.x'
...
Closes gh-22593
2020-07-27 15:24:14 +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
543384bfe6
Merge branch '2.3.x'
...
Closes gh-22590
2020-07-27 14:48:43 +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
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