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
c3872661c9
Merge branch '2.4.x'
2021-01-05 17:34:42 -08:00
Phillip Webb
c9c6e893d8
Merge branch '2.3.x' into 2.4.x
2021-01-05 17:33:25 -08:00
Phillip Webb
1e9bfd039c
Merge branch '2.2.x' into 2.3.x
2021-01-05 17:30:50 -08:00
Phillip Webb
27b0cf946f
Polish README and CONTRIBUTING files
2021-01-05 17:04:04 -08:00
Phillip Webb
619247b2d6
Update suggested Eclipse version to 2020-12
2021-01-05 16:46:31 -08: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
78259214bb
Merge pull request #24606 from spartusch
...
* pr/24606:
Polish "Return -1 port for non-listening WebServers"
Return -1 port for non-listening WebServers
Closes gh-24606
2021-01-05 16:02:40 -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
Andy Wilkinson
05890a2599
Merge pull request #24648 from dreis2211
...
* gh-24648:
Exclude starters from Javadoc aggregation
Closes gh-24648
2021-01-05 17:13:06 +00:00
dreis2211
fe3217d2c4
Exclude starters from Javadoc aggregation
...
See gh-24648
2021-01-05 17:12:39 +00:00
Stephane Nicoll
1fb32fcf7a
Merge branch '2.4.x'
...
Closes gh-24644
2021-01-05 08:28:35 +01:00
Stephane Nicoll
e1ec70ac36
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24643
2021-01-05 08:28:13 +01:00
Stephane Nicoll
691f905c0b
Merge pull request #24628 from andrey4623
...
* pr/24628:
Polish "Remove unnecessary semicolon"
Remove unnecessary semicolon
Closes gh-24628
2021-01-05 08:27:44 +01:00
Stephane Nicoll
f33c7bc27c
Polish "Remove unnecessary semicolon"
...
See gh-24628
2021-01-05 08:24:03 +01:00
Andrey Kolchanov
097104584c
Remove unnecessary semicolon
...
See gh-24628
2021-01-05 08:15:32 +01:00
Madhura Bhave
b62325a056
Merge branch '2.4.x'
2021-01-04 13:37:05 -08:00
Madhura Bhave
86e94b95c3
Merge branch '2.3.x' into 2.4.x
2021-01-04 13:36:36 -08:00
Madhura Bhave
9928d74a9e
Revert fix to enable cors for actuator endpoints
...
The fix causes a Jersey application to fail in the absence
of a `CorsFilter` or `CorsConfigurationSource` bean.
See gh-11987
2021-01-04 12:25:43 -08:00