Andy Wilkinson
9da3b65ff3
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25174
2021-02-10 19:41:56 +00:00
Andy Wilkinson
708cbd7294
Ignore events from other contexts when waiting for DS init to complete
...
Fixes gh-24966
2021-02-10 15:07:44 +00:00
Stephane Nicoll
46bc551c2b
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25169
2021-02-10 15:14:21 +01:00
Stephane Nicoll
1524793a92
Fix use of deprecated Cassandra properties in integration tests
...
Closes gh-25148
2021-02-10 15:12:20 +01:00
Andy Wilkinson
45e6c12cb6
Consider transitives when identifying project dependencies
...
Previously, when building a layered jar, the Gradle plugin only
considered a configuration's direct dependencies when identifying
project dependencies. This resulted in transitive project dependencies
being missed when deciding which dependencies belong in the
application layer.
This commit updates ResolvedDependencies to consider all projects
from the root project when collecting the IDs of local projects. This
ensures that any project dependency, no matter where it appears in the
dependency graph, is successfully identified.
Fixes gh-25163
2021-02-10 12:10:07 +00:00
Stephane Nicoll
7cb1605c11
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25166
2021-02-10 10:45:54 +01:00
Stephane Nicoll
e5098697cb
Polish "Validate Cassandra defaults"
...
See gh-25130
2021-02-10 10:18:28 +01:00
bono007
f71ab69aeb
Validate Cassandra defaults
...
See gh-25130
2021-02-10 10:15:31 +01:00
Stephane Nicoll
acc8f3708b
Update copyright of changed file
...
See gh-25150
2021-02-10 09:37:04 +01:00
bono007
4ef82c45ac
Fix defaults for Cassandra's initQueryTimeout and idleTimeout
...
See gh-25150
2021-02-10 09:36:17 +01:00
Andy Wilkinson
caa9249987
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25142
2021-02-09 14:11:59 +00:00
Andy Wilkinson
7898b6afb0
Remove duplicate publication from spring-boot-docs
...
Fixes gh-25132
2021-02-09 14:10:58 +00:00
Stephane Nicoll
9218965104
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25140
2021-02-09 15:04:28 +01:00
dreis2211
4937547b8a
Fix build deprecation warnings about duplicate jar entries
...
See gh-25116
2021-02-09 14:45:58 +01:00
izeye
63ee99bf75
Polish
...
See gh-25093
2021-02-09 09:48:35 +01:00
Stephane Nicoll
b2818680fd
Polish "Clarify usage of BufferingApplicationStartup"
...
See gh-25075
2021-02-09 09:44:19 +01:00
Oleg Sukhov
853dbc3de3
Clarify usage of BufferingApplicationStartup
...
See gh-25075
2021-02-09 09:21:52 +01:00
Andy Wilkinson
297e3079d0
Fix handling of UriTemplateRequestEntity in TestRestTemplate
...
A change [1] in Spring Framework 5.3 means that getUrl() on a
RequestEntity will throw an UnsupportedOperationException if the
entity was created using a template.
This commit updates TestRestTemplate to check for instances of
UriTemplateRequestEntity and to resolve the URI using the
entity's UriTemplateHandler instead of calling getUrl() directly.
Fixes gh-25097
[1] a0f4d81db7
2021-02-04 10:59:00 +00:00
Andy Wilkinson
788a42d694
Merge branch '2.3.x' into 2.4.x
...
See gh-25076
2021-02-02 15:12:27 +00:00
Andy Wilkinson
67479b6380
Add junit-platform-launcher dependency by convention
...
Closes gh-25074
2021-02-02 13:03:21 +00:00
Phillip Webb
230b4ab2eb
Merge branch '2.3.x' into 2.4.x
2021-02-01 22:10:52 -08:00
Phillip Webb
630d216430
Update copyright year of changed files
2021-02-01 22:10:24 -08:00
Phillip Webb
331c7b756b
Merge branch '2.3.x' into 2.4.x
2021-02-01 19:46:49 -08:00
Phillip Webb
c404a50a2e
Allow test to use snapshot/milestone repo
...
Update `spring-boot-maven-plugin` `settings.xml` so that milestone and
snapshot dependencies can be resolved.
See gh-23936
2021-02-01 19:45:11 -08:00
Phillip Webb
003f2f9521
Merge branch '2.3.x' into 2.4.x
2021-02-01 17:07:07 -08:00
Phillip Webb
faaa5e4186
Fix BOM attached sourceSet
...
See gh-23936
2021-02-01 16:51:53 -08:00
Phillip Webb
db52bf3d7a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25078
2021-02-01 16:35:46 -08:00
Phillip Webb
40c1748e3c
Remove hardcoded versions from MavenBuild
...
Use the dependencies BOM to ensure versions used in the `MavenBuild`
test class are always aligned.
Closes gh-23936
2021-02-01 16:20:55 -08:00
Phillip Webb
257608a3a3
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25076
2021-02-01 16:03:43 -08:00
Phillip Webb
939b5dfc26
Add junit-platform-launcher dependency
...
Update `build.gradle` files to ensure that `junit-platform-launcher` is
a `testRuntimeOnly` dependency. This ensures that tests can be run from
Eclipse.
Closes gh-25074
2021-02-01 15:31:28 -08:00
Andy Wilkinson
79c0597aa2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25072
2021-02-01 15:39:19 +00:00
Andy Wilkinson
3585d20453
Include IDialect beans in WebFluxTest and WebMvcTest
...
Fixes gh-24149
2021-02-01 15:03:08 +00:00
Phillip Webb
57f1f17320
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25066
2021-01-30 17:57:53 -08:00
Phillip Webb
187258aa6a
Fix classpath.idx format documentation
...
Since 2.3.8 and 2.4.2 the format includes the directory.
Closes gh-24856
2021-01-30 17:56:09 -08:00
Phillip Webb
9ac5151932
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25064
2021-01-30 17:46:10 -08:00
Phillip Webb
19c5864d2c
Clarify square bracket map binding notation
...
Update reference docs to make it clearer when the square bracket map
binding notation should be used.
Closes gh-23390
2021-01-30 17:42:49 -08:00
Phillip Webb
d7c44e4503
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25061
2021-01-30 17:04:10 -08:00
Phillip Webb
549d4f7fbe
Document that Spring MVC has own ConversionService
...
Update documentation to make it clearer that Spring MVC does not use the
`ApplicationConversionService` unless configured explicitly.
Closes gh-22718
2021-01-30 17:03:55 -08:00
Phillip Webb
77478d9f34
Refine CharSequenceToObjectConverter logic
...
Update `CharSequenceToObjectConverter` so that conversion that would
apply using an `ObjectTo...` converter now favors `toString()` based
conversion.
Prior to this commit, when converting a `CharSequence` to a `Collection`
the `ObjectToCollectionConveter` would be picked instead of the
`StringToCollectionConverter`. This resulted in a `Collection`
containing a single `String` value, rather than the expected list
of values split around ",".
Fixes gh-25057
2021-01-30 12:35:36 -08:00
Phillip Webb
dd997cda9c
Remove sysout from test
2021-01-30 10:38:02 -08:00
Andy Wilkinson
a3058200cb
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25050
2021-01-29 09:06:42 +00:00
dreis2211
4940694db2
Fix duplicate anchor id
...
See gh-25048
2021-01-29 09:06:06 +00:00
Phillip Webb
2d056525d8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25044
2021-01-28 19:28:56 -08:00
Phillip Webb
c03d8773e7
Improve logging.register-shutdown-hook docs
...
Update the "Logging" reference documentation with a section about
shutting down the logging system.
Closes gh-24507
2021-01-28 19:26:18 -08:00
Phillip Webb
ca9b612e27
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25042
2021-01-28 18:56:59 -08:00
jongmin92
23ecb86089
Document missing code to run Gradle bootRun task
...
See gh-25012
2021-01-28 18:56:21 -08:00
Phillip Webb
c86ee4c851
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25040
2021-01-28 18:48:51 -08:00
Phillip Webb
5b2d1f19a0
Polish 'Add note about exploded jars and banner properties'
...
See gh-24982
2021-01-28 18:48:14 -08:00
Robert Smith
33c038199d
Add note about exploded jars and banner properties
...
Add a note to the "Customizing the Banner" explaining that you need
to be using the `JarLauncher` to use the `application.*` properties.
See gh-24982
2021-01-28 18:48:11 -08:00
Phillip Webb
53f1aab833
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25038
2021-01-28 18:00:42 -08:00