Andy Wilkinson
1ae9b8ea1b
Merge branch '3.2.x' into 3.3.x
...
Closes gh-43071
2024-11-08 10:55:52 +00:00
Andy Wilkinson
5d63335a5c
Polish "Use constants for well-known scope names"
...
See gh-43065
2024-11-08 10:53:11 +00:00
Yanming Zhou
03841b1229
Use constants for well-known scope names
...
See gh-43065
2024-11-08 10:01:19 +00:00
Phillip Webb
223886ff37
Merge branch '3.2.x' into 3.3.x
2024-10-18 10:48:51 -07:00
Phillip Webb
3481107ff7
Update copyright year of changed files
2024-10-18 10:48:29 -07:00
Andy Wilkinson
34eade32d7
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42785
2024-10-18 15:02:18 +01:00
Andy Wilkinson
1020793198
Output condition evaluation report when app under test fails to start
...
Closes gh-42185
2024-10-18 14:52:47 +01:00
Moritz Halbritter
73150b799a
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42772
2024-10-17 17:58:11 +02:00
Moritz Halbritter
ce106eb43c
Remove calls to deprecated Project.getBuildDir() in Gradle files
...
Closes gh-42739
2024-10-17 17:46:17 +02:00
Moritz Halbritter
8efe6e02d9
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42735
2024-10-17 13:38:03 +02:00
Moritz Halbritter
a3060652f8
Call String.toLowerCase and .toUppercase with explicit locale
...
Closes gh-42719
2024-10-17 13:20:39 +02:00
Phillip Webb
100bedc07d
Merge branch '3.2.x' into 3.3.x
...
Closes gh-42440
2024-09-24 14:29:09 -07:00
Phillip Webb
ad72411e2b
Apply conventions plugin to all subprojects
...
Closes gh-42438
2024-09-24 14:26:32 -07:00
Stéphane Nicoll
9c2d388ca8
Merge branch '3.2.x' into 3.3.x
2024-08-19 16:31:17 +02:00
Stéphane Nicoll
8a253d1db7
Fix formatting
2024-08-19 16:28:47 +02:00
Stéphane Nicoll
1d062e0f41
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41935
2024-08-19 16:21:03 +02:00
Stéphane Nicoll
f1e5108b59
Improve Javadoc of slice test annotations
...
This commit harmonizes the phrasing that we use to describe what
components are considered for scanning when a slice test is enabled.
This makes the description of the default filter explicit, with an
exhaustive description of the annotations and/or base classes.
Closes gh-41914
2024-08-19 16:19:18 +02:00
Moritz Halbritter
2a84fe5760
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41857
2024-08-14 16:47:52 +02:00
Andy Wilkinson
163581cfe8
Rename DataLdapTestIntegrationTests to remove clash
...
Closes gh-41617
2024-07-25 16:35:37 +01:00
Andy Wilkinson
c642f6d268
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41613
2024-07-25 16:16:35 +01:00
Andy Wilkinson
5f666eec5b
Reduce warnings reported by Eclipse
...
Closes gh-41598
2024-07-25 14:55:00 +01:00
Phillip Webb
36b1214feb
Merge branch '3.2.x' into 3.3.x
2024-07-22 18:30:45 +01:00
Phillip Webb
61dc82d836
Update copyright year of changed files
2024-07-22 18:16:19 +01:00
Eddú Meléndez
31d2bebd49
Add support for ServiceConnection in DataLdapTest
...
See gh-41325
2024-07-16 16:48:21 +02:00
Andy Wilkinson
b0d4f1d356
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41257
2024-06-27 10:16:36 +01:00
Andy Wilkinson
654016af7f
Move Docker-related test support into a separate module
...
See gh-41228
2024-06-26 19:47:35 +01:00
Andy Wilkinson
843de3adbc
Update spring-boot-test-autoconfigure to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:41 +01:00
Phillip Webb
905d6b96d0
Merge branch '3.2.x'
...
Closes gh-41166
2024-06-19 22:30:58 -07:00
Andy Wilkinson
491f34d25c
Improve container test code
...
Replace `DockerImageNames` with a enum and relocate it from the
`testcontainers` to `container` package. The enum now also
becomes a common location that we can use to apply container
configuration such as timeouts.
Closes gh-41164
Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2024-06-19 20:10:03 -07:00
Moritz Halbritter
6bb8a11295
Merge branch '3.2.x'
...
Closes gh-40517
2024-04-25 11:07:36 +02:00
Moritz Halbritter
26f1bbb634
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40516
2024-04-25 11:07:25 +02:00
Moritz Halbritter
2e906c4720
Catch exceptions thrown during String format when collecting diagnostics
...
Registers the LoggingLinesWriter only if debug logging is actually
enabled.
Closes gh-40500
2024-04-25 11:06:31 +02:00
Phillip Webb
6963bd884b
Merge branch '3.2.x'
2024-04-18 12:53:26 -07:00
Andy Wilkinson
12e004f131
Revert "Exclude unwanted javax.inject dependency from Data Couchbase"
...
This reverts commit 06f5ab162f6b049f42f15c04d3a9a8810c0c6d63. The
dependency has been removed in Data Couchbase, making the exclude
unnecessary.
See gh-40200
2024-04-12 11:19:16 +01:00
Andy Wilkinson
1ea6f2f51f
Revert "Revert "Exclude unwanted javax.inject dependency from Data Couchbase""
...
This reverts commit 3b76165f4e764300c58a52df9244ea9953abcc6f.
Turns out, the exclude's still needed for now? with Data Couchbase
5.1.x.
See gh-40200
2024-04-11 17:06:03 +01:00
Andy Wilkinson
93c8513a78
Merge branch '3.2.x'
...
See gh-40224
2024-04-11 16:56:41 +01:00
Andy Wilkinson
7d3ea3f06f
Merge branch '3.1.x' into 3.2.x
...
See gh-40212
2024-04-11 16:56:22 +01:00
Andy Wilkinson
3b76165f4e
Revert "Exclude unwanted javax.inject dependency from Data Couchbase"
...
This reverts commit 06f5ab162f6b049f42f15c04d3a9a8810c0c6d63. The
dependency has been removed in Data Couchbase, making the exclude
unnecessary.
See gh-40200
2024-04-11 16:55:24 +01:00
Andy Wilkinson
3699bcfb87
Merge branch '3.2.x'
...
See gh-40224
2024-04-09 09:09:12 +01:00
Andy Wilkinson
3bb7baf90f
Merge branch '3.1.x' into 3.2.x
...
See gh-40212
2024-04-09 09:07:52 +01:00
Andy Wilkinson
06f5ab162f
Exclude unwanted javax.inject dependency from Data Couchbase
...
See gh-40200
2024-04-09 09:07:13 +01:00
Johnny Lim
412b8dd548
Polish
...
See gh-39910
2024-03-15 11:25:16 +01:00
Andy Wilkinson
a01e068059
Start building against Micrometer 1.13.0 snapshots
...
See gh-39889
2024-03-12 09:28:27 +00:00
Phillip Webb
f8a1dae835
Merge branch '3.2.x'
2024-02-21 15:27:57 -08:00
Phillip Webb
12de6aa46a
Merge branch '3.1.x' into 3.2.x
2024-02-21 15:27:27 -08:00
Wzy19930507
4a1a98c037
Apply @AutoConfigureJson to test slices
...
See gh-39253
2024-02-16 10:10:20 +01:00
Scott Frederick
51991d6f41
Merge branch '3.2.x'
...
Closes gh-39536
2024-02-13 13:11:50 -06:00
Scott Frederick
720e9cef16
Make RestTemplateBuilder more compatible with RestClient.Builder
...
When Spring Framework builds a `RestClient` from a `RestTemplate`, it
will use any `UriTemplateHandler` that has been set on the
`RestTemplate` if the provided `UriTemplateHandler` is also a
`UriBuilderFactory`. Prior to this commit, Spring Boot's
`RestTemplateBuilder#rootUri` set a `UriTemplateHandler` on the created
`RestTemplate`, but it was not a `UriBuilderFactory` so `RestClient`
would not consider it.
With this commit, `RestTemplateBuilder#rootUri` sets a
`UriTemplateHandler` that is also a `UriBuilderFactory` so that any
root URI that is set on the `RestTemplateBuilder` will be applied to a
`RestClient` also.
Fixes gh-39317
2024-02-13 13:10:55 -06:00
Moritz Halbritter
7f55cae90f
Merge branch '3.2.x'
2024-02-12 10:19:46 +01:00
Moritz Halbritter
4387b79831
Merge branch '3.1.x' into 3.2.x
2024-02-12 10:18:46 +01:00
