fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,916 Commits 22 Branches 339 Tags
Commit Graph

15868 Commits

Author SHA1 Message Date
Stephane Nicoll
3a65d7b01e Merge branch '2.7.x' 2022-01-31 16:45:11 +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
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
e691cfdf3d Merge branch '2.7.x' 2022-01-31 16:24:52 +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
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
42df01f193 Merge branch '2.7.x' 2022-01-29 15:44:55 +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
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
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
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
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
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
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
Andy Wilkinson
5b95c89303 Upgrade to Solr 8.11.1 
Closes gh-29517
 2022-01-21 14:16:38 +00:00
Andy Wilkinson
f025ab629a Switch to new coordinates for Git Commit ID Maven Plugin 
Closes gh-29515
 2022-01-20 17:37:03 +00:00
Andy Wilkinson
7f2c346f9d Upgrade to Yasson 2.0.4 
Closes gh-29514
 2022-01-20 17:37:02 +00:00