1e4b786ff9
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29489
2022-01-19 19:09:09 +00:00
6bea2172cb
Switch tests to properties that are not deprecated
...
Closes gh-29488
2022-01-19 19:08:31 +00:00
0829dcd572
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29486
2022-01-19 17:27:51 +00:00
ee9c399eba
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29485
2022-01-19 17:27:36 +00:00
1b3d088056
Move JdbcSessionDataSourceInitializerTests into src/test/java
...
Closes gh-29484
2022-01-19 17:26:55 +00:00
fa9a4a6452
Merge branch '2.6.x' into 2.7.x
2022-01-19 17:24:29 +00:00
4c422b9f3c
Merge branch '2.5.x' into 2.6.x
2022-01-19 17:24:17 +00:00
b60612dabb
Disable LoaderIntegrationTests when Docker's unavailable
...
Closes gh-29385
2022-01-19 17:23:30 +00:00
cbcc49408c
Upgrade to Spring Session 2021.2.0-M1
...
Closes gh-29226
2022-01-19 17:40:22 +01:00
1e4e4f168d
Upgrade to Spring for GraphQL 1.0.0-M5
...
Closes gh-29285
2022-01-19 16:46:12 +01:00
6fa4b942ee
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29481
2022-01-19 13:19:13 +00:00
52f612b3eb
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29480
2022-01-19 13:18:50 +00:00
9cb66d55d1
Refer to Maven Resolver rather than Aether
...
Closes gh-29255
2022-01-19 13:18:05 +00:00
f510805f00
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29479
2022-01-19 12:24:32 +01:00
d92939e773
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29478
2022-01-19 12:24:15 +01:00
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
4166429fd0
Add missing dependency management for Flyway
...
Closes gh-29474
2022-01-19 09:03:32 +01:00
6a70daa361
Upgrade to Pooled JMS 1.2.3
...
Closes gh-29473
2022-01-19 08:37:17 +01:00
92f1e119b4
Upgrade to MySQL 8.0.28
...
Closes gh-29472
2022-01-19 08:37:16 +01:00
23d3b0f8ea
Upgrade to Liquibase 4.7.0
...
Closes gh-29471
2022-01-19 08:37:15 +01:00
801e7c4c03
Upgrade to Flyway 8.4.1
...
Closes gh-29470
2022-01-19 08:37:13 +01:00
dad1e0b18d
Upgrade to Embedded Mongo 3.2.8
...
Closes gh-29469
2022-01-19 08:37:11 +01:00
d1ac9c6a92
Merge branch '2.6.x' into 2.7.x
2022-01-19 08:17:57 +01:00
76555f31ff
Merge branch '2.5.x' into 2.6.x
2022-01-19 08:17:46 +01:00
124a3219e8
Upgrade to Pooled JMS 1.2.3
...
Closes gh-29468
2022-01-19 08:17:20 +01:00
60971c6fdb
Upgrade to MySQL 8.0.28
...
Closes gh-29467
2022-01-19 08:17:19 +01:00
c2f8823e4e
Upgrade to Spring Integration 5.5.8
...
Closes gh-29286
2022-01-19 08:13:28 +01:00
aba3b1dc5f
Upgrade to Spring Integration 5.5.8
...
Closes gh-29320
2022-01-19 08:12:33 +01:00
cdd479556f
Upgrade to Pooled JMS 1.2.3
...
Closes gh-29466
2022-01-19 08:12:08 +01:00
849fb8e435
Upgrade to Netty tcNative 2.0.47.Final
...
Closes gh-29465
2022-01-19 08:12:07 +01:00
3a043603e8
Upgrade to MySQL 8.0.28
...
Closes gh-29464
2022-01-19 08:12:06 +01:00
2782c3b077
Upgrade to Spring Integration 5.5.8
...
Closes gh-29314
2022-01-19 08:09:50 +01:00
e95c514fd5
Merge branch '2.6.x' into 2.7.x
2022-01-18 18:48:53 -08:00
f6cdc27b2a
Merge branch '2.5.x' into 2.6.x
2022-01-18 18:48:40 -08:00
eca05c42fb
Further refine LoaderIntegrationTests for CI
...
Update `LoaderIntegrationTests` to filter compatible JDKs early.
See gh-29385
2022-01-18 18:47:41 -08:00
8aacf4cb36
Merge branch '2.6.x' into 2.7.x
2022-01-18 18:19:07 -08:00
392de30390
Merge branch '2.5.x' into 2.6.x
2022-01-18 18:18:56 -08:00
de8f8c3e64
Refine LoaderIntegrationTests for CI
...
Refine `LoaderIntegrationTests` to fix failures when CI builds are
running with later JDK versions.
See gh-29385
2022-01-18 18:16:47 -08:00
1f77533b09
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29463
2022-01-18 17:37:10 -08:00
44537d4494
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29462
2022-01-18 17:36:59 -08:00
3d908079ef
Run LoaderIntegrationTests against multiple JDKs
...
Update `LoaderIntegrationTests` to run against OpenJDK 8, 11 and 17 as
well as Oracle JDK 17.
Closes gh-29385
2022-01-18 17:36:48 -08:00
a77411ebd8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29460
2022-01-18 16:16:18 -08:00
3b4409305a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29459
2022-01-18 16:15:20 -08:00
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
654d142c95
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29455
2022-01-18 20:35:06 +00:00
4ee260aa8c
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29454
2022-01-18 20:34:51 +00:00
1c6471ef60
Register AprLifecycleListener with Server not Context
...
Fixes gh-28814
2022-01-18 20:34:08 +00:00
935587b218
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29450
2022-01-18 12:00:35 +00:00
d28942ea53
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29449
2022-01-18 12:00:20 +00:00
2394cbf650
Merge pull request #29444 from jprinet
...
* gh-29444:
Upgrade to Gradle Enterprise Plugin 3.8.1
Closes gh-29444
2022-01-18 11:59:54 +00:00
Andy Wilkinson
Brian Clozel
Stephane Nicoll
Phillip Webb