root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
35,323 Commits 24 Branches 369 Tags 282 MiB
Commit Graph

35323 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 e36a56f014 Merge branch '2.5.x' into 2.6.x 
Closes gh-29539
 2022-01-24 09:41:35 +01:00
Stephane Nicoll fa76209306 Merge pull request #29523 from axelfontaine 
* pr/29523:
  Rename Boxfuse to CloudCaptain

Closes gh-29523
 2022-01-24 09:41:28 +01:00
Axel Fontaine 48817587e6 Rename Boxfuse to CloudCaptain 
See gh-29523
 2022-01-24 09:35:44 +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
Stephane Nicoll 516030a2fa Merge pull request #29535 from jvalkeal 
* pr/29535:
  Upgrade reference of gradle-git-properties to 2.3.2

Closes gh-29535
 2022-01-24 09:29:23 +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
Spring Builds 3211fa25ae Next development version (v2.6.4-SNAPSHOT) 2022-01-20 14:39:10 +00:00