Stephane Nicoll
37c1f47902
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29650
2022-02-04 09:53:42 +01:00
Stephane Nicoll
03d393bc4c
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29649
2022-02-04 09:50:47 +01:00
Stephane Nicoll
48649192cb
Fix schema file name for Batch auto-configuration tests
...
Closes gh-29648
2022-02-04 09:49:15 +01:00
Phillip Webb
4919683354
Use consistent packages for doc samples
...
Closes gh-29646
2022-02-03 22:50:47 -08:00
Stephane Nicoll
d8d5091038
Merge branch '2.6.x' into 2.7.x
2022-02-03 08:40:02 +01:00
Stephane Nicoll
42a6bbd15a
Upgrade Java 17 version in CI image
...
Closes gh-29629
2022-02-03 08:39:30 +01:00
Stephane Nicoll
81a34fbb73
Upgrade Ubuntu version in CI images
...
Closes gh-29632
2022-02-03 08:38:52 +01:00
Stephane Nicoll
77b4b6a331
Merge branch '2.5.x' into 2.6.x
2022-02-03 08:38:13 +01:00
Stephane Nicoll
175af609a5
Upgrade Java 17 version in CI image
...
Closes gh-29625
2022-02-03 08:37:43 +01:00
Stephane Nicoll
cb1b33b57e
Upgrade Ubuntu version in CI images
...
Closes gh-29627
2022-02-03 08:37:07 +01:00
Stephane Nicoll
080de85e2e
Upgrade Java 17 version in CI image
...
Closes gh-29626
2022-02-03 08:36:03 +01:00
Stephane Nicoll
57cd1ff07f
Upgrade Ubuntu version in CI images
...
Closes gh-29628
2022-02-03 08:35:16 +01:00
Phillip Webb
546cad06db
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29635
2022-02-02 19:01:29 -08:00
Phillip Webb
c01cee18b5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29634
2022-02-02 19:01:09 -08:00
Phillip Webb
79fc77fade
Upgrade to spring-javaformat 0.0.31
...
Closes gh-29633
2022-02-02 19:00:28 -08:00
Phillip Webb
a05903b9d1
Polish GraphQL auto-configuration
2022-02-02 12:57:17 -08:00
Phillip Webb
ce08b519b1
Merge branch '2.6.x' into 2.7.x
2022-02-02 10:37:55 -08:00
Phillip Webb
50e0e28155
Merge branch '2.5.x' into 2.6.x
2022-02-02 10:37:32 -08:00
Phillip Webb
2b40ce09d8
Update copyright year of changed files
2022-02-02 10:35:40 -08:00
Phillip Webb
5975cdc5ed
Polish formatting
2022-02-02 10:35:10 -08:00
Stephane Nicoll
9028ab33f2
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29617
2022-02-01 16:35:28 +01:00
Stephane Nicoll
d130819fb4
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29616
2022-02-01 16:35:19 +01:00
Stephane Nicoll
30e927adae
Merge pull request #29276 from mihailcornescu
...
* pr/29276:
Polish "Add a note on early init with @ConditionalOnExpression"
Add a note on early init with @ConditionalOnExpression
Closes gh-29276
2022-02-01 16:35:01 +01:00
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