Commit Graph

49297 Commits

Author SHA1 Message Date
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
fda6f19c5b Update spring-boot-smoke-test-session-webflux-redis to use docker-test plugin
See gh-41228
2024-06-26 19:47:32 +01:00
Andy Wilkinson
5e332b8785 Update spring-boot-smoke-test-session-webflux-mongo to use docker-test plugin
See gh-41228
2024-06-26 19:47:28 +01:00
Andy Wilkinson
2890067e3a Update spring-boot-smoke-test-session-redis to use docker-test plugin
See gh-41228
2024-06-26 19:47:25 +01:00
Andy Wilkinson
b3f3501e2b Update spring-boot-smoke-test-session-mongo to use docker-test plugin
See gh-41228
2024-06-26 19:47:22 +01:00
Andy Wilkinson
da28e03670 Update spring-boot-smoke-test-pulsar to use docker-test plugin
See gh-41228
2024-06-26 19:47:19 +01:00
Andy Wilkinson
bc57d30a1f Update spring-boot-smoke-test-kafka to use docker-test plugin
See gh-41228
2024-06-26 19:47:15 +01:00
Andy Wilkinson
957e73044b Update spring-boot-smoke-test-data-redis to use docker-test plugin
See gh-41228
2024-06-26 19:47:12 +01:00
Andy Wilkinson
9662bec9c7 Update spring-boot-smoke-test-data-r2dbc-liquibase to use docker-test plugin
See gh-41228
2024-06-26 19:47:08 +01:00
Andy Wilkinson
b52023966b Update spring-boot-smoke-test-data-r2dbc-flyway to use docker-test plugin
See gh-41228
2024-06-26 19:47:04 +01:00
Andy Wilkinson
0d2d3e7d71 Update spring-boot-smoke-test-data-mongo to use docker-test plugin
See gh-41228
2024-06-26 19:47:01 +01:00
Andy Wilkinson
28396b1ff3 Update spring-boot-smoke-test-data-couchbase to use docker-test plugin
See gh-41228
2024-06-26 19:46:58 +01:00
Andy Wilkinson
a9be2e50e3 Update spring-boot-smoke-test-data-cassandra to use docker-test plugin
See gh-41228
2024-06-26 19:46:54 +01:00
Andy Wilkinson
ccb0b2910f Update spring-boot-smoke-test-cache to use docker-test plugin
See gh-41228
2024-06-26 19:46:51 +01:00
Andy Wilkinson
24e797f8c2 Update spring-boot-smoke-test-amqp to use docker-test plugin
See gh-41228
2024-06-26 19:46:47 +01:00
Andy Wilkinson
0579126c5f Update spring-boot-smoke-test-activemq to use docker-test plugin
See gh-41228
2024-06-26 19:46:44 +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
7e4d60e07f Update spring-boot-launch-script-tests to use docker-test plugin
See gh-41228
2024-06-26 19:46:21 +01:00
Andy Wilkinson
6564abb12a Update spring-boot-loader-classic-tests to use docker-test plugin
See gh-41228
2024-06-26 19:46:17 +01:00
Andy Wilkinson
edc582800b Update spring-boot-loader-tests to use docker-test plugin
See gh-41228
2024-06-26 19:46:12 +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
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