Commit Graph

25409 Commits

Author SHA1 Message Date
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
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
Andy Wilkinson e530eeec00 Upgrade to Spring Session 3.3.1
Closes gh-41041
2024-06-19 20:42:44 +01:00
Andy Wilkinson 4edf5da94d Upgrade to Spring Integration 6.3.1
Closes gh-41036
2024-06-19 20:42:43 +01:00
Andy Wilkinson 33575b7079 Upgrade to Spring GraphQL 1.3.1
Closes gh-41035
2024-06-19 20:42:42 +01:00
Andy Wilkinson cd922daab9 Upgrade to Spring Authorization Server 1.3.1
Closes gh-41032
2024-06-19 20:42:40 +01:00
Andy Wilkinson 3496aa6cfa Upgrade to Maven Jar Plugin 3.4.2
Closes gh-41160
2024-06-19 20:42:39 +01:00
Andy Wilkinson 821a17df9d Upgrade to Infinispan 15.0.5.Final
Closes gh-41159
2024-06-19 20:42:35 +01: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 705aad4b31 Merge branch '3.2.x'
Closes gh-41152
2024-06-18 17:01:22 -07: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
Mateus Scheper 159e7745b6 Improving readability by adding a comma
See gh-41140
2024-06-18 10:32:20 -07:00
Andy Wilkinson 7c318be829 Fix links to Spring AMQP's javadoc
Closes gh-41144
2024-06-18 09:24:52 +01:00
Andy Wilkinson d595487f72 Upgrade to Spring Pulsar 1.1.1
Closes gh-41039
2024-06-18 09:12:54 +01:00
Andy Wilkinson 42256a7aea Upgrade to Spring Kafka 3.2.1
Closes gh-41037
2024-06-18 09:12:53 +01:00
Andy Wilkinson 0ce997d225 Upgrade to Spring AMQP 3.1.6
Closes gh-41145
2024-06-18 09:12:52 +01: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 8a9feb0bb6 Merge branch '3.2.x'
Closes gh-41141
2024-06-17 16:51:53 -07: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 7800ddbe75 Upgrade to Spring Security 6.3.1
Closes gh-41040
2024-06-17 17:31:17 +01:00
Andy Wilkinson 66ff668b4d Upgrade to Spring LDAP 3.2.4
Closes gh-41038
2024-06-17 14:16:29 +01:00
Andy Wilkinson e3eb37c542 Upgrade to Spring Data Bom 2024.0.1
Closes gh-41033
2024-06-17 14:16:28 +01:00
Andy Wilkinson 4ec8692acf Upgrade to Pulsar Reactive 0.5.6
Closes gh-41134
2024-06-17 14:16:28 +01:00
Andy Wilkinson 80cda40c88 Upgrade to jOOQ 3.19.10
Closes gh-41133
2024-06-17 14:16:23 +01:00
Andy Wilkinson 79d0219c92 Upgrade to Jaybird 5.0.5.java11
Closes gh-41132
2024-06-17 14:16:18 +01:00
Andy Wilkinson 307c225db6 Merge branch '3.2.x'
Closes gh-41131
2024-06-17 14:13:53 +01: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
Andy Wilkinson 242afe1dcf Upgrade to Jaybird 5.0.5.java11
Closes gh-41127
2024-06-17 14:06:35 +01:00
Andy Wilkinson e10066a83f Merge branch '3.2.x'
Closes gh-41125
2024-06-17 11:43:29 +01:00
Andy Wilkinson 138307c13c Disable test context cache in spring-boot-testcontainers
Closes gh-41124
2024-06-17 11:43:00 +01:00
Andy Wilkinson 9f1ee67225 Merge branch '3.2.x'
Closes gh-41123
2024-06-17 10:48:01 +01:00
Andy Wilkinson 03a87ccd69 Clarify how Container's Docker image name is used to name a connection
Closes gh-41111
2024-06-17 10:45:03 +01:00
Sébastien Deleuze 292fdc4b7e Cross-link to the CDS how-to guide
See gh-41118
2024-06-17 10:35:03 +01:00
Phillip Webb df087fad9e Merge branch '3.2.x'
Closes gh-41108
2024-06-14 11:03:13 -07:00
Phillip Webb 96586525d5 Make DelegatingFilterProxyRegistrationBeanTests idempotent
Fixes gh-38630
2024-06-14 11:03:09 -07:00
Phillip Webb bfa541a552 Merge branch '3.2.x'
Closes gh-41107
2024-06-14 10:41:21 -07:00
Phillip Webb 0c1c7e844c Don't detect main method from launcher classes
Update `MainMethod` discovery so that launcher classes from the
`org.springframework.boot.loader` code are not considered. This restores
the behavior of Spring Boot 2.7.11 and allows remote restart of uber
jars without pulling the loader classes into the `RestartClassLoader`.

Fixes gh-39733
2024-06-14 10:40:49 -07:00
Andy Wilkinson 3188d084ea Merge branch '3.2.x'
Closes gh-41104
2024-06-14 17:06:07 +01:00
Andy Wilkinson 31f967723d Fix Mongo health indicators when using the strict V1 API
Closes gh-41101
2024-06-14 17:05:09 +01:00
Moritz Halbritter e1aef9db6f Rename parameter
See gh-40904
2024-06-14 08:32:38 +02:00
Scott Frederick 7d96789869 Fix Bitnami MongoDB environment variables for Docker Compose
Fixes gh-41097
2024-06-13 15:20:36 -05:00