Andy Wilkinson
0df946ccad
Fix botched merge of spring-boot-maven-plugin's build.gradle
2024-06-27 13:06:44 +01:00
Andy Wilkinson
d01c44a66a
Merge branch '3.2.x' into 3.3.x
2024-06-27 12:58:46 +01:00
Andy Wilkinson
d2f74426f7
Work around bug in Gradle's Eclipse model
...
The model incorrectly marks the Gradle API and all of its
dependencies as test dependencies, making them unavailable in Eclipse
to code in src/main/java. We work around this by modifying the
classpath container to remove the test attribute from the
dependencies that should be available to main code.
See gh-41228
2024-06-27 12:58:36 +01:00
Andy Wilkinson
adad8a3515
More LDAP compose file into correct source set
...
See gh-41257
2024-06-27 10:59:03 +01:00
Moritz Halbritter
b2ddea74ee
Merge branch '3.2.x' into 3.3.x
2024-06-27 11:36:30 +02:00
Moritz Halbritter
3e98a932e0
Polish BaggagePropagationIntegrationTests
2024-06-27 11:30:04 +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
4515c882c7
Merge branch 'gh-41228' into 3.2.x
...
Closes gh-41228
2024-06-27 09:55:59 +01:00
Phillip Webb
1a699aee24
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41252
2024-06-26 16:27:41 -07:00
Phillip Webb
962936370a
Don't report already migrated properties
...
Update `PropertiesMigrationReporter` so that already migrated properties
are not reported. Prior to this commit, if a deprecated property was
replaced by a property that could bind with the name relaxed name it
would be reported. For example: `test.someproperty` being replaced with
`test.some-property`.
In order to check the actual underlying property name, the
`PropertySourceOrigin` class has been updated so that it is always
returned, even if another `Origin` is available.
Fixes gh-35774
2024-06-26 16:24:32 -07: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
Andy Wilkinson
ba053dbaac
Update spring-boot-actuator to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:37 +01:00
Andy Wilkinson
9f166f2c85
Update spring-boot-autoconfigure to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:33 +01:00
Andy Wilkinson
89a06608d2
Update spring-boot-maven-plugin to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:29 +01:00
Andy Wilkinson
7d5a761d51
Update spring-boot-gradle-plugin to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:25 +01:00
Andy Wilkinson
d5ef5e9c9d
Update spring-boot-buildpack-platform to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:08 +01:00
Andy Wilkinson
6fbf08fa9a
Update spring-boot-docker-compose to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:03 +01:00
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
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
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
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
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
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
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
