Andy Wilkinson
35b5b5672d
Merge branch '2.7.x'
2022-01-20 12:37:16 +00: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
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
3279d8ab89
Merge branch '2.7.x'
2022-01-20 10:53:43 +01:00
Stephane Nicoll
7f021b4c00
Merge branch '2.6.x' into 2.7.x
2022-01-20 10:53:35 +01: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
3f7b1f73a7
Merge branch '2.7.x'
2022-01-19 15:54:44 -08:00
Phillip Webb
1c5bd5431d
Merge branch '2.6.x' into 2.7.x
2022-01-19 15:54:33 -08: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
fb83e6930d
Merge branch '2.7.x'
2022-01-19 13:35:20 -08:00
Phillip Webb
b31e9d6b4a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29492
2022-01-19 13:35: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
a3bfc67249
Merge branch '2.7.x'
2022-01-19 19:09:25 +00: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
92fa8ae9b7
Upgrade to Spring Session 2022.0.0-M1
...
Closes gh-28871
2022-01-19 17:30:36 +00:00
Andy Wilkinson
5d11c90e6d
Upgrade to Spring Batch 5.0.0-M1
...
Closes gh-29278
2022-01-19 17:29:25 +00:00
Andy Wilkinson
16c808fd2f
Merge branch '2.7.x'
2022-01-19 17:28:26 +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
Andy Wilkinson
1b3d088056
Move JdbcSessionDataSourceInitializerTests into src/test/java
...
Closes gh-29484
2022-01-19 17:26:55 +00:00
Andy Wilkinson
de3b9a4910
Remove code deprecated for removal in 2.x
...
Closes gh-29482
2022-01-19 17:25:14 +00:00
Andy Wilkinson
1fa541d4de
Merge branch '2.7.x'
2022-01-19 17:24:42 +00:00
Andy Wilkinson
fa9a4a6452
Merge branch '2.6.x' into 2.7.x
2022-01-19 17:24:29 +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
Brian Clozel
a201c6c469
Merge branch '2.7.x'
2022-01-19 17:41:17 +01:00
Brian Clozel
cbcc49408c
Upgrade to Spring Session 2021.2.0-M1
...
Closes gh-29226
2022-01-19 17:40:22 +01:00
Brian Clozel
38c0ce4b87
Merge branch '2.7.x'
2022-01-19 16:46:51 +01:00
Brian Clozel
1e4e4f168d
Upgrade to Spring for GraphQL 1.0.0-M5
...
Closes gh-29285
2022-01-19 16:46:12 +01:00
Andy Wilkinson
91060a94d4
Merge branch '2.7.x'
2022-01-19 13:20:37 +00:00
Andy Wilkinson
6fa4b942ee
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29481
2022-01-19 13:19:13 +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
0d2e3bc4c9
Merge branch '2.7.x'
2022-01-19 12:24:47 +01:00
Stephane Nicoll
f510805f00
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29479
2022-01-19 12:24:32 +01: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
4d03f89a55
Harmonize dependency upgrades with Spring Boot 2.7.0-M1
...
Closes gh-29476
2022-01-19 10:39:18 +01:00
Stephane Nicoll
d433f18922
Merge branch '2.7.x'
2022-01-19 09:06:31 +01:00
Stephane Nicoll
4166429fd0
Add missing dependency management for Flyway
...
Closes gh-29474
2022-01-19 09:03:32 +01:00
Stephane Nicoll
6a70daa361
Upgrade to Pooled JMS 1.2.3
...
Closes gh-29473
2022-01-19 08:37:17 +01:00
Stephane Nicoll
92f1e119b4
Upgrade to MySQL 8.0.28
...
Closes gh-29472
2022-01-19 08:37:16 +01:00
