Commit Graph

25481 Commits

Author SHA1 Message Date
Andy Wilkinson
2ed72c6e4d Correct syntax for plexus-utils exclusion
See 07442f8366
See gh-41248
2024-06-28 11:39:46 +01:00
Moritz Halbritter
9bd6ec59b7 Merge branch '3.3.x'
Closes gh-41267
2024-06-28 12:21:35 +02:00
Johnny Lim
5a387a85a9 Polish gh-40023
See gh-41208
2024-06-28 12:17:24 +02:00
Moritz Halbritter
b292fd0e58 Merge branch '3.3.x' 2024-06-28 12:12:38 +02:00
Moritz Halbritter
448089f935 Merge branch '3.2.x' into 3.3.x 2024-06-28 12:10:24 +02:00
Moritz Halbritter
2605f86731 Polish BaggagePropagationIntegrationTests 2024-06-28 10:27:46 +02:00
Moritz Halbritter
70a5dc64f6 Add missing default value for management.otlp.logging.compression
See gh-40961
2024-06-28 08:48:07 +02:00
Moritz Halbritter
cfa05716ef Polish "Provide auto configuration for OpenTelemetry Logs"
See gh-40961
2024-06-28 08:37:43 +02:00
Toshiaki Maki
2d6f2488b7 Provide auto configuration for OpenTelemetry Logs
See gh-40961
2024-06-27 18:16:53 +02:00
Andy Wilkinson
1dfb4c9719 Polish "Add a customizer for Lettuce's ClientOptions"
See gh-40484
2024-06-27 16:37:44 +01:00
임수현
c517664f08 Add a customizer for Lettuce's ClientOptions
See gh-40484
2024-06-27 16:29:36 +01:00
Andy Wilkinson
7e04ac2967 Polish "Make it easier to override RequestToViewNameTranslator bean"
See gh-40874
2024-06-27 15:29:37 +01:00
rohit patidar
062ed4ba2b Make it easier to override RequestToViewNameTranslator bean
See gh-40874
2024-06-27 15:17:49 +01:00
Andy Wilkinson
6749ad674f Polish "Add support for org.testcontainers.kafka.KafkaContainer"
See gh-40695
2024-06-27 15:10:58 +01:00
Eddú Meléndez
769f3e9d14 Add support for org.testcontainers.kafka.KafkaContainer
Testcontainers 1.19.8 provides `org.testcontainers.kafka.KafkaContainer`,
which relies on `apache/kafka` image.

