Commit Graph

36034 Commits

Author SHA1 Message Date
Stephane Nicoll 5fe6176966 Polish "Add a note on early init with @ConditionalOnExpression"
See gh-29276
2022-02-01 16:32:27 +01:00
Mihail Cornescu fce3cd1684 Add a note on early init with @ConditionalOnExpression
See gh-29276
2022-02-01 16:24:13 +01:00
Stephane Nicoll 067af65152 Fix formatting violations 2022-02-01 13:52:06 +01:00
Stephane Nicoll f812b33cbd Merge branch '2.6.x' into 2.7.x
Closes gh-29613
2022-02-01 11:07:31 +01:00
Stephane Nicoll 136b5959c3 Merge branch '2.5.x' into 2.6.x
Closes gh-29612
2022-02-01 10:59:08 +01:00
Stephane Nicoll bd2e992d48 Merge pull request #29178 from quaff
* pr/29178:
  Polish "Enforce use of BDDMockito"
  Enforce use of BDDMockito

Closes gh-29178
2022-02-01 10:20:54 +01:00
Stephane Nicoll 7f17f819a6 Polish "Enforce use of BDDMockito"
See gh-29178
2022-02-01 10:03:18 +01:00
Yanming Zhou b49418aaaf Enforce use of BDDMockito
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule

See gh-29178
2022-02-01 09:37:15 +01:00
Stephane Nicoll 19e671dd7b Merge branch '2.6.x' into 2.7.x 2022-01-31 16:45:04 +01:00
Stephane Nicoll 787a2f3d9b Merge branch '2.5.x' into 2.6.x 2022-01-31 16:44:39 +01:00
Stephane Nicoll f60af4dbbd Merge pull request #29438 from aahlenst
* pr/29438:
  Polish "Make classloader customization easier to discover"
  Make classloader customization easier to discover

Closes gh-29438
2022-01-31 16:40:23 +01:00
Stephane Nicoll ab0b29cb53 Polish "Make classloader customization easier to discover"
See gh-29438
2022-01-31 16:38:38 +01:00
Andreas Ahlenstorf 96f48db2ab Make classloader customization easier to discover
See gh-29438
2022-01-31 16:28:28 +01:00
Stephane Nicoll 7bebfd06b8 Merge branch '2.6.x' into 2.7.x
Closes gh-29601
2022-01-31 16:24:40 +01:00
Stephane Nicoll f1dc7e7b78 Merge branch '2.5.x' into 2.6.x
Closes gh-29600
2022-01-31 16:24:29 +01:00
Stephane Nicoll 697c30346d Merge pull request #29522 from polarbear567
* pr/29522:
  Polish "Use a timeout when joining threads in HttpTunnelServerTests"
  Use a timeout when joining threads in HttpTunnelServerTests

Closes gh-29522
2022-01-31 16:24:23 +01:00
Stephane Nicoll 0d78ff0657 Polish "Use a timeout when joining threads in HttpTunnelServerTests"
See gh-29522
2022-01-31 16:22:28 +01:00
Leo Li 940d969c7c Use a timeout when joining threads in HttpTunnelServerTests
See gh-29522
2022-01-31 16:01:04 +01:00
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
2022-01-29 15:44:46 +01:00
Stephane Nicoll 0c0ec64ed4 Polish "Use existing constant rather than "spring.beaninfo.ignore""
See gh-29592
2022-01-29 15:39:43 +01:00
minkyu-jo 1a558292a8 Use existing constant rather than "spring.beaninfo.ignore"
See gh-29592
2022-01-29 15:39:28 +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 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 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 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 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 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 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 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
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