Stephane Nicoll
41fb9cf562
Merge branch '2.7.x'
3 years ago
Stephane Nicoll
f812b33cbd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29613
3 years ago
Stephane Nicoll
136b5959c3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29612
3 years ago
Stephane Nicoll
bd2e992d48
Merge pull request #29178 from quaff
...
* pr/29178:
Polish "Enforce use of BDDMockito"
Enforce use of BDDMockito
Closes gh-29178
3 years ago
Stephane Nicoll
7f17f819a6
Polish "Enforce use of BDDMockito"
...
See gh-29178
3 years ago
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
3 years ago
Stephane Nicoll
3a65d7b01e
Merge branch '2.7.x'
3 years ago
Stephane Nicoll
19e671dd7b
Merge branch '2.6.x' into 2.7.x
3 years ago
Stephane Nicoll
787a2f3d9b
Merge branch '2.5.x' into 2.6.x
3 years ago
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
3 years ago
Stephane Nicoll
ab0b29cb53
Polish "Make classloader customization easier to discover"
...
See gh-29438
3 years ago
Andreas Ahlenstorf
96f48db2ab
Make classloader customization easier to discover
...
See gh-29438
3 years ago
Stephane Nicoll
e691cfdf3d
Merge branch '2.7.x'
3 years ago
Stephane Nicoll
7bebfd06b8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29601
3 years ago
Stephane Nicoll
f1dc7e7b78
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29600
3 years ago
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
3 years ago
Stephane Nicoll
0d78ff0657
Polish "Use a timeout when joining threads in HttpTunnelServerTests"
...
See gh-29522
3 years ago
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