Commit Graph

37083 Commits

Author SHA1 Message Date
Phillip Webb
7e4520cb0e Merge branch '2.7.x' 2022-03-24 11:03:45 -07:00
Phillip Webb
b89374a917 Merge branch '2.6.x' into 2.7.x 2022-03-24 11:02:25 -07:00
Phillip Webb
acb63e7126 Merge branch '2.5.x' into 2.6.x 2022-03-24 11:01:05 -07:00
Spring Builds
7072e9e75b Next development version (v2.6.6-SNAPSHOT) 2022-03-24 14:23:11 +00:00
Moritz Halbritter
c943dcec27 Merge branch '2.7.x' 2022-03-24 15:18:59 +01:00
Moritz Halbritter
47bf218bd2 Add prohibit clauses to shut up bomr 2022-03-24 15:18:19 +01:00
Spring Builds
fe27ce8c91 Next development version (v2.5.12-SNAPSHOT) 2022-03-24 12:45:53 +00:00
Andy Wilkinson
c3b9b33aab Merge branch '2.7.x' 2022-03-24 11:00:56 +00:00
Andy Wilkinson
975674d319 Merge branch '2.6.x' into 2.7.x
Closes gh-30410
2022-03-24 11:00:19 +00:00
Andy Wilkinson
12d9c7b1c8 Merge branch '2.5.x' into 2.6.x
Closes gh-30409
2022-03-24 10:59:50 +00:00
Andy Wilkinson
64138a138f Upgrade registry-image-resource in CI pipelines to 1.5.0
Closes gh-30408
2022-03-24 10:59:25 +00:00
Stephane Nicoll
7456d1ab59 Merge branch '2.7.x' 2022-03-24 08:50:26 +01:00
Stephane Nicoll
3de08c3ea8 Upgrade Java 18 version in CI image
Closes gh-30402
2022-03-24 08:50:15 +01:00
Stephane Nicoll
d343cc060f Upgrade Ubuntu version in CI images
Closes gh-30399
2022-03-24 08:49:35 +01:00
Stephane Nicoll
89718c0f90 Merge branch '2.6.x' into 2.7.x 2022-03-24 08:48:59 +01:00
Stephane Nicoll
11a249fe2a Upgrade Java 18 version in CI image
Closes gh-30404
2022-03-24 08:48:46 +01:00
Stephane Nicoll
faedb874c2 Upgrade Ubuntu version in CI images
Closes gh-30403
2022-03-24 08:48:04 +01:00
Stephane Nicoll
330afb0e5b Merge branch '2.5.x' into 2.6.x 2022-03-24 08:47:27 +01:00
Stephane Nicoll
2b7712a2f1 Upgrade Java 18 version in CI image
Closes gh-30398
2022-03-24 08:46:52 +01:00
Stephane Nicoll
02e16675f3 Upgrade Ubuntu version in CI images
Closes gh-30397
2022-03-24 08:45:22 +01:00
Stephane Nicoll
5deb8d7edc Upgrade Java 18 version in CI image
Closes gh-30401
2022-03-24 08:44:19 +01:00
Stephane Nicoll
f8f7a24dde Upgrade Ubuntu version in CI images
Closes gh-30400
2022-03-24 08:43:42 +01:00
Andy Wilkinson
5702f9ebc3 Merge branch '2.7.x' 2022-03-23 20:16:51 +00:00
Andy Wilkinson
5d55c663ba Allow spring.data.mongodb.uri to take precedence over separate props
Closes gh-30067
2022-03-23 20:15:04 +00:00
Andy Wilkinson
2c1b30514a Merge branch '2.7.x' 2022-03-23 15:30:53 +00:00
Andy Wilkinson
06c3e2a041 Merge branch '2.6.x' into 2.7.x
Closes gh-30394
2022-03-23 15:30:43 +00:00
Andy Wilkinson
2317f69f4c Add Apache Kafka to Messaging section's description
Closes gh-30389
2022-03-23 15:29:56 +00:00
Andy Wilkinson
038428cb1a Merge branch '2.7.x' 2022-03-23 15:29:23 +00:00
Andy Wilkinson
b911530c31 Merge branch '2.6.x' into 2.7.x
Closes gh-30393
2022-03-23 15:29:09 +00:00
Andy Wilkinson
9c128f1acc Merge branch '2.5.x' into 2.6.x
Closes gh-30392
2022-03-23 15:28:56 +00:00
Andy Wilkinson
73d9e0e0ed Fix equals when adapt removes trailing characters from element
Closes gh-30317
2022-03-23 14:55:00 +00:00
Stephane Nicoll
1f0025b7df Merge branch '2.7.x' 2022-03-23 15:50:33 +01:00
Stephane Nicoll
b70c409178 Upgrade to Selenium HtmlUnit 3.60.0
Closes gh-30391
2022-03-23 15:32:00 +01:00
Stephane Nicoll
d7ca7763da Upgrade to HtmlUnit 2.60.0
Closes gh-30390
2022-03-23 15:31:57 +01:00
Stephane Nicoll
c96b1caab0 Upgrade to Spring Batch 5.0.0-M2
Closes gh-30232
2022-03-23 14:54:12 +01:00
Moritz Halbritter
1d29081e61 Merge branch '2.7.x' 2022-03-23 13:47:03 +01:00
Moritz Halbritter
3e26c584fd Merge branch '2.6.x' into 2.7.x 2022-03-23 13:46:49 +01:00
Moritz Halbritter
27ddcbd551 Merge branch '2.5.x' into 2.6.x 2022-03-23 13:46:33 +01:00
Moritz Halbritter
cd5d3dbf8d Disable SampleSessionWebFluxApplicationTests on Linux aarch64
These tests use embedded mongo under the hood.

See gh-30082
2022-03-23 13:45:25 +01:00
Andy Wilkinson
77e6279d03 Merge branch '2.7.x' 2022-03-23 12:11:24 +00:00
Andy Wilkinson
3255da23a2 Merge branch '2.6.x' into 2.7.x
Closes gh-30388
2022-03-23 12:11:13 +00:00
Andy Wilkinson
c739831087 Merge branch '2.5.x' into 2.6.x
Closes gh-30387
2022-03-23 12:11:02 +00:00
Andy Wilkinson
d8cf332c2e Document default value of spring.thymeleaf.reactive.media-types
Closes gh-30280
2022-03-23 12:09:48 +00:00
Andy Wilkinson
a11816f7fd Merge branch '2.7.x' 2022-03-23 11:48:25 +00:00
Andy Wilkinson
3ee44ca0b0 Merge branch '2.6.x' into 2.7.x
Closes gh-30386
2022-03-23 11:47:53 +00:00
Andy Wilkinson
f378627f94 Merge branch '2.5.x' into 2.6.x
Closes gh-30385
2022-03-23 11:45:31 +00:00
Andy Wilkinson
8d882fa09b Fix possible duplicate templateEngine bean in Thymeleaf auto-config
Closes gh-30384
2022-03-23 11:44:59 +00:00
Andy Wilkinson
e3b2fb5deb Merge branch '2.7.x' 2022-03-23 11:18:28 +00:00
Andy Wilkinson
bcb71dfd1b Merge branch '2.6.x' into 2.7.x
Closes gh-30383
2022-03-23 11:18:04 +00:00
Andy Wilkinson
1244c429a6 Merge branch '2.5.x' into 2.6.x
Closes gh-30382
2022-03-23 11:17:36 +00:00