Commit Graph

39134 Commits

Author SHA1 Message Date
Andy Wilkinson
d39f4acbbc Merge branch '2.7.x' 2022-08-10 11:50:52 +01:00
Andy Wilkinson
1f44da55f1 Merge branch '2.6.x' into 2.7.x 2022-08-10 11:50:37 +01:00
Andy Wilkinson
5befae94be Merge branch '2.7.x' 2022-08-10 11:50:27 +01:00
Andy Wilkinson
0b9c2025fb Fix handling of String Java version in cache smoke test 2022-08-10 11:49:21 +01:00
Andy Wilkinson
8e3346c24f Catch exception that's thrown on Java 11 and later
See gh-32034
2022-08-10 11:20:33 +01:00
Stephane Nicoll
ffe4f785fc Merge branch '2.7.x' 2022-08-10 12:05:21 +02:00
Stephane Nicoll
37833753f8 Merge branch '2.6.x' into 2.7.x 2022-08-10 12:05:02 +02:00
Stephane Nicoll
556a4116d7 Upgrade to Reactor 2020.0.22
Closes gh-32038
2022-08-10 12:03:36 +02:00
Stephane Nicoll
e8c218908c Upgrade to Reactor 2020.0.22
Closes gh-32037
2022-08-10 12:02:51 +02:00
Stephane Nicoll
6d2d67b0bc Merge branch '2.7.x'
Closes gh-32050
2022-08-10 09:16:15 +02:00
Stephane Nicoll
06e14702fe Merge pull request #32049 from vpavic
* pr/32049:
  Polish LogFileWebEndpoint

Closes gh-32049
2022-08-10 09:15:54 +02:00
Vedran Pavic
0e6cf07ec9 Polish LogFileWebEndpoint
See gh-32049
2022-08-10 09:12:57 +02:00
Andy Wilkinson
adcd3acbc2 Merge branch '2.7.x' 2022-08-09 21:59:44 +01:00
Andy Wilkinson
08dcc5e7e5 Merge branch '2.6.x' into 2.7.x 2022-08-09 21:59:30 +01:00
Andy Wilkinson
f4ddd3b597 Fix EhCache smoke test when building with a toolchain 2022-08-09 21:58:35 +01:00
Andy Wilkinson
41334223ff Merge branch '2.7.x'
Closes gh-32044
2022-08-09 18:07:51 +01:00
Andy Wilkinson
a9a9c9f966 Merge branch '2.6.x' into 2.7.x
Closes gh-32043
2022-08-09 18:07:27 +01:00
Andy Wilkinson
f287acd1ff Fix external links in descriptions of Maven Plugin's goal parameters
Closes gh-29171
2022-08-09 18:06:37 +01:00
Andy Wilkinson
07770d8dfb Merge branch '2.7.x' 2022-08-09 17:51:28 +01:00
Andy Wilkinson
889c40355c Tolerate Flyway 9
Closes gh-32034
2022-08-09 17:50:47 +01:00
Andy Wilkinson
c6872e57a9 Remove support for Flyway 8.x and earlier
Closes gh-32036
2022-08-09 15:38:16 +01:00
Stephane Nicoll
5fdfc0d2b4 Merge branch '2.7.x' 2022-08-09 14:07:59 +02:00
Stephane Nicoll
b308d5d77a Merge branch '2.6.x' into 2.7.x 2022-08-09 14:07:49 +02:00
Stephane Nicoll
caa2598b2b Start building against Spring Security 5.7.3
See gh-32040
2022-08-09 14:07:37 +02:00
Stephane Nicoll
3fc7736c34 Start building against Reactor 2020.0.22 snapshots
See gh-32038
2022-08-09 14:07:11 +02:00
Stephane Nicoll
24c2ed3c78 Start building against Spring Security 5.6.7 snapshots
See gh-32039
2022-08-09 14:06:24 +02:00
Stephane Nicoll
19eb69c1bb Start building against Reactor 2020.0.22 snapshots
See gh-32037
2022-08-09 14:05:53 +02:00
Andy Wilkinson
9f461ed5e2 Merge branch '2.7.x' 2022-08-09 10:58:34 +01:00
Andy Wilkinson
ff348f4c6b Merge branch '2.6.x' into 2.7.x
Closes gh-32017
2022-08-09 10:57:44 +01:00
Andy Wilkinson
4a807ebbf4 Upgrade to Groovy 3.0.12
Closes gh-32008
2022-08-09 10:56:41 +01:00
Phillip Webb
bb75f04ce6 Merge branch '2.7.x'
Closes gh-32032
2022-08-09 10:24:18 +01:00
Phillip Webb
9e1a69efc9 Merge branch '2.6.x' into 2.7.x
Closes gh-32031
2022-08-09 10:23:25 +01:00
Phillip Webb
2f85ea3a30 Protect against deeply nested maps
Update BasicJsonParser to fix the deeply nested map protection logic.

Fixes gh-32029
2022-08-09 10:21:13 +01:00
Stephane Nicoll
1efad88c8c Merge branch '2.7.x'
Closes gh-32027
2022-08-09 09:53:22 +02:00
Stephane Nicoll
6e64f49593 Merge branch '2.6.x' into 2.7.x
Closes gh-32026
2022-08-09 09:53:13 +02:00
Stephane Nicoll
8dea05fd34 Merge pull request #32004 from ionascustefanciprian
* pr/32004:
  Polish contribution
  Document the DefaultServlet is no longer being enabled by default

Closes gh-32004
2022-08-09 09:52:57 +02:00
Stephane Nicoll
12c1da275b Polish contribution
See gh-32004
2022-08-09 09:52:11 +02:00
Ionascu Stefan Ciprian
c441bafe27 Document the DefaultServlet is no longer being enabled by default
See gh-32004
2022-08-09 09:41:53 +02:00
Stephane Nicoll
d520811958 Merge branch '2.7.x' 2022-08-09 09:38:26 +02:00
Stephane Nicoll
748a1c9dbf Revert "Add missing jaxb dependency for EhCache3 smoke test"
This revert a7f06e0 as the version of EhCache already depends on JAXB.
2022-08-09 09:37:09 +02:00
Stephane Nicoll
7457d2c924 Merge branch '2.7.x' 2022-08-09 09:27:35 +02:00
Stephane Nicoll
a7f06e0989 Merge branch '2.6.x' into 2.7.x 2022-08-09 09:26:17 +02:00
Stephane Nicoll
22a5ccfca7 Add missing jaxb dependency for EhCache3 smoke test
See gh-31137
2022-08-09 09:25:59 +02:00
Stephane Nicoll
4a642e9609 Merge branch '2.7.x' 2022-08-08 21:09:55 +02:00
Stephane Nicoll
a508c4d907 Merge branch '2.6.x' into 2.7.x 2022-08-08 21:09:38 +02:00
Stephane Nicoll
ccf1b9ebe4 Upgrade to MySQL 8.0.30
Closes gh-32023
2022-08-08 21:06:20 +02:00
Stephane Nicoll
c050e08238 Upgrade to Micrometer 1.9.3
Closes gh-32022
2022-08-08 21:06:19 +02:00
Stephane Nicoll
9edbbbcc03 Upgrade to MariaDB 3.0.7
Closes gh-32021
2022-08-08 21:06:19 +02:00
Stephane Nicoll
11112624f7 Upgrade to Hibernate Validator 6.2.4.Final
Closes gh-32020
2022-08-08 21:06:19 +02:00
Stephane Nicoll
5c1248b6cb Upgrade to Hazelcast 5.1.3
Closes gh-32019
2022-08-08 21:06:18 +02:00