Phillip Webb
d9f3e89395
Merge branch '2.4.x'
2021-02-01 22:11:17 -08: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
d8b849e00d
Fix test that fails when building against SNAPSHOT
...
Update `WarIntegrationTests` do deal with a SNAPSHOT Spring Framwork
dependency.
See gh-23936
2021-02-01 22:09:04 -08:00
Phillip Webb
1eef2e1b46
Merge branch '2.4.x'
2021-02-01 19:47:11 -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
cff09df3fe
Merge branch '2.4.x'
2021-02-01 17:07:28 -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
59b8fb5b49
Merge branch '2.4.x'
...
Closes gh-25079
2021-02-01 16:36:02 -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
d8b6960997
Merge branch '2.4.x'
...
Closes gh-25077
2021-02-01 16:08:57 -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
Madhura Bhave
c73e3cc2dc
Update documentation for layered wars
...
Closes gh-22821
Closes gh-22195
2021-02-01 14:43:43 -08:00
Madhura Bhave
1245e5eec9
Add support for creating layered war files with Gradle
...
See gh-22195
2021-02-01 14:43:42 -08:00
Andy Wilkinson
7f8ea33359
Merge branch '2.4.x'
...
Closes gh-25073
2021-02-01 15:39:52 +00: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
0104ee677e
Merge branch '2.4.x'
...
Closes gh-25067
2021-01-30 17:58:05 -08: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
d6eb1eb5ae
Merge branch '2.4.x'
...
Closes gh-25065
2021-01-30 17:46:25 -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
99d400f302
Merge branch '2.4.x'
...
Closes gh-25062
2021-01-30 17:04:24 -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
d8c9b8c329
Merge branch '2.4.x'
...
Closes gh-25060
2021-01-30 12:35:52 -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
01746453f7
Merge branch '2.4.x'
2021-01-30 12:34:28 -08:00
Phillip Webb
dd997cda9c
Remove sysout from test
2021-01-30 10:38:02 -08:00
Andy Wilkinson
82b90d5749
Merge branch '2.4.x'
...
Closes gh-25052
2021-01-29 09:07:40 +00:00
Andy Wilkinson
a3058200cb
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25050
2021-01-29 09:06:42 +00:00
Andy Wilkinson
5360ca6500
Merge pull request #25048 from dreis2211
...
* gh-25048:
Fix duplicate anchor id
Closes gh-25048
2021-01-29 09:06:27 +00:00
dreis2211
4940694db2
Fix duplicate anchor id
...
See gh-25048
2021-01-29 09:06:06 +00:00
Phillip Webb
f6097e7da4
Merge branch '2.4.x'
...
Closes gh-25045
2021-01-28 19:29:14 -08: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
c76a0f7a81
Merge branch '2.4.x'
...
Closes gh-25043
2021-01-28 18:57:10 -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
Phillip Webb
1b908ab9c8
Merge pull request #25012 from jongmin92
...
* pr/25012:
Document missing code to run Gradle bootRun task
Closes gh-25012
2021-01-28 18:56:46 -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
479180fdf9
Merge branch '2.4.x'
...
Closes gh-25041
2021-01-28 18:49:04 -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
745dbaff9c
Merge pull request #24982 from robert-smith-911
...
* pr/24982:
Polish 'Add note about exploded jars and banner properties'
Add note about exploded jars and banner properties
Closes gh-24982
2021-01-28 18:48:33 -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