Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,358 Commits 23 Branches 0 Tags
230b4ab2eb17096336ee56950fa0bc244084fd4e
Commit Graph

11899 Commits

Author SHA1 Message Date
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
Phillip Webb
60bb33f231 Polish 'Add a tip about actuator endpoints' 
See gh-24336
 2021-01-28 17:55:09 -08:00
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
 2021-01-28 17:53:04 -08:00
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
 2021-01-27 14:17:41 -08:00
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
 2021-01-27 14:07:02 -08:00
Phillip Webb
d06407ec0a Update copyright year of changed files 2021-01-26 19:06:14 -08:00
Phillip Webb
99f7bc1aba Build against Spring Data 2020.0.4-SNAPSHOT 
See gh-25002
 2021-01-26 17:35:54 -08:00
Phillip Webb
d95d7a0245 Update code for Spring Framework 5.3.4 
See gh-24998
 2021-01-26 17:35:54 -08:00
Phillip Webb
b7ae5558f6 Build against Spring Framework 5.3.4-SNAPSHOT 
See gh-24998
 2021-01-26 17:31:27 -08:00
Phillip Webb
1def245a2c Support DeferredLogFactory injection 
Update `ConfigDataLoader` and `ConfigDataLocationResolver` to support
`DeferredLogFactory` injection.

Closes gh-24988
 2021-01-25 23:13:01 -08:00
Phillip Webb
522f68cb40 Merge branch '2.3.x' into 2.4.x 
Closes gh-24994
 2021-01-25 21:36:12 -08:00
Phillip Webb
464b302655 Set withTestKitDir per Gradle version 
Attempt to fix cache locking issues by setting a unique `withTestKitDir`
directory for each tested Gradle version.

Closes gh-24993
 2021-01-25 21:35:25 -08:00
Andy Wilkinson
9c8645dec2 Merge branch '2.3.x' into 2.4.x 
Closes gh-24975
 2021-01-22 14:59:23 +00:00
Andy Wilkinson
46d908f632 Upgrade to Gradle 6.8.1 
Closes gh-24737
 2021-01-22 14:20:57 +00:00
Andy Wilkinson
5362633014 Merge branch '2.3.x' into 2.4.x 
Closes gh-24973
 2021-01-22 13:32:30 +00:00
Andy Wilkinson
0b06ac9938 Use AssertJ's doesNotContainKey 
Closes gh-24970
 2021-01-22 13:28:41 +00:00
Phillip Webb
69fbd2f8aa Delegate usesPathPatterns() call to mappings 
Update `CompositeHandlerMapping` so that the `usesPathPatterns()` method
returns `true` if any of the delegate mappings return `true`.

Closes gh-24877
 2021-01-20 13:49:18 -08:00
Stephane Nicoll
3e376b955d Fix build failure 
See gh-24943
 2021-01-20 14:41:12 +01:00
Stephane Nicoll
56ce5bdf44 Merge branch '2.3.x' into 2.4.x 
See gh-24943
 2021-01-20 14:06:39 +01:00
Stephane Nicoll
244a6ac7e5 Polish "Deprecate Spring Data Solr" 
See gh-24942
 2021-01-20 14:02:59 +01:00
Stephane Nicoll
85729d2a8a Merge branch '2.3.x' into 2.4.x 
Closes gh-24943
 2021-01-20 13:57:18 +01:00