Commit Graph

25442 Commits

Author SHA1 Message Date
Andy Wilkinson
08851b61bc Start building against Spring Data Bom 2024.0.2 snapshots
See gh-41300
2024-07-03 11:24:15 +01:00
Andy Wilkinson
d2aa85e802 Start building against Micrometer Tracing 1.3.2 snapshots
See gh-41299
2024-07-03 11:24:10 +01:00
Andy Wilkinson
7b5e323c63 Start building against Micrometer 1.13.2 snapshots
See gh-41298
2024-07-03 11:24:05 +01:00
Andy Wilkinson
c1e5d2e0c4 Start building against Spring Kafka 3.1.7 snapshots
See gh-41297
2024-07-03 10:45:28 +01:00
Andy Wilkinson
7d40df9c89 Start building against Spring Integration 6.2.7 snapshots
See gh-41296
2024-07-03 10:45:24 +01:00
Andy Wilkinson
9b1475cb40 Start building against Spring Data Bom 2023.1.8 snapshots
See gh-41294
2024-07-03 10:45:15 +01:00
Andy Wilkinson
a1a3cecf52 Start building against Micrometer Tracing 1.2.8 snapshots
See gh-41293
2024-07-03 10:45:11 +01:00
Andy Wilkinson
da7be08373 Start building against Micrometer 1.12.8 snapshots
See gh-41292
2024-07-03 10:45:06 +01:00
Scott Frederick
70e14d648d Polish documentation headings
Title case should be used in all headings.
2024-07-01 11:23:41 -05:00
Scott Frederick
03a7f48ac0 Polish documentation for xref hyperlink formatting consistency
This commit improves the consistency of xref link formatting (no
quotes, italics, or other decoration) and uses automatic link
text generation wherever possible.
2024-06-28 17:20:53 -05:00
Scott Frederick
24a8bbd82f Polish use of the term starter in documentation
Use of the term "starter" was sometimes quoted but sometimes was not,
sometimes used proper case and sometimes lowercase. This commit
improves consistency by removing quotes and using lowercase.
2024-06-28 17:19:30 -05:00
Andy Wilkinson
55ac058385 Merge branch '3.2.x' into 3.3.x
Closes gh-41273
2024-06-28 15:47:54 +01:00
Andy Wilkinson
d71fdd9712 Make buildSrc's custom Gradle tasks consistently abstract
Closes gh-41272
2024-06-28 15:40:56 +01:00
Moritz Halbritter
9984dc16a9 Merge branch '3.2.x' into 3.3.x
Closes gh-41270
2024-06-28 13:50:33 +02: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
ac8a3b6332 Merge branch '3.2.x' into 3.3.x
Closes gh-41268
2024-06-28 12:12:15 +01:00
Andy Wilkinson
7f2e8f85ae Merge branch '3.2.x' into 3.3.x 2024-06-28 11:40:48 +01: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
Johnny Lim
5a387a85a9 Polish gh-40023
See gh-41208
2024-06-28 12:17:24 +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
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
0f830e91c9 Polish imports in testing doc examples
See gh-38361
2024-06-27 14:01:40 +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
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
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