Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
37,611 Commits 23 Branches 0 Tags
85a4c94dea9b70aaaed04aba9718cd9df65201ce
Commit Graph

17131 Commits

Author SHA1 Message Date
Stephane Nicoll
9f70b71036 Start building against Reactor 2020.0.3 snapshots 
See gh-24698
 2021-01-08 08:35:34 +01:00
Scott Frederick
c82165694d Merge branch '2.4.x' 
Closes gh-24690
 2021-01-07 16:00:03 -06:00
Scott Frederick
210438ee5b Merge branch '2.3.x' into 2.4.x 
Closes gh-24689
 2021-01-07 15:59:37 -06:00
Scott Frederick
a302238e21 Remove layout parameters from build-image Maven goal 
This commit removes the `layout` and `layoutFactory` parameters
from the `build-image` goal in the Maven plugin while retaining
them for the `repackage` goal. The `build-image` goal currently
only supports jar archives, so allowing other layout types to be
configured for the goal could cause confusion.

Fixes gh-24105
 2021-01-07 15:59:02 -06:00
Scott Frederick
bd4c6e51fa Merge branch '2.4.x' 
Closes gh-24687
 2021-01-07 10:36:06 -06:00
Scott Frederick
ef7a82756e Allow overriding ThemeResolver and FlashMapManager beans 
Previously, an error would occur when a user contributed a
`ThemeResolver` or `FlashMapManager` bean because those beans would
would not properly override the default beans provided by Spring
Framework. This commit adds conditional auto-configuration of these
bean types, preferring user-provided beans and falling back to
Framework-provided defaults.

Fixes gh-24207
 2021-01-07 10:29:13 -06:00
Phillip Webb
bd027de736 Merge branch '2.4.x' 
Closes gh-24685
 2021-01-06 17:40:20 -08:00
asheCarry
17c0c7d9d6 Fix javadoc typo in ConfigDataLocation 
See gh-24660
 2021-01-06 17:39:39 -08:00
Phillip Webb
fdeee9776e Merge branch '2.4.x' 
Closes gh-24684
 2021-01-06 17:31:09 -08:00
Phillip Webb
48661e79f5 Merge branch '2.3.x' into 2.4.x 
Closes gh-24683
 2021-01-06 17:30:55 -08:00
Phillip Webb
7cbd57b635 Log FailureAnalyzer errors at trace level 
Update `FailureAnalyzers` to log errors at `trace` rather than `debug`.
This should reduce noise when an analyzer unexpectedly fails and the
user is running with `--debug`.

Fixes gh-24630
 2021-01-06 17:29:24 -08:00
Phillip Webb
86bb3b7dcd Merge branch '2.4.x' 2021-01-06 17:02:13 -08:00
Phillip Webb
76aa33b65a Merge branch '2.3.x' into 2.4.x 2021-01-06 17:01:53 -08:00
Phillip Webb
a24ec9d372 Merge branch '2.2.x' into 2.3.x 2021-01-06 17:01:22 -08:00
Phillip Webb
46629ef5e4 Migrate away from pivotal-legacy/homebrew-tap 
Update formula to use spring-boot rather than springboot. This will
allow both taps to be used at the same time.

See gh-24659
 2021-01-06 16:58:05 -08:00
Phillip Webb
42e649debe Merge branch '2.4.x' 
Closes gh-24682
 2021-01-06 16:47:46 -08:00
Phillip Webb
04616a01cf Merge branch '2.3.x' into 2.4.x 
Closes gh-24681
 2021-01-06 16:47:24 -08:00
Phillip Webb
ef09982b39 Merge branch '2.2.x' into 2.3.x 
Closes gh-24680
 2021-01-06 16:46:50 -08:00
Phillip Webb
25033ee5e7 Migrate away from pivotal-legacy/homebrew-tap 
Update reference documentation to the new spring-io/homebrew-tap repo.

Closes gh-24659
 2021-01-06 16:45:10 -08:00
Madhura Bhave
012fb3d3b9 Merge branch '2.4.x' 
Closes gh-24679
 2021-01-06 16:44:58 -08:00
Madhura Bhave
920136d908 Merge branch '2.3.x' into 2.4.x 
Closes gh-24678
 2021-01-06 16:44:32 -08:00
Madhura Bhave
73a2a4b383 Consider context-path for WebTestClient baseUrl 
Fixes gh-24168
 2021-01-06 16:42:09 -08:00
Phillip Webb
cb0069f385 Merge branch '2.4.x' 
Closes gh-24674
 2021-01-06 13:32:09 -08:00
