Commit Graph

36355 Commits (40406c0673b9adb5c7a9d85798720d61da5d2289)
 

Author SHA1 Message Date
Leo Li 940d969c7c Use a timeout when joining threads in HttpTunnelServerTests
See gh-29522
3 years ago
Stephane Nicoll 42df01f193 Merge branch '2.7.x' 3 years ago
Stephane Nicoll de09b57ef7 Merge pull request #29592 from MangKyu
* pr/29592:
  Polish "Use existing constant rather than "spring.beaninfo.ignore""
  Use existing constant rather than "spring.beaninfo.ignore"

Closes gh-29592
3 years ago
Stephane Nicoll 0c0ec64ed4 Polish "Use existing constant rather than "spring.beaninfo.ignore""
See gh-29592
3 years ago
minkyu-jo 1a558292a8 Use existing constant rather than "spring.beaninfo.ignore"
See gh-29592
3 years ago
Stephane Nicoll 68bd6f91cf Merge branch '2.7.x' 3 years ago
Stephane Nicoll a94b176c39 Merge branch '2.6.x' into 2.7.x
Closes gh-29595
3 years ago
Stephane Nicoll fb52180668 Merge pull request #29593 from izeye
* pr/29593:
  Polish AbstractHealthEndpointAdditionalPathIntegrationTests

Closes gh-29593
3 years ago
izeye 118eb5f74a Polish AbstractHealthEndpointAdditionalPathIntegrationTests
See gh-29593
3 years ago
Madhura Bhave 8125b46ed5 Merge branch '2.7.x' into main 3 years ago
Madhura Bhave 81bbd295e9 Merge branch '2.6.x' into 2.7.x
Closes gh-29584
3 years ago
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
3 years ago
Stephane Nicoll b9b90815a0 Merge branch '2.7.x' 3 years ago
Stephane Nicoll c1ca40b82a Merge branch '2.6.x' into 2.7.x 3 years ago
Stephane Nicoll 068595a572 Upgrade Java 11 version in CI image
Closes gh-29577
3 years ago
Stephane Nicoll faf4794222 Upgrade Java 8 version in CI image
Closes gh-29578
3 years ago
Stephane Nicoll 8c5a5f81ff Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll 89ed9649f7 Upgrade Java 11 version in CI image
Closes gh-29575
3 years ago
Stephane Nicoll a04cd535f0 Upgrade Java 8 version in CI image
Closes gh-29576
3 years ago
Stephane Nicoll 458f6721bb Upgrade Java 11 version in CI image
Closes gh-29579
3 years ago
Stephane Nicoll 440702df99 Upgrade Java 8 version in CI image
Closes gh-29580
3 years ago
Phillip Webb c820ad01a1 Fix checkstyle error 3 years ago
Phillip Webb e19fa140e7 Fix merge conflict mistake 3 years ago
Phillip Webb 8ab87ace24 Merge branch '2.7.x' 3 years ago
Phillip Webb bb024211f6 Merge branch '2.6.x' into 2.7.x
Closes gh-29565
3 years ago
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
3 years ago
Andy Wilkinson f2ac7d10ef Merge branch '2.7.x' 3 years ago
Andy Wilkinson 8480abca20 Merge branch '2.6.x' into 2.7.x
Closes gh-29561
3 years ago
Andy Wilkinson fe43d527b5 Merge branch '2.5.x' into 2.6.x
Closes gh-29560
3 years ago
Andy Wilkinson 3ed65f2383 Avoid running Maven plugin ITs for each s-b-dependencies change
Closes gh-28781
3 years ago
Brian Clozel 03da915f56 Merge branch '2.7.x' 3 years ago
Brian Clozel 24c5f4b7ea Merge branch '2.6.x' into 2.7.x
Closes gh-29557
3 years ago
Brian Clozel 1204c1aa32 Merge branch '2.5.x' into 2.6.x
Closes gh-29556
3 years ago
Lachlan Roberts f1bbce1aac Do not modify AliasChecks list from Jetty WebAppContext
Closes gh-29555
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
3 years ago
Scott Frederick 4494d3a805 Merge branch '2.7.x' into main 3 years ago
Scott Frederick 698eb94913 Merge branch '2.6.x' into 2.7.x
Closes gh-29554
3 years ago
Scott Frederick 909ef6d635 Merge branch '2.5.x' into 2.6.x
Closes gh-29553
3 years ago
Scott Frederick 000cbfa2d9 Set file permissions on all created test files
Closes gh-29551
3 years ago
Andy Wilkinson b8983cef59 Merge branch '2.7.x' 3 years ago
Andy Wilkinson cd426fd21e Merge branch '2.6.x' into 2.7.x
Closes gh-29547
3 years ago
Andy Wilkinson 75c3bff765 Merge branch '2.5.x' into 2.6.x
Closes gh-29546
3 years ago
Andy Wilkinson 761bed6c48 Upgrade buildSrc to Spring Framework 5.3.15
Closes gh-29545
3 years ago
Andy Wilkinson 191333773f Restore support for REST Assured
Closes gh-29543
3 years ago
Andy Wilkinson 1d7b1e1a46 Start building against snapshots for Spring REST Docs 3.0.0-M2
See gh-29544
3 years ago
Stephane Nicoll 5c78c2288c Merge branch '2.7.x' 3 years ago
Stephane Nicoll f9029a3584 Merge branch '2.6.x' into 2.7.x
Closes gh-29540
3 years ago
Stephane Nicoll e36a56f014 Merge branch '2.5.x' into 2.6.x
Closes gh-29539
3 years ago
Stephane Nicoll fa76209306 Merge pull request #29523 from axelfontaine
* pr/29523:
  Rename Boxfuse to CloudCaptain

Closes gh-29523
3 years ago
Axel Fontaine 48817587e6 Rename Boxfuse to CloudCaptain
See gh-29523
3 years ago
Stephane Nicoll 83e2ffe45c Merge branch '2.7.x' 3 years ago