Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,297 Commits 23 Branches 0 Tags
fb521806685de72ecf12bb356ee014afba65670b
Commit Graph

35297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Andy Wilkinson
fb44e1c7c2 Merge branch '2.5.x' into 2.6.x 2022-01-20 12:07:47 +00:00
Spring Builds
5521a5d160 Next development version (v2.5.10-SNAPSHOT) 2022-01-20 11:05:04 +00:00
Stephane Nicoll
94c7a60845 Merge branch '2.5.x' into 2.6.x 2022-01-20 10:53:24 +01: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
Phillip Webb
1f61c36f7a Merge branch '2.5.x' into 2.6.x 
Closes gh-29491
 2022-01-19 13:33:36 -08:00
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
 2022-01-19 13:31:40 -08: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
ee9c399eba Merge branch '2.5.x' into 2.6.x 
Closes gh-29485
 2022-01-19 17:27:36 +00:00
Andy Wilkinson
1b3d088056 Move JdbcSessionDataSourceInitializerTests into src/test/java 
Closes gh-29484
 2022-01-19 17:26:55 +00:00
Andy Wilkinson
4c422b9f3c Merge branch '2.5.x' into 2.6.x 2022-01-19 17:24:17 +00:00
Andy Wilkinson
b60612dabb Disable LoaderIntegrationTests when Docker's unavailable 
Closes gh-29385
 2022-01-19 17:23:30 +00:00
Andy Wilkinson
52f612b3eb Merge branch '2.5.x' into 2.6.x 
Closes gh-29480
 2022-01-19 13:18:50 +00:00
Andy Wilkinson
9cb66d55d1 Refer to Maven Resolver rather than Aether 
Closes gh-29255
 2022-01-19 13:18:05 +00:00
Stephane Nicoll
d92939e773 Merge branch '2.5.x' into 2.6.x 
Closes gh-29478
 2022-01-19 12:24:15 +01:00
Stephane Nicoll
4eb458f7d8 Prevent early resolution of factory beans 
This commit updates DatabaseInitializationDependencyConfigurer so that
it does not inject the Environment anymore. Doing so in such a low-level
callback can lead to early resolution of factory beans. Rather, this
commit uses the EnvironmentAware callback that short-circuit dependency
resolution.

Closes gh-29475
 2022-01-19 11:49:56 +01:00
Stephane Nicoll
76555f31ff Merge branch '2.5.x' into 2.6.x 2022-01-19 08:17:46 +01:00
Stephane Nicoll
124a3219e8 Upgrade to Pooled JMS 1.2.3 
Closes gh-29468
 2022-01-19 08:17:20 +01:00
Stephane Nicoll
60971c6fdb Upgrade to MySQL 8.0.28 
Closes gh-29467
 2022-01-19 08:17:19 +01:00
Stephane Nicoll
aba3b1dc5f Upgrade to Spring Integration 5.5.8 
Closes gh-29320
 2022-01-19 08:12:33 +01:00
Stephane Nicoll
cdd479556f Upgrade to Pooled JMS 1.2.3 
Closes gh-29466
 2022-01-19 08:12:08 +01:00
Stephane Nicoll
849fb8e435 Upgrade to Netty tcNative 2.0.47.Final 
Closes gh-29465
 2022-01-19 08:12:07 +01:00