Commit Graph

699 Commits

Author SHA1 Message Date
Andy Wilkinson
45c32854a5 Fix Checkstyle upgrade
Closes gh-38746
2024-01-10 15:37:38 +00:00
Phillip Webb
b902bf6aca Merge branch '3.0.x' into 3.1.x 2023-11-13 10:42:32 -08:00
Phillip Webb
09e5a2f24a Update copyright year of changed files 2023-11-13 10:42:26 -08:00
Moritz Halbritter
3560a13d57 Merge branch '3.0.x' into 3.1.x
Closes gh-38225
2023-11-06 10:27:42 +01:00
Yanming Zhou
d7ab153559 Use switch expression where feasible
See gh-38217
2023-11-06 10:27:04 +01:00
Phillip Webb
afa4d274c2 Merge branch '3.0.x' into 3.1.x 2023-11-02 14:14:19 -07:00
Phillip Webb
8d53caa1c6 Merge branch '2.7.x' into 3.0.x 2023-11-02 14:13:47 -07:00
Phillip Webb
54313d1962 Update copyright year of changed files 2023-11-02 14:13:38 -07:00
Moritz Halbritter
607ed86edb Merge branch '3.0.x' into 3.1.x 2023-10-31 10:23:01 +01:00
Moritz Halbritter
1f41179a88 Polish SpringBootMockMvcBuilderCustomizer 2023-10-31 09:49:01 +01:00
Andy Wilkinson
3be8475089 Merge branch '3.0.x' into 3.1.x
Closes gh-38113
2023-10-30 11:13:43 +00:00
Andy Wilkinson
aaa26c90a8 Merge branch '2.7.x' into 3.0.x
Closes gh-38112
2023-10-30 11:13:25 +00:00
Andy Wilkinson
f78dcac56f Clarify that @AutoConfigureWebTestClient uses mock infrastructure
Closes gh-29890
2023-10-30 11:13:03 +00:00
Phillip Webb
78eb8f90d1 Merge branch '3.0.x' into 3.1.x 2023-09-20 17:12:27 -07:00
Phillip Webb
9b5062e5bb Merge branch '2.7.x' into 3.0.x 2023-09-20 17:06:55 -07:00
Phillip Webb
b83e7b42bb Update copyright year of changed files 2023-09-20 16:05:44 -07:00
Moritz Halbritter
768dfb2c63 Merge branch '3.0.x' into 3.1.x
Closes gh-37207
2023-09-06 14:44:13 +02:00
Moritz Halbritter
ffed8b0502 Merge branch '2.7.x' into 3.0.x
Closes gh-37206
2023-09-06 14:43:36 +02:00
Yanming Zhou
4c39cc2314 Continue polishing
See commit 947e330e9d

