Commit Graph

49312 Commits

Author SHA1 Message Date
Andy Wilkinson
3f1f801461 Update spring-boot-testcontainers to use docker-test plugin
See gh-41228
2024-06-26 19:45:52 +01:00
Andy Wilkinson
d78c7b541a Introduce docker-test plugin for running tests that require Docker
See gh-41228
2024-06-26 19:45:21 +01:00
Andy Wilkinson
2dd6c1c3a0 Merge branch '3.2.x' into 3.3.x
Closes gh-41249
2024-06-26 17:00:58 +01:00
Andy Wilkinson
07442f8366 Exclude plexus-utils in favor of Maven's build-in version
Closes gh-41248
2024-06-26 16:59:23 +01:00
Andy Wilkinson
81c8a9706f Merge branch '3.2.x' into 3.3.x
Closes gh-41246
2024-06-26 14:29:14 +01:00
Andy Wilkinson
c5dfcc54de Merge pull request #41244 from mateusscheper
* gh-41244:
  Polish "Make conversion mechanism plural"
  Make conversion mechanism plural

Closes gh-41244
2024-06-26 14:27:16 +01:00
Andy Wilkinson
270f364aef Polish "Make conversion mechanism plural"
See gh-41244
2024-06-26 14:26:51 +01:00
Mateus Scheper
068b159799 Make conversion mechanism plural
Fixing typo for the "mechanism" word and improving readability by
adding ".".

See gh-41244
2024-06-26 14:26:00 +01:00
Phillip Webb
26ea4f9fb1 Merge branch '3.2.x' into 3.3.x 2024-06-25 22:16:10 -07:00
Phillip Webb
712d935c8e Fix checkstyle violation
See gh-35786
2024-06-25 22:16:03 -07:00
Phillip Webb
87e0262896 Merge branch '3.2.x' into 3.3.x
Closes gh-41238
2024-06-25 22:08:44 -07:00
Phillip Webb
eef4c3c2c0 Allow TestcontainersLifecycleBeanPostProcessor to detect scoped beans
Update `TestcontainersLifecycleBeanPostProcessor` so that scoped beans
are included.

Fixes gh-35786
2024-06-25 22:00:34 -07:00
Phillip Webb
a3377b0672 Merge branch '3.2.x' into 3.3.x
Closes gh-41236
2024-06-25 17:08:29 -07:00
Phillip Webb
8bcdb4b06b Improve error message when spring.config.import fails to resolve
Update `StandardConfigDataLocationResolver` to give a better error
message when a location cannot be resolved. Prior to this commit, a
location with a misspelling in the prefix would only give an error
about the file extension being not known.

Fixes gh-36243
2024-06-25 17:08:24 -07:00
Phillip Webb
eb9f16e7e6 Merge branch '3.2.x' into 3.3.x
Closes gh-41234
2024-06-25 12:42:53 -07:00
Phillip Webb
85f6641a7e Allow 'npipe://' prefix in Docker host address
Update `LocalHttpClientTransport` to support explicit `npipe://` prefix
in the host name. This is the format used in the Docker config from
v4.31.1 onward.

Fixes gh-41199
2024-06-25 12:40:11 -07:00
Phillip Webb
6d0c68f9f6 Merge branch '3.2.x' into 3.3.x
Closes gh-41225
2024-06-24 16:04:51 -07:00
Andy Wilkinson
98c11bb5df Use consistent current thread context classloader for initialization
Ensure `Thread.currentThread().getContextClassLoader()` returns the same
classloader for all types of initialization.

Prior to this commit, `JettyEmbeddedWebAppContext` would return a
different classloader when initializing Servlet and Filter classes. This
was due to the fact that our `deferredInitialize()` method has called
outside of a `getContext().call(...)`.

Fixes gh-37649

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2024-06-24 16:03:00 -07:00
Phillip Webb
726f71a1a8 Merge branch '3.2.x' into 3.3.x
Closes gh-41221
2024-06-24 12:24:27 -07:00
Phillip Webb
57f452fec1 Disable ReactorResourceFactory use of global resources in tests
Add `ContextCustomizerFactory` to automatically disable the use of
`ReactorResourceFactory` global resources in tests.

