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
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
7de3b6e6cd
Switch bomr to "any" policy
2022-01-19 08:30:58 +01:00
Stephane Nicoll
507abe88f3
Upgrade to Spring Integration 6.0.0-M1
...
Closes gh-28649
2022-01-19 08:28:26 +01:00
Stephane Nicoll
9ea81e0059
Merge branch '2.7.x'
2022-01-19 08:18:06 +01:00
Stephane Nicoll
d1ac9c6a92
Merge branch '2.6.x' into 2.7.x
2022-01-19 08:17:57 +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
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
13f6729b37
Merge branch '2.7.x'
2022-01-18 18:49:08 -08:00
Phillip Webb
e95c514fd5
Merge branch '2.6.x' into 2.7.x
2022-01-18 18:48:53 -08:00
Phillip Webb
f6cdc27b2a
Merge branch '2.5.x' into 2.6.x
2022-01-18 18:48:40 -08:00
Phillip Webb
eca05c42fb
Further refine LoaderIntegrationTests for CI
...
Update `LoaderIntegrationTests` to filter compatible JDKs early.
See gh-29385
2022-01-18 18:47:41 -08:00
Phillip Webb
e18cbe5fe2
Merge branch '2.7.x'
2022-01-18 18:19:46 -08:00
Phillip Webb
8aacf4cb36
Merge branch '2.6.x' into 2.7.x
2022-01-18 18:19:07 -08:00
Phillip Webb
392de30390
Merge branch '2.5.x' into 2.6.x
2022-01-18 18:18:56 -08:00
Phillip Webb
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
Phillip Webb
2d1854a682
Merge branch '2.7.x'
2022-01-18 17:42:34 -08:00
Phillip Webb
1f77533b09
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29463
2022-01-18 17:37:10 -08:00
Phillip Webb
44537d4494
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29462
2022-01-18 17:36:59 -08:00
Phillip Webb
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
Phillip Webb
e4b398769f
Merge branch '2.7.x'
2022-01-18 16:16:59 -08: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
d04ece044a
Merge branch '2.7.x'
2022-01-18 20:35:20 +00: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
Andy Wilkinson
4d3af14a1a
Upgrade to Spring Web Services 4.0.0-M1
...
Closes gh-28648
2022-01-18 18:05:24 +00:00
Andy Wilkinson
b27189cf7a
Merge branch 'thymeleaf-3.1'
2022-01-18 16:02:21 +00:00
Andy Wilkinson
26fecbe230
Upgrade to Thymeleaf and Security Extras 3.1.0-M1
...
Closes gh-49452
Closes gh-49453
2022-01-18 16:01:29 +00:00
Andy Wilkinson
12cd97a20c
Reinstate support for Thymeleaf
2022-01-18 16:01:29 +00:00
Andy Wilkinson
e95f038c01
Merge branch '2.7.x'
2022-01-18 12:00:48 +00:00
Andy Wilkinson
935587b218
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29450
2022-01-18 12:00:35 +00:00
Andy Wilkinson
d28942ea53
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29449
2022-01-18 12:00:20 +00:00
Andy Wilkinson
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
Jerome Prinet
744d977480
Upgrade to Gradle Enterprise Plugin 3.8.1
...
See gh-29444
2022-01-18 11:59:36 +00:00
Stephane Nicoll
a1c8997f61
Merge branch '2.7.x'
2022-01-18 10:37:04 +01:00