Phillip Webb
d7c44e4503
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25061
4 years ago
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
4 years ago
Phillip Webb
d8c9b8c329
Merge branch '2.4.x'
...
Closes gh-25060
4 years ago
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
4 years ago
Phillip Webb
01746453f7
Merge branch '2.4.x'
4 years ago
Phillip Webb
dd997cda9c
Remove sysout from test
4 years ago
Andy Wilkinson
82b90d5749
Merge branch '2.4.x'
...
Closes gh-25052
4 years ago
Andy Wilkinson
a3058200cb
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25050
4 years ago
Andy Wilkinson
5360ca6500
Merge pull request #25048 from dreis2211
...
* gh-25048:
Fix duplicate anchor id
Closes gh-25048
4 years ago
dreis2211
4940694db2
Fix duplicate anchor id
...
See gh-25048
4 years ago
Phillip Webb
f6097e7da4
Merge branch '2.4.x'
...
Closes gh-25045
4 years ago
Phillip Webb
2d056525d8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25044
4 years ago
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
4 years ago
Phillip Webb
c76a0f7a81
Merge branch '2.4.x'
...
Closes gh-25043
4 years ago
Phillip Webb
ca9b612e27
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25042
4 years ago
Phillip Webb
1b908ab9c8
Merge pull request #25012 from jongmin92
...
* pr/25012:
Document missing code to run Gradle bootRun task
Closes gh-25012
4 years ago
jongmin92
23ecb86089
Document missing code to run Gradle bootRun task
...
See gh-25012
4 years ago
Phillip Webb
479180fdf9
Merge branch '2.4.x'
...
Closes gh-25041
4 years ago
Phillip Webb
c86ee4c851
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25040
4 years ago
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
4 years ago
Phillip Webb
5b2d1f19a0
Polish 'Add note about exploded jars and banner properties'
...
See gh-24982
4 years ago
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
4 years ago
Phillip Webb
802da9dc87
Merge branch '2.4.x'
...
Closes gh-25039
4 years ago
Phillip Webb
53f1aab833
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25038
4 years ago
Phillip Webb
7265484d76
Merge pull request #24336 from wesuga
...
* pr/24336:
Polish 'Add a tip about actuator endpoints'
Add a tip about actuator endpoints
Closes gh-24336
4 years ago
Phillip Webb
60bb33f231
Polish 'Add a tip about actuator endpoints'
...
See gh-24336
4 years ago
Wesley Ugang
6ced1d7f4e
Add a tip about actuator endpoints
...
Update the "Externalized Configuration" section with a tip that about
the actuator `env` and `configprops` endpoints.
See gh-24336
4 years ago
Madhura Bhave
82ac7eef91
Update tests following code changes
...
See gh-22821
4 years ago
Madhura Bhave
9a32f67802
Fix formatting
4 years ago
Madhura Bhave
152698f2b2
Add support for creating layered war files with Maven
...
See gh-22821
4 years ago
Andy Wilkinson
fd27c26e3b
Merge branch '2.4.x'
...
Closes gh-25024
4 years ago
Andy Wilkinson
8b505cf541
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25020
4 years ago
Andy Wilkinson
a4e6a3cfd0
Merge branch '2.2.x' into 2.3.x
...
Closes gh-25028
4 years ago
Andy Wilkinson
73b9615e0c
Upgrade Java 15 CI image to jdk-15.0.2+7
...
Closes gh-25013
4 years ago
Andy Wilkinson
dcaa79db7e
Merge branch '2.4.x'
...
Closes gh-25025
4 years ago
Andy Wilkinson
8884d89dc6
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25018
4 years ago
Andy Wilkinson
bc5e2853e1
Merge branch '2.2.x' into 2.3.x
...
Closes gh-25027
4 years ago
Andy Wilkinson
06c76b8643
Upgrade Java 11 CI image to jdk-11.0.10+9
...
Closes gh-25014
4 years ago
Andy Wilkinson
c2622f2d86
Merge branch '2.4.x'
...
Closes gh-25023
4 years ago
Andy Wilkinson
49b546a994
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25017
4 years ago
Andy Wilkinson
e04863d15b
Merge branch '2.2.x' into 2.3.x
...
Closes gh-25022
4 years ago
Andy Wilkinson
6ccfa0f554
Upgrade Java 8 CI image to jdk8u282b08
...
Closes gh-25019
4 years ago
Andy Wilkinson
d435aab19a
Merge branch '2.4.x'
...
Closes gh-25026
4 years ago
Andy Wilkinson
460094ff80
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25016
4 years ago
Andy Wilkinson
223b4e4a6f
Merge branch '2.2.x' into 2.3.x
...
Closes gh-25021
4 years ago
Andy Wilkinson
c7b299fb27
Upgrade CI images to Ubuntu Focal 20210119
...
Closes gh-25015
4 years ago
Phillip Webb
5054765fc8
Merge branch '2.4.x'
...
Closes gh-25031
4 years ago
Phillip Webb
0fcc52ccaf
Protect against NPE with Option.IGNORE_IMPORTS
...
Update `ConfigDataEnvironmentContributor` to deal with the fact that
the `properties` instance can be `null`.
Fixes gh-25029
4 years ago
Phillip Webb
d702793ba7
Merge branch '2.4.x'
...
Closes gh-25030
4 years ago
Phillip Webb
7f32fa6723
Allow 'on-profile' in profile specific files
...
Restore the ability to use `spring.config.activate.on-profile` or
`spring.profiles` in profile specific files.
Closes gh-24990
4 years ago