Fixes gh-38199
2024-06-24 11:22:11 -07:00
Andy Wilkinson
adb9747652 Merge branch '3.2.x' into 3.3.x
Closes gh-41214
2024-06-24 11:51:48 +01:00
Andy Wilkinson
b8927ebd90 Create ActiveMQConnectionFactory without using reflection
Fixes gh-41212
2024-06-24 11:51:31 +01:00
Phillip Webb
c8febf4b86 Restore versioned micrometer documentation links
Closes gh-41202
2024-06-21 20:30:04 -07:00
Andy Wilkinson
84eb6f0566 Merge branch '3.2.x' into 3.3.x
Closes gh-41196
2024-06-21 12:22:39 +01:00
Andy Wilkinson
55af8a38f5 Upgrade to GitHub Changelog Generator 0.0.11
Closes gh-41195
2024-06-21 12:22:12 +01:00
Moritz Halbritter
72e9ea986b Merge branch '3.2.x' into 3.3.x
Closes gh-41192
2024-06-21 11:10:39 +02:00
Moritz Halbritter
013a4dd2b7 Document tracing support for RestClient
Closes gh-41182
2024-06-21 11:03:54 +02:00
Andy Wilkinson
b593734edd Merge branch '3.2.x' into 3.3.x
Closes gh-41191
2024-06-21 10:01:22 +01:00
Moritz Halbritter
78f9d6d973 Remove incorrect note about zipkin-sender-urlconnection
Closes gh-41181
2024-06-21 10:41:35 +02:00
Andy Wilkinson
7c6d40f777 Prepare 3.3.x branch 2024-06-20 19:46:14 +01:00
Stéphane Nicoll
e9eeac9028 Use Spring Framework's NoOpResponseErrorHandler
See spring-projects/spring-framework#32750

Closes gh-41183
2024-06-20 18:28:36 +01:00
Moritz Halbritter
908f0912a9 Next development version (v3.3.2-SNAPSHOT) 2024-06-20 13:44:18 +02:00
Moritz Halbritter
3ef5254d93 Merge branch '3.2.x' 2024-06-20 11:22:53 +02:00
Moritz Halbritter
b65aae4530 Next development version (v3.2.8-SNAPSHOT) 2024-06-20 11:22:26 +02:00
Moritz Halbritter
8e405c0224 Merge branch '3.2.x'
Closes gh-41172
2024-06-20 08:48:11 +02:00
Moritz Halbritter
c2f21e9fcd Don't execute @DockerComposeTests if docker is not running
Closes gh-41171
2024-06-20 08:47:56 +02:00
Moritz Halbritter
e7ffeb3dc9 Use Tomcat's new setter for max queue size
Closes gh-41093
Closes gh-40957
Closes gh-40945
2024-06-20 08:39:03 +02:00
Phillip Webb
fb9d779aeb Merge pull request #41162 from mateusscheper
* pr/41162:
  Polish 'Improve readability of documentation'
  Improve readability of documentation
  Improving readability

Closes gh-41162
2024-06-19 22:59:27 -07:00
Phillip Webb
955fe1868b Polish 'Improve readability of documentation'
See gh-41162
2024-06-19 22:59:06 -07:00
Mateus Scheper
cf8ed63dde Improve readability of documentation
See gh-41162
2024-06-19 22:58:02 -07:00
Mateus Scheper
6c34c02acf Improving readability
Improving readability by adding ",".
2024-06-19 22:57:59 -07:00
Phillip Webb
dfa7359977 Don't use versioned micrometer documentation links
Closes gh-40916
2024-06-19 22:56:39 -07:00
Phillip Webb
9dda006a18 Merge branch '3.2.x' 2024-06-19 22:55:00 -07:00
Phillip Webb
2a4582b084 Update copyright year of changed files 2024-06-19 22:54:40 -07:00
Phillip Webb
9ab086d2b4 Merge branch '3.2.x'
Closes gh-41169
2024-06-19 22:53:38 -07:00
Andy Wilkinson
126e87e44d Fix appending of JDBC parameters to SQL Server JDBC URL
Fixes gh-41146
2024-06-19 22:51:40 -07:00
Phillip Webb
f2c778a5a0 Merge branch '3.2.x'
Closes gh-41168
2024-06-19 22:44:12 -07:00
Andy Wilkinson
43cd24102f Rework Docker Compose integration tests
This commit introduces a new annotation, `@DockerComposeTest`,
that allows a test class to have multiple tests, each of which
uses a different Docker Compose YAML file.

Closes gh-41154
2024-06-19 22:34:38 -07: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