Commit Graph

24515 Commits

Author SHA1 Message Date
Andy Wilkinson
d71fdd9712 Make buildSrc's custom Gradle tasks consistently abstract
Closes gh-41272
2024-06-28 15:40:56 +01:00
Sébastien Deleuze
a6f1bb9590 Update Kotlin DSL examples of bootBuildImage to be additive
See gh-41173
2024-06-28 13:47:42 +02:00
Andy Wilkinson
365fdfee45 Reduce scope of mavenOptional feature to only the Maven Plugin
Previously, the mavenOptional was added to every published module but it
was only used by spring-boot-maven-plugin. This commit reduces its scope
so that it only affects the Maven plugin. It also reworks the
implementation to reuse the existing optional configuration rather than
declaring a new mavenOptional configuration. Lastly, publication of
Gradle Module Metadata (GMM) has been disabled for
spring-boot-maven-plugin. This is seen as preferable to publishing the
metadata – which isn't really needed as it does not contain any useful
additional information – and having to suppress warnings about
incomplete mapping of GMM to pom metadata.

Closes gh-41263
2024-06-28 11:39:46 +01:00
Andy Wilkinson
2ed72c6e4d Correct syntax for plexus-utils exclusion
See 07442f8366
See gh-41248
2024-06-28 11:39:46 +01:00
Moritz Halbritter
2605f86731 Polish BaggagePropagationIntegrationTests 2024-06-28 10:27:46 +02: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
Moritz Halbritter
3e98a932e0 Polish BaggagePropagationIntegrationTests 2024-06-27 11:30:04 +02: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
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
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
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
712d935c8e Fix checkstyle violation
See gh-35786
2024-06-25 22:16:03 -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
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
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
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
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
b8927ebd90 Create ActiveMQConnectionFactory without using reflection
Fixes gh-41212
2024-06-24 11:51:31 +01:00
Moritz Halbritter
013a4dd2b7 Document tracing support for RestClient
Closes gh-41182
2024-06-21 11:03:54 +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
c2f21e9fcd Don't execute @DockerComposeTests if docker is not running
Closes gh-41171
2024-06-20 08:47:56 +02:00
Phillip Webb
2a4582b084 Update copyright year of changed files 2024-06-19 22:54:40 -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
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
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
Andy Wilkinson
abf49e55db Upgrade to Spring Session 3.2.4
Closes gh-41026
2024-06-19 20:34:02 +01:00
Andy Wilkinson
02cb160057 Upgrade to Spring Integration 6.2.6
Closes gh-41021
2024-06-19 20:34:01 +01:00
Andy Wilkinson
fd4dc4d719 Upgrade to Spring GraphQL 1.2.7
Closes gh-41020
2024-06-19 20:34:00 +01:00
Andy Wilkinson
b606a6e4ca Upgrade to Spring Authorization Server 1.2.5
Closes gh-41017
2024-06-19 20:33:59 +01:00
Phillip Webb
242263d8d4 Update GitProperties date/time coercion to deal with more patterns
Update `GitProperties` to deal with updated date/time patterns that
are now used by the `git-commit-id` maven plugin. Previous patterns are
still supported as a fallback.

Fixes gh-41109
2024-06-18 17:01:03 -07:00
Andy Wilkinson
82fd923d00 Upgrade to Spring Security 6.2.5
Closes gh-41025
2024-06-18 09:09:44 +01:00
Andy Wilkinson
97b8c78411 Upgrade to Spring Pulsar 1.0.7
Closes gh-41024
2024-06-18 09:09:43 +01:00
Andy Wilkinson
e2296be9a7 Upgrade to Spring Kafka 3.1.6
Closes gh-41022
2024-06-18 09:09:42 +01:00
Andy Wilkinson
2689b4dac0 Upgrade to Spring AMQP 3.1.6
Closes gh-41143
2024-06-18 09:09:41 +01:00
Phillip Webb
60b7e6cf23 Allow 'status' and 'error' to be excluded from error response
Update `ErrorAttributeOptions` to allow the `status` and `error`
fields to be excluded from the response without throwing a
NullPointerException.

Fixes gh-30011
2024-06-17 16:48:28 -07:00
Andy Wilkinson
1f698d8ea2 Prohibit .java8 Jaybird versions
Closes gh-41130
2024-06-17 14:13:12 +01:00
Andy Wilkinson
beafbe5125 Upgrade to Spring LDAP 3.2.4
Closes gh-41023
2024-06-17 14:06:46 +01:00
Andy Wilkinson
10dcdccbe1 Upgrade to Spring Data Bom 2023.1.7
Closes gh-41018
2024-06-17 14:06:45 +01:00
Andy Wilkinson
7de738041e Upgrade to Pulsar Reactive 0.5.6
Closes gh-41129
2024-06-17 14:06:45 +01:00
Andy Wilkinson
3c99f2e5be Upgrade to jOOQ 3.18.17
Closes gh-41128
2024-06-17 14:06:40 +01:00