Commit Graph

35309 Commits (136b5959c342482c7139a56d16c6edd332d5bcfc)
 

Author SHA1 Message Date
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 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 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 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 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 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 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 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 1204c1aa32 Merge branch '2.5.x' into 2.6.x
Closes gh-29556
3 years ago
Lachlan Roberts f1bbce1aac Do not modify AliasChecks list from Jetty WebAppContext
Closes gh-29555
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
3 years ago
Scott Frederick 909ef6d635 Merge branch '2.5.x' into 2.6.x
Closes gh-29553
3 years ago
Scott Frederick 000cbfa2d9 Set file permissions on all created test files
Closes gh-29551
3 years ago
Andy Wilkinson 75c3bff765 Merge branch '2.5.x' into 2.6.x
Closes gh-29546
3 years ago
Andy Wilkinson 761bed6c48 Upgrade buildSrc to Spring Framework 5.3.15
Closes gh-29545
3 years ago
Stephane Nicoll e36a56f014 Merge branch '2.5.x' into 2.6.x
Closes gh-29539
3 years ago
Stephane Nicoll fa76209306 Merge pull request #29523 from axelfontaine
* pr/29523:
  Rename Boxfuse to CloudCaptain

Closes gh-29523
3 years ago
Axel Fontaine 48817587e6 Rename Boxfuse to CloudCaptain
See gh-29523
3 years ago
Stephane Nicoll 267cd45235 Merge branch '2.5.x' into 2.6.x
Closes gh-29537
3 years ago
Stephane Nicoll 516030a2fa Merge pull request #29535 from jvalkeal
* pr/29535:
  Upgrade reference of gradle-git-properties to 2.3.2

Closes gh-29535
3 years ago
Janne Valkealahti d821f86b8e Upgrade reference of gradle-git-properties to 2.3.2
See gh-29535
3 years ago
Spring Builds 3211fa25ae Next development version (v2.6.4-SNAPSHOT) 3 years ago
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>
3 years ago
Andy Wilkinson fb44e1c7c2 Merge branch '2.5.x' into 2.6.x 3 years ago
Spring Builds 5521a5d160 Next development version (v2.5.10-SNAPSHOT) 3 years ago
Stephane Nicoll 94c7a60845 Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll c488be5adc Upgrade to MariaDB 2.7.5
Closes gh-29498
3 years ago
Stephane Nicoll 5dbde1b294 Upgrade to Hibernate 5.6.4.Final
Closes gh-29497
3 years ago
Stephane Nicoll 6ae5bfb728 Upgrade to MariaDB 2.7.5
Closes gh-29496
3 years ago
Phillip Webb 5b1486cc26 Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb d211b0f3b3 Disable test is Docker is not available
See gh-28843
3 years ago
Phillip Webb 1f61c36f7a Merge branch '2.5.x' into 2.6.x
Closes gh-29491
3 years ago
Andy Wilkinson 66428527e0 Minimize tasks run in ConventionsPluginTests
Update `ConventionsPluginTests` so that dependency resolution is
not required. This provides a work-around for our currently failing
Windows build.

Closes gh-29490
3 years ago
Andy Wilkinson 6bea2172cb Switch tests to properties that are not deprecated
Closes gh-29488
3 years ago
Andy Wilkinson ee9c399eba Merge branch '2.5.x' into 2.6.x
Closes gh-29485
3 years ago
Andy Wilkinson 1b3d088056 Move JdbcSessionDataSourceInitializerTests into src/test/java
Closes gh-29484
3 years ago