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
c5dfcc54de
Merge pull request #41244 from mateusscheper
...
* gh-41244:
Polish "Make conversion mechanism plural"
Make conversion mechanism plural
Closes gh-41244
2024-06-26 14:27:16 +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
0bbaa77530
Merge branch '3.3.x'
2024-06-25 22:16:16 -07: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
3c329cacfb
Merge branch '3.3.x'
...
Closes gh-41239
2024-06-25 22:08:50 -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
28e6af5652
Merge branch '3.3.x'
...
Closes gh-41237
2024-06-25 17:08:35 -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
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