Commit Graph

35844 Commits

Author SHA1 Message Date
Andy Wilkinson
35650d7b59 Upgrade to HikariCP 5.0.1
Closes gh-29510
2022-01-20 17:37:01 +00:00
Andy Wilkinson
7b35fabf07 Upgrade to Derby 10.15.2.0
Closes gh-29509
2022-01-20 17:37:01 +00:00
Andy Wilkinson
75fce16633 Upgrade to Caffeine 3.0.5
Closes gh-29508
2022-01-20 16:09:55 +00:00
Andy Wilkinson
9b4edfe925 Permit dependencies that require Java 9 or later 2022-01-20 16:05:42 +00:00
Stephane Nicoll
d54dd6e7ab Merge branch '2.7.x' 2022-01-20 16:44:36 +01:00
Stephane Nicoll
d5eeee8625 Upgrade to Tomcat 9.0.58
Closes gh-29507
2022-01-20 16:43:12 +01: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
Stephane Nicoll
dd6cc9bec2 Merge branch '2.6.x' into 2.7.x 2022-01-20 16:43:11 +01:00
Stephane Nicoll
1f73bff95b Merge branch '2.7.x' 2022-01-20 16:41:40 +01:00
Stephane Nicoll
e26e74f2d2 Upgrade to Tomcat 9.0.58
Closes gh-29507
2022-01-20 16:32:27 +01:00
Stephane Nicoll
6821df7c2d Upgrade to MariaDB 2.7.5
Closes gh-29506
2022-01-20 16:32:24 +01:00
Stephane Nicoll
f099193776 Upgrade to Hibernate 5.6.4.Final
Closes gh-29505
2022-01-20 16:32:23 +01:00
Stephane Nicoll
0b286846fa Upgrade to Flyway 8.4.2
Closes gh-29504
2022-01-20 16:32:21 +01:00
Stephane Nicoll
808807cf9e Merge branch '2.6.x' into 2.7.x 2022-01-20 16:29:34 +01:00
Andy Wilkinson
7579785ff7 Merge branch '2.7.x' 2022-01-20 15:29:18 +00:00
Andy Wilkinson
5a39307e14 Merge branch '2.6.x' into 2.7.x 2022-01-20 15:29:01 +00:00
Spring Builds
3211fa25ae Next development version (v2.6.4-SNAPSHOT) 2022-01-20 14:39:10 +00:00
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