abb3ff0377
Combine tests for standard and Bitnami images into single classes
...
Closes gh-41259
2024-06-27 14:34:55 +01:00
373f4d7512
Merge branch '3.3.x'
2024-06-27 14:02:05 +01:00
0f830e91c9
Polish imports in testing doc examples
...
See gh-38361
2024-06-27 14:01:40 +01:00
7e01e78b7f
Merge branch '3.3.x'
2024-06-27 13:58:14 +01:00
7b65176180
Move Redis Bitname compose file into correct directory
...
See gh-41257
2024-06-27 13:57:40 +01:00
13ab5618a6
Merge branch '3.3.x'
2024-06-27 13:08:38 +01:00
0df946ccad
Fix botched merge of spring-boot-maven-plugin's build.gradle
2024-06-27 13:06:44 +01:00
97612d5445
Merge branch '3.2.x'
2024-06-27 12:59:19 +01:00
d01c44a66a
Merge branch '3.2.x' into 3.3.x
2024-06-27 12:58:46 +01:00
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
b28ed2f8fb
Merge branch '3.3.x'
2024-06-27 10:59:18 +01:00
adad8a3515
More LDAP compose file into correct source set
...
See gh-41257
2024-06-27 10:59:03 +01:00
09650c8df5
Merge branch '3.3.x'
2024-06-27 11:45:05 +02:00
b2ddea74ee
Merge branch '3.2.x' into 3.3.x
2024-06-27 11:36:30 +02:00
3e98a932e0
Polish BaggagePropagationIntegrationTests
2024-06-27 11:30:04 +02:00
5b7365b63b
Merge branch '3.3.x'
...
Closes gh-41258
2024-06-27 10:25:32 +01:00
b0d4f1d356
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41257
2024-06-27 10:16:36 +01:00
4515c882c7
Merge branch 'gh-41228' into 3.2.x
...
Closes gh-41228
2024-06-27 09:55:59 +01:00
00ed053ceb
Merge branch '3.3.x'
...
Closes gh-41253
2024-06-26 16:27:56 -07:00
1a699aee24
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41252
2024-06-26 16:27:41 -07:00
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
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
8623c92a29
Change spring-boot-buildpack-platform api deps to implementation
...
Closes gh-40935
2024-06-26 14:12:43 -05:00
267956cf5c
Replace JNI domain sockets implementation with one that uses JDK support
...
Closes gh-41050
2024-06-26 14:09:19 -05:00
654016af7f
Move Docker-related test support into a separate module
...
See gh-41228
2024-06-26 19:47:35 +01:00
843de3adbc
Update spring-boot-test-autoconfigure to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:41 +01:00
ba053dbaac
Update spring-boot-actuator to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:37 +01:00
9f166f2c85
Update spring-boot-autoconfigure to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:33 +01:00
89a06608d2
Update spring-boot-maven-plugin to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:29 +01:00
7d5a761d51
Update spring-boot-gradle-plugin to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:25 +01:00
d5ef5e9c9d
Update spring-boot-buildpack-platform to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:08 +01:00
6fbf08fa9a
Update spring-boot-docker-compose to use docker-test plugin
...
See gh-41228
2024-06-26 19:46:03 +01:00
3f1f801461
Update spring-boot-testcontainers to use docker-test plugin
...
See gh-41228
2024-06-26 19:45:52 +01:00
6d2ebc0713
Use Paketo tiny builder by default for JVM and native apps
...
Closes gh-40859
2024-06-26 13:42:23 -05:00
61ac0e32a1
Merge branch '3.3.x'
...
Closes gh-41250
2024-06-26 17:01:14 +01:00
2dd6c1c3a0
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41249
2024-06-26 17:00:58 +01:00
07442f8366
Exclude plexus-utils in favor of Maven's build-in version
...
Closes gh-41248
2024-06-26 16:59:23 +01:00
6f6eba0bb9
Merge branch '3.3.x'
...
Closes gh-41247
2024-06-26 14:29:36 +01:00
81c8a9706f
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41246
2024-06-26 14:29:14 +01:00
270f364aef
Polish "Make conversion mechanism plural"
...
See gh-41244
2024-06-26 14:26:51 +01:00
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
0bbaa77530
Merge branch '3.3.x'
2024-06-25 22:16:16 -07:00
26ea4f9fb1
Merge branch '3.2.x' into 3.3.x
2024-06-25 22:16:10 -07:00
712d935c8e
Fix checkstyle violation
...
See gh-35786
2024-06-25 22:16:03 -07:00
3c329cacfb
Merge branch '3.3.x'
...
Closes gh-41239
2024-06-25 22:08:50 -07:00
87e0262896
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41238
2024-06-25 22:08:44 -07:00
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
28e6af5652
Merge branch '3.3.x'
...
Closes gh-41237
2024-06-25 17:08:35 -07:00
a3377b0672
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41236
2024-06-25 17:08:29 -07:00
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
f5eb6e95ce
Merge branch '3.3.x'
...
Closes gh-41235
2024-06-25 12:43:15 -07:00
eb9f16e7e6
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41234
2024-06-25 12:42:53 -07:00
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
fdf2f20bc2
Merge branch '3.3.x'
...
Closes gh-41226
2024-06-24 16:05:01 -07:00
6d0c68f9f6
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41225
2024-06-24 16:04:51 -07:00
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
d411d4347f
Merge branch '3.3.x'
...
Closes gh-41222
2024-06-24 12:24:40 -07:00
726f71a1a8
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41221
2024-06-24 12:24:27 -07:00
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
37879d86be
Test that TestBean can override a ConfigurationProperties bean
...
Closes gh-33969
2024-06-24 18:48:23 +01:00
0ad5aa7400
Enable customization of properties used to create JCache CacheManager
...
Closes gh-39350
2024-06-24 15:07:31 +01:00
5920b27b57
Upgrade to Flyway 10.15.0
...
Closes gh-41217
2024-06-24 14:39:23 +01:00
6bdba8e69e
Revert "Enable customization of properties used to create JCache CacheManager"
...
This reverts commit 622c9ed882
2024-06-24 12:03:23 +01:00
94336ab314
Merge branch '3.3.x'
...
Closes gh-41215
2024-06-24 11:52:03 +01:00
adb9747652
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41214
2024-06-24 11:51:48 +01:00
b8927ebd90
Create ActiveMQConnectionFactory without using reflection
...
Fixes gh-41212
2024-06-24 11:51:31 +01:00
622c9ed882
Enable customization of properties used to create JCache CacheManager
2024-06-24 09:32:56 +01:00
ca6ba2e7cf
Merge branch '3.3.x'
...
Closes gh-41206
2024-06-21 20:30:50 -07:00
c8febf4b86
Restore versioned micrometer documentation links
...
Closes gh-41202
2024-06-21 20:30:04 -07:00
28a887ad0f
Raise minimum supported version of Gradle
...
Closes gh-41180
2024-06-21 14:52:22 +01:00
63c6b1ee72
Remove fail-fast logic for versions less than minimum supported
...
CLoses gh-41200
2024-06-21 14:52:15 +01:00
7701201bc3
Align cascading of config prop validation with bean validation spec
...
Closes gh-40345
2024-06-21 12:27:22 +01:00
6aeab4461e
Polish "Auto-configure SpringLiquibase with Liquibase Customizer"
...
See gh-40986
2024-06-21 12:57:25 +02:00
32f509c0c4
Auto-configure SpringLiquibase with Liquibase Customizer
...
See gh-40986
2024-06-21 11:51:24 +02:00
a55cebd9a3
Upgrade to Liquibase 4.28.0
...
Closes gh-41194
2024-06-21 11:44:23 +02:00
0859150136
Merge branch '3.3.x'
...
Closes gh-41193
2024-06-21 11:10:52 +02:00
72e9ea986b
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41192
2024-06-21 11:10:39 +02:00
013a4dd2b7
Document tracing support for RestClient
...
Closes gh-41182
2024-06-21 11:03:54 +02:00
b593734edd
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41191
2024-06-21 10:01:22 +01:00
760a85a137
Merge branch '3.3.x'
...
Closes gh-41190
2024-06-21 10:41:45 +02:00
78f9d6d973
Remove incorrect note about zipkin-sender-urlconnection
...
Closes gh-41181
2024-06-21 10:41:35 +02:00
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
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
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
fe4c34d226
Adapt test to include MappingJackson2CborHttpMessageConverter
...
See spring-projects/spring-framework#32428
See gh-41177
2024-06-20 20:18:08 +01:00
74a2144a37
Adapt to Task and ScheduledTask changes in Framework
...
Spring Framework wraps `Task` and `ScheduledTask` runnables to collect
and share metadata about task execution and scheduling.
The `ScheduledTasksEndpoint` descriptors were relying on the fact that
tasks would never be wrapped. Spring Framework already wrapped runnables
in various cases, for methods returning `Callable` or reactive types.
This commit makes use of the `toString()` method to describe the
runnable. Runnable implementations can override this method for
displaying purposes on the actuator endpoint.
See spring-projects/spring-framework#24560
See gh-41177
2024-06-20 20:18:08 +01:00
305bfb1641
Adapt to Mockito support in the Test Context Framework
...
This commit updates MockitoTestExecutionListener to not handle mocks
as this is already done in the listener provided by the core framework,
and registration can only happen once.
Integration tests have been left as-is to validate that the presence
of both listeners doesn't have an unwanted side effect.
See gh-41177
2024-06-20 20:18:07 +01:00
2053e13c09
Adapt to new Placeholder resolution API
...
See gh-41177
2024-06-20 20:18:07 +01:00
9016695746
Prohibit Jakarta EE 11 spec upgrades
...
Closes gh-41176
2024-06-20 20:17:56 +01:00
23597cc744
Start work on Spring Boot 3.4
2024-06-20 19:50:32 +01:00
6110e0ff43
Merge branch '3.2.x'
...
Closes gh-41184
2024-06-20 19:30:12 +01:00
e9eeac9028
Use Spring Framework's NoOpResponseErrorHandler
...
See spring-projects/spring-framework#32750
Closes gh-41183
2024-06-20 18:28:36 +01:00
8e405c0224
Merge branch '3.2.x'
...
Closes gh-41172
2024-06-20 08:48:11 +02:00
c2f21e9fcd
Don't execute @DockerComposeTests if docker is not running
...
Closes gh-41171
2024-06-20 08:47:56 +02:00
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
955fe1868b
Polish 'Improve readability of documentation'
...
See gh-41162
2024-06-19 22:59:06 -07:00
cf8ed63dde
Improve readability of documentation
...
See gh-41162
2024-06-19 22:58:02 -07:00
6c34c02acf
Improving readability
...
Improving readability by adding ",".
2024-06-19 22:57:59 -07:00
dfa7359977
Don't use versioned micrometer documentation links
...
Closes gh-40916
2024-06-19 22:56:39 -07:00
9dda006a18
Merge branch '3.2.x'
2024-06-19 22:55:00 -07:00
2a4582b084
Update copyright year of changed files
2024-06-19 22:54:40 -07:00
9ab086d2b4
Merge branch '3.2.x'
...
Closes gh-41169
2024-06-19 22:53:38 -07:00
126e87e44d
Fix appending of JDBC parameters to SQL Server JDBC URL
...
Fixes gh-41146
2024-06-19 22:51:40 -07:00
f2c778a5a0
Merge branch '3.2.x'
...
Closes gh-41168
2024-06-19 22:44:12 -07:00
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
905d6b96d0
Merge branch '3.2.x'
...
Closes gh-41166
2024-06-19 22:30:58 -07:00
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
e530eeec00
Upgrade to Spring Session 3.3.1
...
Closes gh-41041
2024-06-19 20:42:44 +01:00
4edf5da94d
Upgrade to Spring Integration 6.3.1
...
Closes gh-41036
2024-06-19 20:42:43 +01:00
33575b7079
Upgrade to Spring GraphQL 1.3.1
...
Closes gh-41035
2024-06-19 20:42:42 +01:00
cd922daab9
Upgrade to Spring Authorization Server 1.3.1
...
Closes gh-41032
2024-06-19 20:42:40 +01:00
3496aa6cfa
Upgrade to Maven Jar Plugin 3.4.2
...
Closes gh-41160
2024-06-19 20:42:39 +01:00
821a17df9d
Upgrade to Infinispan 15.0.5.Final
...
Closes gh-41159
2024-06-19 20:42:35 +01:00
abf49e55db
Upgrade to Spring Session 3.2.4
...
Closes gh-41026
2024-06-19 20:34:02 +01:00
02cb160057
Upgrade to Spring Integration 6.2.6
...
Closes gh-41021
2024-06-19 20:34:01 +01:00
fd4dc4d719
Upgrade to Spring GraphQL 1.2.7
...
Closes gh-41020
2024-06-19 20:34:00 +01:00
b606a6e4ca
Upgrade to Spring Authorization Server 1.2.5
...
Closes gh-41017
2024-06-19 20:33:59 +01:00
705aad4b31
Merge branch '3.2.x'
...
Closes gh-41152
2024-06-18 17:01:22 -07:00
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
159e7745b6
Improving readability by adding a comma
...
See gh-41140
2024-06-18 10:32:20 -07:00
7c318be829
Fix links to Spring AMQP's javadoc
...
Closes gh-41144
2024-06-18 09:24:52 +01:00
d595487f72
Upgrade to Spring Pulsar 1.1.1
...
Closes gh-41039
2024-06-18 09:12:54 +01:00
42256a7aea
Upgrade to Spring Kafka 3.2.1
...
Closes gh-41037
2024-06-18 09:12:53 +01:00
0ce997d225
Upgrade to Spring AMQP 3.1.6
...
Closes gh-41145
2024-06-18 09:12:52 +01:00
82fd923d00
Upgrade to Spring Security 6.2.5
...
Closes gh-41025
2024-06-18 09:09:44 +01:00
97b8c78411
Upgrade to Spring Pulsar 1.0.7
...
Closes gh-41024
2024-06-18 09:09:43 +01:00
e2296be9a7
Upgrade to Spring Kafka 3.1.6
...
Closes gh-41022
2024-06-18 09:09:42 +01:00
2689b4dac0
Upgrade to Spring AMQP 3.1.6
...
Closes gh-41143
2024-06-18 09:09:41 +01:00
8a9feb0bb6
Merge branch '3.2.x'
...
Closes gh-41141
2024-06-17 16:51:53 -07:00
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
7800ddbe75
Upgrade to Spring Security 6.3.1
...
Closes gh-41040
2024-06-17 17:31:17 +01:00
66ff668b4d
Upgrade to Spring LDAP 3.2.4
...
Closes gh-41038
2024-06-17 14:16:29 +01:00
e3eb37c542
Upgrade to Spring Data Bom 2024.0.1
...
Closes gh-41033
2024-06-17 14:16:28 +01:00
4ec8692acf
Upgrade to Pulsar Reactive 0.5.6
...
Closes gh-41134
2024-06-17 14:16:28 +01:00
80cda40c88
Upgrade to jOOQ 3.19.10
...
Closes gh-41133
2024-06-17 14:16:23 +01:00
79d0219c92
Upgrade to Jaybird 5.0.5.java11
...
Closes gh-41132
2024-06-17 14:16:18 +01:00
307c225db6
Merge branch '3.2.x'
...
Closes gh-41131
2024-06-17 14:13:53 +01:00
1f698d8ea2
Prohibit .java8 Jaybird versions
...
Closes gh-41130
2024-06-17 14:13:12 +01:00
beafbe5125
Upgrade to Spring LDAP 3.2.4
...
Closes gh-41023
2024-06-17 14:06:46 +01:00
10dcdccbe1
Upgrade to Spring Data Bom 2023.1.7
...
Closes gh-41018
2024-06-17 14:06:45 +01:00
7de738041e
Upgrade to Pulsar Reactive 0.5.6
...
Closes gh-41129
2024-06-17 14:06:45 +01:00
3c99f2e5be
Upgrade to jOOQ 3.18.17
...
Closes gh-41128
2024-06-17 14:06:40 +01:00
242afe1dcf
Upgrade to Jaybird 5.0.5.java11
...
Closes gh-41127
2024-06-17 14:06:35 +01:00
e10066a83f
Merge branch '3.2.x'
...
Closes gh-41125
2024-06-17 11:43:29 +01:00
138307c13c
Disable test context cache in spring-boot-testcontainers
...
Closes gh-41124
2024-06-17 11:43:00 +01:00
9f1ee67225
Merge branch '3.2.x'
...
Closes gh-41123
2024-06-17 10:48:01 +01:00
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
292fdc4b7e
Cross-link to the CDS how-to guide
...
See gh-41118
2024-06-17 10:35:03 +01:00
df087fad9e
Merge branch '3.2.x'
...
Closes gh-41108
2024-06-14 11:03:13 -07:00
96586525d5
Make DelegatingFilterProxyRegistrationBeanTests idempotent
...
Fixes gh-38630
2024-06-14 11:03:09 -07:00
Andy Wilkinson
Moritz Halbritter
Phillip Webb
Scott Frederick
Mateus Scheper
Andy Wilkinson
Ahmed Ashour
Stéphane Nicoll
Brian Clozel
Sébastien Deleuze