Commit Graph

711 Commits

Author SHA1 Message Date
Andy Wilkinson 0950d4416a Pass in filter's name when adding to MockMvc
Closes gh-38001
2023-10-24 12:39:42 +01:00
Andy Wilkinson daa903ab31 Add filters to MockMvc with their init params and dispatcher types
Closes gh-37835
2023-10-17 17:54:36 +01:00
Scott Frederick ff99de49c4 Configure a RestClient.Builder with RestClientTest
This commit adds support for configuring a `RestClient.Builder` and
`MockRestServiceServer` support for the `RestClient` when using
`@RestClientTest` sliced tests.

Closes gh-37033
2023-09-29 15:07:38 -05:00
Phillip Webb f55184a998 Update copyright year of changed files 2023-09-20 17:16:31 -07:00
Phillip Webb 2075f6c685 Merge branch '3.1.x' 2023-09-20 17:16:13 -07: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
Stephane Nicoll 77a85fd180 Fix deprecation in Spring Framework 2023-09-13 18:04:55 +02:00
Moritz Halbritter bced103517 Merge branch '3.1.x'
Closes gh-37208
2023-09-06 14:44:21 +02: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 8f78acd548 Merge branch '3.1.x' 2023-09-05 15:28:23 +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
Moritz Halbritter 947e330e9d Polish "Include JdbcClientAutoConfiguration in @JdbcTest and @DataJpaTest slices"
See gh-37122
2023-08-31 13:15:50 +02:00
Yanming Zhou b8eec2a8a4 Include JdbcClientAutoConfiguration in @JdbcTest and @DataJpaTest slices
See gh-37122
2023-08-31 13:07:10 +02:00
Andy Wilkinson f6c88662b4 Merge branch '3.1.x'
Closes gh-37144
2023-08-30 13:36:01 +01: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
Phillip Webb 8edec21a6f Update copyright year of changed files 2023-08-13 20:44:44 -07:00
Andy Wilkinson dc45532c94 Avoid triggering second context creation when first attempt failed
Closes gh-24888
2023-08-10 14:39:28 +01:00
Moritz Halbritter b5a48e926d Handle timeout of latch await in tests 2023-08-08 13:12:48 +02:00
Moritz Halbritter de57b5f4a4 Call remove() on ThreadLocal in SpringBootMockMvcBuilderCustomizer 2023-08-08 13:12:48 +02:00
Stephane Nicoll f5b3bc7a9f Merge branch '3.1.x'
Closes gh-36775
2023-08-07 16:49:18 +02: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
Moritz Halbritter 1a8b8ce26e Revert "Revise synchronized blocks"
This reverts commit 497bbf9c2d.
2023-08-03 17:26:31 +02:00
Moritz Halbritter 497bbf9c2d Revise synchronized blocks
- Replace synchronized with Lock when guarding long-running operations
- Remove unnecessary synchronization in FileSystemWatcher
- Replace HashMap with ConcurrentHashMap in Restarter
- Remove unnecessary locking on AtomicBoolean in
  SpringApplicationBuilder
- Remove unnecessary locking in SimpleFormatter

Closes gh-36670
2023-08-03 09:23:46 +02:00
Andy Wilkinson 0646eabd4a Merge branch '3.1.x'
Closes gh-36665
2023-08-01 20:03:25 +01: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 806aa45279 Merge branch '3.1.x'
Closes gh-36661
2023-08-01 18:14:03 +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
Johnny Lim 96c9915f12 Polish
See gh-36565
2023-07-26 10:00:56 +02:00
Andy Wilkinson 5a9ca67fba Start building against Spring Framework 6.2.0-M2 snapshots
See gh-36198
2023-07-04 10:20:33 +01:00
Scott Frederick 47cc65d912 Merge branch '3.1.x'
Closes gh-36056
2023-06-23 16:12:58 -06: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 b645eb32ac Remove deprecated code that was to be removed in 3.2
Closes gh-36034
2023-06-23 18:14:22 +01:00
Andy Wilkinson 357c67a999 Merge branch '3.1.x' 2023-06-23 15:58:51 +01: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