See gh-40695
2024-06-27 14:58:57 +01:00
Andy Wilkinson
2ce36f9141 Merge branch '3.3.x'
Closes gh-41261
2024-06-27 14:35:23 +01:00
Andy Wilkinson
abb3ff0377 Combine tests for standard and Bitnami images into single classes
Closes gh-41259
2024-06-27 14:34:55 +01:00
Andy Wilkinson
373f4d7512 Merge branch '3.3.x' 2024-06-27 14:02:05 +01:00
Andy Wilkinson
0f830e91c9 Polish imports in testing doc examples
See gh-38361
2024-06-27 14:01:40 +01:00
Andy Wilkinson
7e01e78b7f Merge branch '3.3.x' 2024-06-27 13:58:14 +01:00
Andy Wilkinson
7b65176180 Move Redis Bitname compose file into correct directory
See gh-41257
2024-06-27 13:57:40 +01:00
Andy Wilkinson
13ab5618a6 Merge branch '3.3.x' 2024-06-27 13:08:38 +01:00
Andy Wilkinson
0df946ccad Fix botched merge of spring-boot-maven-plugin's build.gradle 2024-06-27 13:06:44 +01:00
Andy Wilkinson
97612d5445 Merge branch '3.2.x' 2024-06-27 12:59:19 +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
b28ed2f8fb Merge branch '3.3.x' 2024-06-27 10:59:18 +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
09650c8df5 Merge branch '3.3.x' 2024-06-27 11:45:05 +02: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
5b7365b63b Merge branch '3.3.x'
Closes gh-41258
2024-06-27 10:25:32 +01: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
00ed053ceb Merge branch '3.3.x'
Closes gh-41253
2024-06-26 16:27:56 -07: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
Scott Frederick
9da2d1e089 Revert "Use Paketo tiny builder by default for JVM and native apps"
This reverts commit 6d2ebc0713.
2024-06-26 15:25:37 -05:00
Scott Frederick
8623c92a29 Change spring-boot-buildpack-platform api deps to implementation
Closes gh-40935
2024-06-26 14:12:43 -05:00
Scott Frederick
267956cf5c Replace JNI domain sockets implementation with one that uses JDK support
Closes gh-41050
2024-06-26 14:09:19 -05: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
Scott Frederick
6d2ebc0713 Use Paketo tiny builder by default for JVM and native apps
Closes gh-40859
2024-06-26 13:42:23 -05:00
Andy Wilkinson
61ac0e32a1 Merge branch '3.3.x'
Closes gh-41250
2024-06-26 17:01:14 +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
6f6eba0bb9 Merge branch '3.3.x'
Closes gh-41247
2024-06-26 14:29:36 +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
0bbaa77530 Merge branch '3.3.x' 2024-06-25 22:16:16 -07: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
3c329cacfb Merge branch '3.3.x'
Closes gh-41239
2024-06-25 22:08:50 -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
28e6af5652 Merge branch '3.3.x'
Closes gh-41237
2024-06-25 17:08:35 -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
f5eb6e95ce Merge branch '3.3.x'
Closes gh-41235
2024-06-25 12:43:15 -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
fdf2f20bc2 Merge branch '3.3.x'
Closes gh-41226
2024-06-24 16:05:01 -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
d411d4347f Merge branch '3.3.x'
Closes gh-41222
2024-06-24 12:24:40 -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
37879d86be Test that TestBean can override a ConfigurationProperties bean
Closes gh-33969
2024-06-24 18:48:23 +01:00
Andy Wilkinson
0ad5aa7400 Enable customization of properties used to create JCache CacheManager
Closes gh-39350
2024-06-24 15:07:31 +01:00
Andy Wilkinson
5920b27b57 Upgrade to Flyway 10.15.0
Closes gh-41217
2024-06-24 14:39:23 +01:00
Andy Wilkinson
6bdba8e69e Revert "Enable customization of properties used to create JCache CacheManager"
This reverts commit 622c9ed882 that was
pushed accidentally.
2024-06-24 12:03:23 +01:00
Andy Wilkinson
94336ab314 Merge branch '3.3.x'
Closes gh-41215
2024-06-24 11:52:03 +01: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
Andy Wilkinson
622c9ed882 Enable customization of properties used to create JCache CacheManager 2024-06-24 09:32:56 +01:00
Phillip Webb
ca6ba2e7cf Merge branch '3.3.x'
Closes gh-41206
2024-06-21 20:30:50 -07:00
Phillip Webb
c8febf4b86 Restore versioned micrometer documentation links
Closes gh-41202
2024-06-21 20:30:04 -07:00
Andy Wilkinson
28a887ad0f Raise minimum supported version of Gradle
Closes gh-41180
2024-06-21 14:52:22 +01:00
Andy Wilkinson
63c6b1ee72 Remove fail-fast logic for versions less than minimum supported
CLoses gh-41200
2024-06-21 14:52:15 +01:00
Andy Wilkinson
7701201bc3 Align cascading of config prop validation with bean validation spec
Closes gh-40345
2024-06-21 12:27:22 +01:00
Moritz Halbritter
6aeab4461e Polish "Auto-configure SpringLiquibase with Liquibase Customizer"
See gh-40986
2024-06-21 12:57:25 +02:00
Ahmed Ashour
32f509c0c4 Auto-configure SpringLiquibase with Liquibase Customizer
See gh-40986
2024-06-21 11:51:24 +02:00
Moritz Halbritter
a55cebd9a3 Upgrade to Liquibase 4.28.0
Closes gh-41194
2024-06-21 11:44:23 +02:00
Moritz Halbritter
0859150136 Merge branch '3.3.x'
Closes gh-41193
2024-06-21 11:10:52 +02: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
760a85a137 Merge branch '3.3.x'
Closes gh-41190
2024-06-21 10:41:45 +02:00
Moritz Halbritter
78f9d6d973 Remove incorrect note about zipkin-sender-urlconnection
Closes gh-41181
2024-06-21 10:41:35 +02:00
Moritz Halbritter
f900d0ba4e Add properties to enable/disable tracing per exporter
There are now three new properties, which control the trace exporting on
a more fine-grained level:

- management.otlp.tracing.export.enabled
- management.wavefront.tracing.export.enabled
- management.zipkin.tracing.export.enabled

They default to null, and if set, take precedence over the global
management.metrics.enabled property.

Closes gh-34620
2024-06-21 09:05:04 +02:00
Moritz Halbritter
6c0c9b9a80 Add properties to specify arguments to Docker Compose commands
These new properties take a List<String>:

- spring.docker.compose.start.arguments
- spring.docker.compose.stop.arguments

Closes gh-38763
2024-06-21 08:54:14 +02:00
Stéphane Nicoll
17ca0421e7 Upgrade to HtmlUnit 4.2.0 and Selenium HtmlUnit 4.20
Closes gh-41178
Closes gh-41179
2024-06-20 20:18:23 +01:00