Phillip Webb
5b126b01c0 Replace binder as contributors are processed 
Update `ConfigDataEnvironment` so that the bootstrap `Binder` is
replaced as contributors are processed. The final `Binder` is now
also added without the `FAIL_ON_BIND_TO_INACTIVE_SOURCE` option so
that properties can be bound at the last stage even if values exist
in an inactive profile-specific document.

Closes gh-24669
 2021-01-06 13:31:29 -08:00
Phillip Webb
45ca4a5a56 Merge branch '2.4.x' 
Closes gh-24673
 2021-01-06 12:34:13 -08:00
Phillip Webb
ac4243d615 Merge branch '2.3.x' into 2.4.x 
Closes gh-24672
 2021-01-06 12:33:53 -08:00
Phillip Webb
52e47c4275 Fix test for JSR-350 @Nonnull 
Closes gh-24647
 2021-01-06 12:33:25 -08:00
Phillip Webb
2dfb9b0911 Merge branch '2.4.x' 
Closes gh-24671
 2021-01-06 12:24:05 -08:00
Phillip Webb
2b497b6aff Merge branch '2.3.x' into 2.4.x 
Closes gh-24670
 2021-01-06 12:23:45 -08:00
Phillip Webb
848ed65f5b Add test for JSR-350 @Nonnull 
Closes gh-24647
 2021-01-06 12:04:58 -08:00
Stephane Nicoll
2547a9e255 Merge branch '2.4.x' 
See gh-24655
 2021-01-06 14:24:34 +01:00
Stephane Nicoll
c014bb9880 Merge branch '2.3.x' into 2.4.x 
See gh-24647
 2021-01-06 14:24:13 +01:00
Stephane Nicoll
67d1f355d7 Fix Nullable reference 
See gh-24647
 2021-01-06 14:23:38 +01:00
Stephane Nicoll
b3278f459e Merge branch '2.4.x' 
See gh-24655
 2021-01-06 08:59:14 +01:00
Stephane Nicoll
4e6f15a466 Merge branch '2.3.x' into 2.4.x 
See gh-24647
 2021-01-06 08:58:48 +01:00
Stephane Nicoll
2bd78355dc Reference javax.annotation.Nonnull support in reference guide 
See gh-24647
 2021-01-06 08:58:13 +01:00
Phillip Webb
11c4ce2135 Merge branch '2.4.x' 
Closes gh-24658
 2021-01-05 16:03:23 -08:00
Phillip Webb
c9f9246c59 Merge branch '2.3.x' into 2.4.x 
Closes gh-24657
 2021-01-05 16:03:01 -08:00
Phillip Webb
9b9c3edfcd Polish "Return -1 port for non-listening WebServers" 
See gh-24606
 2021-01-05 16:02:26 -08:00
Stefan Partusch
5c61df3131 Return -1 port for non-listening WebServers 
Update `WebServer` implementations to return -1 from `getPort()` if
the server  isn't listening on a port. This aligns the implementations
with the interface Javadoc.

See gh-24606
 2021-01-05 15:56:25 -08:00
Phillip Webb
bd3dd0a526 Merge branch '2.4.x' 
Closes gh-24655
 2021-01-05 14:08:57 -08:00
Phillip Webb
ab8080353e Merge branch '2.3.x' into 2.4.x 
Closes gh-24654
 2021-01-05 14:08:41 -08:00
Phillip Webb
2ad9a47d08 Support JSR-305 annotations on endpoint methods 
Update `OperationMethodParameter` to additionally support JSR-305 based
`@Nullable` annotations.

Closes gh-24647
 2021-01-05 14:07:22 -08:00
Scott Frederick
d0fba2473f Merge branch '2.4.x' 
Closes gh-24652
 2021-01-05 14:05:58 -06:00
Scott Frederick
505340909a Support symlinks in configtree property paths 
Prior to this commit, the configtree property source would not traverse
into a sub-directory in a property path if the sub-directory was a
symbolic link. This commit allows symlinked sub-directories to be
traversed like any other sub-directory in the property path.

Fixes gh-24530
 2021-01-05 14:04:59 -06:00
Madhura Bhave
f8cc7180e5 Merge branch '2.4.x' 
Closes gh-24651
 2021-01-05 10:49:17 -08:00
Madhura Bhave
615a8ae56e Ignore documents that do not apply when checking mandatory locations 
Closes gh-24584
 2021-01-05 10:47:06 -08:00
Andy Wilkinson
77652961cd Merge branch '2.4.x' 
Closes gh-24650
 2021-01-05 17:13:45 +00:00
Andy Wilkinson
89f29c933f Merge branch '2.3.x' into 2.4.x 
Closes gh-24649
 2021-01-05 17:13:30 +00:00
dreis2211
fe3217d2c4 Exclude starters from Javadoc aggregation 
See gh-24648
 2021-01-05 17:12:39 +00:00