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
Stephane Nicoll
5c9e59493d
Upgrade to Spring Data 2021.2.0-M2
...
Closes gh-29223
2022-01-18 09:57:10 +01:00
Brian Clozel
354c9ca7ae
Merge branch '2.7.x'
2022-01-18 09:51:05 +01:00
rstoyanchev
68f4938367
Update GraphQL QBE auto-config
...
This change is the same as 68806bfef8
2022-01-18 09:50:31 +01:00
Stephane Nicoll
f08a417462
Upgrade to Spring Security 6.0.0-M1
...
Closes gh-28643
2022-01-18 08:59:57 +01:00
Stephane Nicoll
e5f981ea5f
Upgrade to Spring AMQP 3.0.0-M1
...
Closes gh-28646
2022-01-18 08:58:14 +01:00
Stephane Nicoll
0ec9e6e7a8
Upgrade to Spring Kafka 3.0.0-M1
...
Closes gh-28647
2022-01-18 08:57:46 +01:00
Andy Wilkinson
964f028f75
Upgrade to Spring REST Docs 3.0.0-M1
...
Closes gh-28721
2022-01-17 18:09:07 +00:00
Andy Wilkinson
db6e9a7a5f
Start building against Spring Batch 5.0 snapshots
...
This commit adapts to some changes in Spring Batch 5.0:
- A DataSource bean is now required by Batch
- A PlatformTransactionManager bean is no longer defined by Batch
See gh-29278
2022-01-17 16:17:49 +00:00
Andy Wilkinson
9bc1047c49
Merge branch '2.7.x'
2022-01-17 13:21:46 +00: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
58fa34a20d
Merge branch '2.7.x'
2022-01-17 08:53:40 +01:00
Stephane Nicoll
c379088fce
Merge branch '2.6.x' into 2.7.x
2022-01-17 08:53:30 +01:00
Stephane Nicoll
413fafebff
Merge branch '2.5.x' into 2.6.x
2022-01-17 08:53:21 +01:00
Stephane Nicoll
3bbdbd9e5f
Upgrade to Spring Security 5.7.0-M1
...
Closes gh-29225
2022-01-17 08:47:25 +01:00
