Commit Graph

15649 Commits

Author SHA1 Message Date
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
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
Andy Wilkinson 1b3d088056 Move JdbcSessionDataSourceInitializerTests into src/test/java
Closes gh-29484
2022-01-19 17:26:55 +00: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 1e4e4f168d Upgrade to Spring for GraphQL 1.0.0-M5
Closes gh-29285
2022-01-19 16:46:12 +01: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 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 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
Stephane Nicoll 23d3b0f8ea Upgrade to Liquibase 4.7.0
Closes gh-29471
2022-01-19 08:37:15 +01:00
Stephane Nicoll 801e7c4c03 Upgrade to Flyway 8.4.1
Closes gh-29470
2022-01-19 08:37:13 +01:00
Stephane Nicoll dad1e0b18d Upgrade to Embedded Mongo 3.2.8
Closes gh-29469
2022-01-19 08:37:11 +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 c2f8823e4e Upgrade to Spring Integration 5.5.8
Closes gh-29286
2022-01-19 08:13:28 +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
Stephane Nicoll 3a043603e8 Upgrade to MySQL 8.0.28
Closes gh-29464
2022-01-19 08:12:06 +01:00
Stephane Nicoll 2782c3b077 Upgrade to Spring Integration 5.5.8
Closes gh-29314
2022-01-19 08:09:50 +01:00
Phillip Webb a77411ebd8 Merge branch '2.6.x' into 2.7.x
Closes gh-29460
2022-01-18 16:16:18 -08:00
Phillip Webb 3b4409305a Merge branch '2.5.x' into 2.6.x
Closes gh-29459
2022-01-18 16:15:20 -08:00
Phillip Webb 3d46b06e8d Fix config data placeholder resolution active document logic
Update `ConfigDataEnvironmentContributor.isActive` so that unbound
imports are no longer considered active. Prior to this commit, any
`ConfigDataEnvironmentContributor` that had `null` properties was
considered active. This is incorrect for `Kind.UNBOUND_IMPORT`
contributors since we haven't yet bound the `spring.config.*`
properties.

The `ConfigDataEnvironmentContributorPlaceholdersResolver` has been
updated to handle the refined logic. A placeholder can now be resolved
from the current contributor, or from an unbound contributor by binding
it on the fly.

Fixes gh-29386
2022-01-18 16:14:52 -08:00
Andy Wilkinson 654d142c95 Merge branch '2.6.x' into 2.7.x
Closes gh-29455
2022-01-18 20:35:06 +00:00
Andy Wilkinson 4ee260aa8c Merge branch '2.5.x' into 2.6.x
Closes gh-29454
2022-01-18 20:34:51 +00:00
Andy Wilkinson 1c6471ef60 Register AprLifecycleListener with Server not Context
Fixes gh-28814
2022-01-18 20:34:08 +00:00
Stephane Nicoll 5c9e59493d Upgrade to Spring Data 2021.2.0-M2
Closes gh-29223
2022-01-18 09:57:10 +01:00
rstoyanchev 68f4938367 Update GraphQL QBE auto-config
This change is the same as 68806bfef8
for Querydsl, but applied also to the Query By Example auto config.

Closes gh-29445
2022-01-18 09:50:31 +01:00
Andy Wilkinson e23aaba32b Merge branch '2.6.x' into 2.7.x
Closes gh-29323
2022-01-17 13:21:19 +00:00
Andy Wilkinson 27cd1c06a6 Merge branch '2.5.x' into 2.6.x
Closes gh-29322
2022-01-17 13:20:29 +00:00
Andy Wilkinson 75187349e8 Upgrade to Spring REST Docs 2.0.6.RELEASE
Closes gh-29321
2022-01-17 13:05:15 +00:00
Stephane Nicoll 3bbdbd9e5f Upgrade to Spring Security 5.7.0-M1
Closes gh-29225
2022-01-17 08:47:25 +01:00
Stephane Nicoll ce6cc77ea7 Upgrade to Spring Kafka 2.8.2
Closes gh-29224
2022-01-17 08:46:43 +01:00
Stephane Nicoll 77e9047d31 Upgrade to Spring AMQP 2.4.2
Closes gh-29284
2022-01-17 08:46:16 +01:00
Stephane Nicoll a9feb923d7 Update to Spring Kafka 2.8.2
Closes gh-29319
2022-01-17 08:44:50 +01:00
Stephane Nicoll 200c05ff98 Upgrade to Spring AMQP 2.4.2
Closes gh-29318
2022-01-17 08:44:15 +01:00