See gh-37166
2023-09-06 14:38:57 +02:00
Moritz Halbritter
1962f4ecb7 Merge branch '3.0.x' into 3.1.x 2023-09-05 15:24:25 +02:00
Moritz Halbritter
a69ff3bd59 Merge branch '2.7.x' into 3.0.x 2023-09-05 15:21:51 +02:00
Moritz Halbritter
76e51bc92f Only enable needed Couchbase services in integration tests 2023-09-05 15:10:12 +02:00
Andy Wilkinson
e6fcde4af5 Merge branch '3.0.x' into 3.1.x
Closes gh-37143
2023-08-30 13:35:40 +01:00
Andy Wilkinson
a8e37b5cc5 Merge branch '2.7.x' into 3.0.x
Closes gh-37142
2023-08-30 13:34:12 +01:00
Andy Wilkinson
2de98a84bc Polish "Polish code and javadoc"
See gh-37112
2023-08-30 13:31:58 +01:00
hakan-krgn
6d9ce8a3b5 Polish code and javadoc
See gh-37112
2023-08-30 13:31:58 +01:00
Andy Wilkinson
dc45532c94 Avoid triggering second context creation when first attempt failed
Closes gh-24888
2023-08-10 14:39:28 +01:00
Stephane Nicoll
3e72b8625d Merge branch '3.0.x' into 3.1.x
Closes gh-36774
2023-08-07 16:48:50 +02:00
Stephane Nicoll
56535d804c Rename WebDriverContextCustomizerFactory's customizer
Closes gh-36416
2023-08-07 16:44:16 +02:00
Andy Wilkinson
92361b5545 Merge branch '3.0.x' into 3.1.x
Closes gh-36664
2023-08-01 20:03:01 +01:00
Andy Wilkinson
51b81ced6f Merge branch '2.7.x' into 3.0.x
Closes gh-36663
2023-08-01 20:01:20 +01:00
Andy Wilkinson
28b3054a9e Try to stabilize DataCouchbaseTestIntegrationTests
Closes gh-36662
2023-08-01 19:58:28 +01:00
Andy Wilkinson
0d646d7c26 Polish "Support ServiceConnection beans in slice tests"
See gh-36037
2023-08-01 18:12:53 +01:00
Eddú Meléndez
4dfb60c9a3 Support ServiceConnection beans in slice tests
Previously, to use `@ServiceConnection` on a `@Bean` method in a sliced
test required ServiceConnectionAutoConfiguration to be imported using
`@ImportAutoConfiguration`. This commit removes the need for this
import by registering ServiceConnectionAutoConfiguration in specific
slice test annotations.

See gh-36037
2023-08-01 18:09:57 +01:00
Eddú Meléndez
321c526bf7 Add SslAutoConfiguration to slice test annotations
`SslAutoConfiguration` has been added to `cassandra`, `couchbase`,
`elasticsearch`, `mongo` and `redis` slice test annotations.

See gh-36038
2023-06-23 15:51:42 -06:00
Andy Wilkinson
3f7fe25cb9 Merge branch '3.0.x' into 3.1.x
Closes gh-36044
2023-06-23 15:58:36 +01:00
Andy Wilkinson
2fae5de245 Merge branch '2.7.x' into 3.0.x
Closes gh-36043
2023-06-23 15:50:02 +01:00
Andy Wilkinson
d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
See gh-35915
2023-06-23 12:38:12 +01:00
ThomazPassarelli
f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking
See gh-35915
2023-06-23 12:16:26 +01:00
Stephane Nicoll
9643dbeed2 Merge branch '3.0.x'
Closes gh-35590
2023-05-22 16:31:55 +02:00
Christoph Dreis
b2b5728995 Remove unnecessary exclude from spring-restdocs-mockmvc
See gh-35568
2023-05-22 16:31:22 +02:00
Moritz Halbritter
c00e6ebbdf Merge branch '3.0.x'
Closes gh-35360
2023-05-09 11:23:05 +02:00
Moritz Halbritter
1c87fcb806 Add property to disable DisableObservabilityContextCustomizer
Closes gh-35009
2023-05-09 11:21:53 +02:00
Scott Frederick
a474e54cf3 Merge branch '3.0.x'
Closes gh-35244
2023-05-05 16:20:41 -05:00
Scott Frederick
cf180fa1cc Merge branch '2.7.x' into 3.0.x
Closes gh-35243
2023-05-05 16:07:23 -05:00
Scott Frederick
5d91c24f63 Update Couchbase image tag used in tests
Closes gh-35228
2023-05-05 14:45:58 -05:00
Moritz Halbritter
735c43ce9b Merge branch '2.7.x' into 3.0.x 2023-05-02 14:38:48 +02:00
Moritz Halbritter
312f0c17ed Set initial ElasticSearch heap size in integration tests 2023-05-02 14:37:13 +02:00
Moritz Halbritter
944d77491b Set initial heap size for ElasticSearch integration tests 2023-05-02 14:25:35 +02:00
Moritz Halbritter
1ce88f25b4 Merge branch '3.0.x' 2023-05-02 14:08:37 +02:00