Stephane Nicoll
68bd6f91cf
Merge branch '2.7.x'
2022-01-29 15:34:16 +01:00
Stephane Nicoll
a94b176c39
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29595
2022-01-29 15:34:08 +01:00
Stephane Nicoll
fb52180668
Merge pull request #29593 from izeye
...
* pr/29593:
Polish AbstractHealthEndpointAdditionalPathIntegrationTests
Closes gh-29593
2022-01-29 15:34:01 +01:00
izeye
118eb5f74a
Polish AbstractHealthEndpointAdditionalPathIntegrationTests
...
See gh-29593
2022-01-29 15:33:25 +01:00
Madhura Bhave
8125b46ed5
Merge branch '2.7.x' into main
2022-01-27 12:09:51 -08:00
Madhura Bhave
81bbd295e9
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29584
2022-01-27 12:04:26 -08:00
Madhura Bhave
0597c6831e
Configure health on additional path only when health exposed
...
Prior to this commit, limiting the exposure to a specific
technology in `ConditionalOnAvailableEndpoint` would not have
any effect because all endpoints would be considered to be available
if the app was running on Cloud Foundry. This caused issues in cases
where beans were meant to be exposed only if the endpoint was actually
exposed.
This commit adds CLOUD_FOUNDRY to the `EndpointExposure`
enum. This allows `ConditionalOnAvailableEndpoint` to limit
by exposure even when the Cloud Foundry platform is active.
Fixes gh-29532
2022-01-27 11:44:54 -08:00
Stephane Nicoll
b9b90815a0
Merge branch '2.7.x'
2022-01-27 09:51:13 +01:00
Stephane Nicoll
c1ca40b82a
Merge branch '2.6.x' into 2.7.x
2022-01-27 09:50:53 +01:00
Stephane Nicoll
068595a572
Upgrade Java 11 version in CI image
...
Closes gh-29577
2022-01-27 09:50:39 +01:00
Stephane Nicoll
faf4794222
Upgrade Java 8 version in CI image
...
Closes gh-29578
2022-01-27 09:49:41 +01:00
Stephane Nicoll
8c5a5f81ff
Merge branch '2.5.x' into 2.6.x
2022-01-27 09:48:53 +01:00
Stephane Nicoll
89ed9649f7
Upgrade Java 11 version in CI image
...
Closes gh-29575
2022-01-27 09:48:26 +01:00
Stephane Nicoll
a04cd535f0
Upgrade Java 8 version in CI image
...
Closes gh-29576
2022-01-27 09:47:45 +01:00
Stephane Nicoll
458f6721bb
Upgrade Java 11 version in CI image
...
Closes gh-29579
2022-01-27 09:45:59 +01:00
Stephane Nicoll
440702df99
Upgrade Java 8 version in CI image
...
Closes gh-29580
2022-01-27 09:45:19 +01:00
Phillip Webb
c820ad01a1
Fix checkstyle error
2022-01-25 14:52:30 -08:00
Phillip Webb
e19fa140e7
Fix merge conflict mistake
2022-01-25 13:34:10 -08:00
Phillip Webb
8ab87ace24
Merge branch '2.7.x'
2022-01-25 13:18:33 -08:00
Phillip Webb
bb024211f6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29565
2022-01-25 13:17:22 -08:00
Phillip Webb
df9cf6b726
Make ErrorPageSecurityFilter compatible with Servlet 3.1
...
Ensure that all default methods are implemented so that the
filter is compatible with Servlet 3.1 environments.
Fixes gh-29558
2022-01-25 13:15:59 -08:00
Andy Wilkinson
f2ac7d10ef
Merge branch '2.7.x'
2022-01-25 12:19:51 +00:00
Andy Wilkinson
8480abca20
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29561
2022-01-25 12:19:37 +00:00
Andy Wilkinson
fe43d527b5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29560
2022-01-25 12:19:16 +00:00
Andy Wilkinson
3ed65f2383
Avoid running Maven plugin ITs for each s-b-dependencies change
...
Closes gh-28781
2022-01-25 12:11:19 +00:00
Brian Clozel
03da915f56
Merge branch '2.7.x'
2022-01-25 09:22:49 +01:00
Brian Clozel
24c5f4b7ea
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29557
2022-01-25 09:22:19 +01:00
Brian Clozel
1204c1aa32
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29556
2022-01-25 09:21:49 +01:00
Lachlan Roberts
f1bbce1aac
Do not modify AliasChecks list from Jetty WebAppContext
...
Closes gh-29555
Signed-off-by: Lachlan Roberts <lachlan@webtide.com >
2022-01-25 08:58:42 +01:00
Scott Frederick
4494d3a805
Merge branch '2.7.x' into main
2022-01-24 16:21:11 -06:00
Scott Frederick
698eb94913
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29554
2022-01-24 16:20:33 -06:00
Scott Frederick
909ef6d635
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29553
2022-01-24 16:19:43 -06:00
Scott Frederick
000cbfa2d9
Set file permissions on all created test files
...
Closes gh-29551
2022-01-24 16:19:20 -06:00
Andy Wilkinson
b8983cef59
Merge branch '2.7.x'
2022-01-24 15:11:51 +00:00
Andy Wilkinson
cd426fd21e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29547
2022-01-24 15:10:28 +00:00
Andy Wilkinson
75c3bff765
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29546
2022-01-24 15:10:08 +00:00
Andy Wilkinson
761bed6c48
Upgrade buildSrc to Spring Framework 5.3.15
...
Closes gh-29545
2022-01-24 14:19:47 +00:00
Andy Wilkinson
191333773f
Restore support for REST Assured
...
Closes gh-29543
2022-01-24 13:46:48 +00:00
Andy Wilkinson
1d7b1e1a46
Start building against snapshots for Spring REST Docs 3.0.0-M2
...
See gh-29544
2022-01-24 13:46:01 +00:00
Stephane Nicoll
5c78c2288c
Merge branch '2.7.x'
2022-01-24 09:42:06 +01:00
Stephane Nicoll
f9029a3584
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29540
2022-01-24 09:41:56 +01:00
Stephane Nicoll
e36a56f014
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29539
2022-01-24 09:41:35 +01:00
Stephane Nicoll
fa76209306
Merge pull request #29523 from axelfontaine
...
* pr/29523:
Rename Boxfuse to CloudCaptain
Closes gh-29523
2022-01-24 09:41:28 +01:00
Axel Fontaine
48817587e6
Rename Boxfuse to CloudCaptain
...
See gh-29523
2022-01-24 09:35:44 +01:00
Stephane Nicoll
83e2ffe45c
Merge branch '2.7.x'
2022-01-24 09:30:05 +01:00
Stephane Nicoll
ba8c76ba08
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29538
2022-01-24 09:29:48 +01:00
Stephane Nicoll
267cd45235
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29537
2022-01-24 09:29:31 +01:00
Stephane Nicoll
516030a2fa
Merge pull request #29535 from jvalkeal
...
* pr/29535:
Upgrade reference of gradle-git-properties to 2.3.2
Closes gh-29535
2022-01-24 09:29:23 +01:00
Janne Valkealahti
d821f86b8e
Upgrade reference of gradle-git-properties to 2.3.2
...
See gh-29535
2022-01-24 09:28:53 +01:00
Andy Wilkinson
3c5c5d9575
Merge branch '2.7.x'
2022-01-21 14:28:25 +00:00
