Commit Graph

49284 Commits

Author SHA1 Message Date
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 e722200876 Update the build name now that we're working on 3.4 2024-06-21 16:38:34 +01: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
Andy Wilkinson d9e9a46189 Merge branch '3.3.x'
Closes gh-41197
2024-06-21 12:22:57 +01:00
Andy Wilkinson 84eb6f0566 Merge branch '3.2.x' into 3.3.x
Closes gh-41196
2024-06-21 12:22:39 +01:00
Andy Wilkinson 55af8a38f5 Upgrade to GitHub Changelog Generator 0.0.11
Closes gh-41195
2024-06-21 12:22:12 +01:00
Moritz Halbritter 6def699c3d Merge pull request #40986 from asashour
* pr/40986:
  Polish "Auto-configure SpringLiquibase with Liquibase Customizer"
  Auto-configure SpringLiquibase with Liquibase Customizer

Closes gh-40986
2024-06-21 12:58:31 +02: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 e3d7c23dfb Fix forward merge script 2024-06-21 11:26:20 +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 57333c99f0 Merge branch '3.3.x' 2024-06-21 10:02:13 +01: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
Andy Wilkinson 6d9977087a Merge branch 'framework-6.2'
Closes gh-41177
2024-06-20 20:18:13 +01:00
Stéphane Nicoll fe4c34d226 Adapt test to include MappingJackson2CborHttpMessageConverter
See spring-projects/spring-framework#32428

See gh-41177
2024-06-20 20:18:08 +01:00
Brian Clozel 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
Stéphane Nicoll 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
Stéphane Nicoll 2053e13c09 Adapt to new Placeholder resolution API
See gh-41177
2024-06-20 20:18:07 +01:00
Andy Wilkinson 762434c85f Upgrade to Spring Framework 6.2.0-M4
See gh-41177
2024-06-20 20:18:07 +01:00
Andy Wilkinson 9016695746 Prohibit Jakarta EE 11 spec upgrades
Closes gh-41176
2024-06-20 20:17:56 +01:00
Andy Wilkinson e97bd37798 Merge branch '3.3.x' 2024-06-20 19:50:46 +01:00
Andy Wilkinson 23597cc744 Start work on Spring Boot 3.4 2024-06-20 19:50:32 +01:00