Commit Graph

36454 Commits

Author SHA1 Message Date
Stephane Nicoll
d7ca7763da Upgrade to HtmlUnit 2.60.0
Closes gh-30390
2022-03-23 15:31:57 +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
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
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
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
Andy Wilkinson
e927cd71dd Clarify type matching performed by MockBean and SpyBean
Closes gh-28656
2022-03-23 11:17:07 +00:00
Moritz Halbritter
1fec2f0e9b Merge branch '2.6.x' into 2.7.x 2022-03-23 12:06:57 +01:00
Moritz Halbritter
4e09289076 Merge branch '2.5.x' into 2.6.x
# Conflicts:
#	spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/test/java/smoketest/data/mongo/SampleMongoApplicationTests.java
2022-03-23 12:04:30 +01:00
Moritz Halbritter
1d15e8c8e2 Disable SampleMongoApplicationTests on Linux aarch64
See gh-30082
2022-03-23 12:03:35 +01:00
Andy Wilkinson
47540eec61 Align default indices options with Spring Data Elasticsearch
Closes gh-30378
2022-03-23 09:39:05 +00:00
Andy Wilkinson
ac3b0ea24a Merge branch '2.6.x' into 2.7.x
Closes gh-30380
2022-03-23 09:36:31 +00:00
Andy Wilkinson
24aa4070c9 Merge pull request #30349 from hpoettker
* gh-30349:
  Fix links to Spring Security Reference Guide

Closes gh-30349
2022-03-23 09:35:58 +00:00
Henning Poettker
22eb301bcf Fix links to Spring Security Reference Guide
See gh-30349
2022-03-23 09:35:30 +00:00
Stephane Nicoll
c46953ae06 Merge branch '2.6.x' into 2.7.x 2022-03-23 08:07:31 +01:00
Stephane Nicoll
dc7c1f246f Upgrade to Spring Integration 5.5.10
Closes gh-30193
2022-03-23 08:07:11 +01:00
Stephane Nicoll
5011a12f71 Merge branch '2.5.x' into 2.6.x 2022-03-23 08:06:34 +01:00
Stephane Nicoll
589804000b Upgrade to Spring Integration 5.5.10
Closes gh-30183
2022-03-23 08:06:25 +01:00
Stephane Nicoll
acdfa31f5a Upgrade to Spring Integration 5.5.10
Closes gh-30175
2022-03-23 08:05:45 +01:00
Andy Wilkinson
79ee53a587 Merge branch '2.6.x' into 2.7.x
Closes gh-30377
2022-03-22 20:13:04 +00:00
Andy Wilkinson
f063da30d2 Merge branch '2.5.x' into 2.6.x
Closes gh-30376
2022-03-22 20:12:48 +00:00
Andy Wilkinson
a8bddeb9cf Remove redundant setting of refresh policy
Closes gh-30375
2022-03-22 20:12:09 +00:00
Scott Frederick
e99b13e009 Merge branch '2.6.x' into 2.7.x
Closes gh-30374
2022-03-22 13:42:02 -05:00
Scott Frederick
7a8bde5f7b Enable Paketo system tests for Java versions supported by buildpacks
Closes gh-30373
2022-03-22 13:41:24 -05:00
Andy Wilkinson
219d946e33 Upgrade to Spring for GraphQL 1.0.0-M6
Closes gh-29637
2022-03-22 17:30:21 +00:00
Andy Wilkinson
7eff00b818 Merge branch '2.6.x' into 2.7.x
Closes gh-30360
2022-03-22 10:36:36 +00:00
Andy Wilkinson
f04a85957e Merge branch '2.5.x' into 2.6.x
Closes gh-30359
2022-03-22 10:36:17 +00:00
Andy Wilkinson
5473cd3abc Try to stabilize SampleSessionWebFluxApplicationTests
Closes gh-30353
2022-03-22 10:20:31 +00:00
Andy Wilkinson
91fe362e94 Merge branch '2.6.x' into 2.7.x
Closes gh-30352
2022-03-21 20:44:51 +00:00
Andy Wilkinson
f53c5178c3 Upgrade to Spring Kafka 2.8.4
Closes gh-30181
2022-03-21 20:44:19 +00:00
Andy Wilkinson
904334d18b Merge branch '2.5.x' into 2.6.x 2022-03-21 20:42:25 +00:00
Andy Wilkinson
b2c52d632a Upgrade to Spring Kafka 2.7.12
Closes gh-30351
2022-03-21 20:23:37 +00:00
Andy Wilkinson
1185f2f58b Merge branch '2.6.x' into 2.7.x
Closes gh-30189
2022-03-21 20:22:05 +00:00
Andy Wilkinson
b2e8087f3c Upgrade to Spring AMQP 2.4.3
Closes gh-30180
2022-03-21 20:21:42 +00:00
Andy Wilkinson
8ad214de8f Merge branch '2.5.x' into 2.6.x 2022-03-21 20:21:04 +00:00
Andy Wilkinson
95f561afc0 Upgrade to Spring AMQP 2.5.11
Closes gh-30173
2022-03-21 20:20:23 +00:00
Andy Wilkinson
bb969384fc Merge branch '2.6.x' into 2.7.x
Closes gh-30192
2022-03-21 20:18:50 +00:00
Andy Wilkinson
72f6565863 Merge branch '2.5.x' into 2.6.x
Closes gh-30182
2022-03-21 20:18:31 +00:00
Andy Wilkinson
4b17214e21 Upgrade to Spring WS 3.1.3
Closes gh-30174
2022-03-21 20:18:05 +00:00
Andy Wilkinson
24cea36f1b Upgrade to Spring Security 5.7.0-M3
Closes gh-30191
2022-03-21 20:13:09 +00:00
Andy Wilkinson
9aaa5bca7a Upgrade to Spring Data 2021.2.0-M4
Closes gh-30185
2022-03-21 18:19:12 +00:00
Andy Wilkinson
7b02c3218b Merge branch '2.6.x' into 2.7.x 2022-03-21 18:18:28 +00:00
Andy Wilkinson
4bc1463439 Upgrade to Spring Data 2021.1.3
Closes gh-30179
2022-03-21 18:17:14 +00:00
Andy Wilkinson
73374e705c Merge branch '2.5.x' into 2.6.x 2022-03-21 18:16:47 +00:00