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,631 Commits 24 Branches 372 Tags 283 MiB
Commit Graph

15688 Commits

Author SHA1 Message Date
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 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 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 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 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
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
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
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 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 5b95c89303 Upgrade to Solr 8.11.1 
Closes gh-29517
 2022-01-21 14:16:38 +00:00
Stephane Nicoll 5cbaf2ba44 Upgrade to MariaDB 2.7.5 
Closes gh-29506
 2022-01-20 16:43:12 +01:00
Stephane Nicoll e74eba8cea Upgrade to Hibernate 5.6.4.Final 
Closes gh-29505
 2022-01-20 16:43:11 +01:00
Stephane Nicoll 8d0263c329 Upgrade to Flyway 8.4.2 
Closes gh-29504
 2022-01-20 16:43:11 +01:00
Andy Wilkinson 2c049f2b40 Merge branch '2.6.x' into 2.7.x 
Closes gh-29501
 2022-01-20 12:36:49 +00:00
Madhura Bhave 3460c24a16 Ignore context path when calling privilege evaluator 
Previously, the error page security filter passed the request's URI
to the privilege evaluator. This was incorrect in applications with
a custom context path as the privilege evaluator must be passed a
path that does not include the context path and the request URI
includes the context path.

This commit updates the filter to use UrlPathHelper's
pathWithinApplication instead. The path within the application does
not include the context path. In addition, pathWithinAppliation
also correctly handles applications configured with a servlet
mapping other than the default of /.

Closes gh-29299

Co-Authored-By: Andy Wilkinson <wilkinsona@vmware.com>
 2022-01-20 12:36:18 +00:00
Stephane Nicoll c488be5adc Upgrade to MariaDB 2.7.5 
Closes gh-29498
 2022-01-20 10:53:13 +01:00
Stephane Nicoll 5dbde1b294 Upgrade to Hibernate 5.6.4.Final 
Closes gh-29497
 2022-01-20 10:53:11 +01:00
Stephane Nicoll 6ae5bfb728 Upgrade to MariaDB 2.7.5 
Closes gh-29496
 2022-01-20 10:29:26 +01:00
Phillip Webb 5b1486cc26 Merge branch '2.5.x' into 2.6.x 2022-01-19 15:54:19 -08:00
Phillip Webb d211b0f3b3 Disable test is Docker is not available 
See gh-28843
 2022-01-19 15:53:07 -08:00
Andy Wilkinson 1e4b786ff9 Merge branch '2.6.x' into 2.7.x 
Closes gh-29489
 2022-01-19 19:09:09 +00:00
Andy Wilkinson 6bea2172cb Switch tests to properties that are not deprecated 
Closes gh-29488
 2022-01-19 19:08:31 +00:00
Andy Wilkinson 0829dcd572 Merge branch '2.6.x' into 2.7.x 
Closes gh-29486
 2022-01-19 17:27:51 +00:00
Andy Wilkinson ee9c399eba Merge branch '2.5.x' into 2.6.x 
Closes gh-29485
 2022-01-19 17:27:36 +00:00