6f464e71da
Merge branch '3.4.x'
2025-03-07 08:21:32 +01:00
282571ae1e
Merge branch '3.3.x' into 3.4.x
2025-03-07 08:21:13 +01:00
5ec099756f
Fix potential NPE when passing 'null' as params
2025-03-07 08:17:37 +01:00
dde9bfbeaa
Merge branch '3.4.x'
...
Closes gh-44631
2025-03-06 17:41:08 +01:00
2e74ce8bf2
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44630
2025-03-06 17:39:26 +01:00
a807a07a59
Always try to deserialize message in case of Docker transport errors
...
Before this commit, if the status code was 4xx or 500, we tried to read the errors
object, consuming the http entity. When we tried to deserialize the message,
the http entity was already consumed, an IOException has been thrown and null
is returned for the message.
Now, we read the content in a byte[] and deserialize the errors and the message
from that. This ensures that we can read both the errors and the message.
Closes gh-44628
2025-03-06 17:27:00 +01:00
162be9670d
Merge branch '3.4.x'
2025-03-05 15:43:14 +00:00
1eef4385ec
Merge branch '3.3.x' into 3.4.x
2025-03-05 15:43:00 +00:00
1f5b9de302
Normalize the separator in resource names
...
See gh-44444
2025-03-05 15:42:41 +00:00
b89cca355e
Merge branch '3.4.x'
2025-03-05 14:34:29 +00:00
bfd4e7b4ee
Merge branch '3.3.x' into 3.4.x
2025-03-05 14:34:11 +00:00
5683d39fd6
Allow resources to hide existing resources with the same name
...
See gh-44444
2025-03-05 14:33:57 +00:00
0852243fc6
Merge branch '3.4.x'
...
Closes gh-44537
2025-03-05 11:56:32 +01:00
d453a59724
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44536
2025-03-05 11:56:21 +01:00
701f73fcd7
Fix JavaExec javadoc link
...
See gh-44526
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-03-05 11:55:29 +01:00
5fac1011d6
Add ServiceConnection support for lldap/lldap (Compose)
...
See gh-44389
Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>
2025-02-28 13:54:55 +01:00
98e60b5607
Merge branch '3.4.x'
...
Closes gh-44479
2025-02-28 10:36:57 +01:00
d2d8978170
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44478
2025-02-28 10:36:39 +01:00
7276be825a
Update version of Neo4j test container image
...
See gh-44463
Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
2025-02-28 10:35:55 +01:00
b9bf4a557e
Merge branch '3.4.x'
...
Closes gh-44476
2025-02-28 10:32:48 +01:00
da361efd3f
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44475
2025-02-28 10:32:20 +01:00
c98f9ac126
Update version of Elasticsearch test container image
...
See gh-44459
Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
2025-02-28 10:31:07 +01:00
a5ff2a94f0
Merge branch '3.4.x'
...
Closes gh-44446
2025-02-26 15:31:17 +00:00
23b89c8cb3
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44445
2025-02-26 15:31:04 +00:00
3acea583ad
Add support for working with resources in tests
...
Closes gh-44444
2025-02-26 15:29:20 +00:00
3be5e6cc3e
Polish "Improve logging in DockerApi"
...
See gh-44412
2025-02-25 13:14:38 +01:00
9a940702bc
Improve logging in DockerApi
...
This commit introduces a new constructor in `DockerApi`
that accepts `DockerLogger` as a parameter.
The `DockerLogger` is a pretty simple callback interface used to
provide DockerApi output logging.
See gh-44412
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-25 13:07:23 +01:00
48e3de0cd1
Merge branch '3.4.x'
...
Closes gh-44410
2025-02-22 19:05:14 +01:00
de32c6ff79
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44409
2025-02-22 19:05:07 +01:00
d781ce164d
Use Javadoc attributes for Gradle reference guide
...
See gh-44388
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-02-22 19:02:33 +01:00
360927186e
Merge branch '3.4.x'
...
Closes gh-44365
2025-02-19 12:21:13 -08:00
792c13eaf0
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44364
2025-02-19 12:21:04 -08:00
e919fd806f
Polish ClassPath
...
See gh-44355
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-19 12:20:10 -08:00
ae16856bda
Revert "Use noble buildpacks instead of jammy"
...
This reverts commit 4f672b9588
2025-02-19 16:00:27 +01:00
4f672b9588
Use noble buildpacks instead of jammy
...
Closes gh-42711
2025-02-19 13:59:21 +01:00
8c132711e4
Merge branch '3.4.x'
2025-02-18 17:44:28 -08:00
8c6e856340
Fix formatting
2025-02-18 17:44:24 -08:00
6076e9e2c1
Merge branch '3.4.x'
2025-02-18 17:29:38 -08:00
661fcfe033
Merge branch '3.3.x' into 3.4.x
2025-02-18 17:29:31 -08:00
082c5859e8
Polish
2025-02-18 17:22:53 -08:00
651a39b3f6
Merge branch '3.4.x'
2025-02-18 15:12:07 -08:00
eeced8c629
Merge branch '3.3.x' into 3.4.x
2025-02-18 15:11:51 -08:00
8aea6d575a
Update copyright year of changed files
2025-02-18 15:11:35 -08:00
a3eccf63a1
Merge branch '3.4.x'
...
Closes gh-44346
2025-02-18 12:11:54 -08:00
e4077cb2e9
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44345
2025-02-18 12:11:48 -08:00
0e81b6386e
Don't use ArgFile when using JavaCompiler
...
See gh-44340
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-18 12:10:41 -08:00
39aac00151
Merge branch '3.4.x'
...
Closes gh-44344
2025-02-18 12:10:01 -08:00
bac9217b14
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44343
2025-02-18 12:09:48 -08:00
616d4cb149
Polish ClasspathBuilder
...
See gh-44330
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-18 12:08:49 -08:00
2997bb8836
Merge branch '3.4.x'
2025-02-18 17:00:35 +01:00
1a4af5626c
Merge branch '3.3.x' into 3.4.x
2025-02-18 17:00:28 +01:00
29e498b6bc
Only run Windows-related tests on Windows
...
See gh-44305
2025-02-18 16:59:32 +01:00
cb346d5860
Merge branch '3.4.x'
...
Closes gh-44329
2025-02-18 16:31:25 +01:00
332958a8de
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44328
2025-02-18 16:31:12 +01:00
cd8c12da0b
Polish "Use ArgFile for classpath argument on Windows"
...
See gh-44305
2025-02-18 16:25:57 +01:00
a6b80831f0
Use ArgFile for classpath argument on Windows
...
This commit uses @argfile syntax for classpath argument on Windows OS
to avoid creating a command-line that is too long.
See gh-44305
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-18 16:25:57 +01:00
1d35deaaf0
Merge branch '3.4.x'
...
Closes gh-44262
2025-02-13 14:49:15 +00:00
e12ae999b1
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44261
2025-02-13 14:49:02 +00:00
2e00552130
Move MockPkcs11Security to spring-boot-testsupport
...
Closes gh-44260
2025-02-13 14:48:16 +00:00
0be4062116
Merge branch '3.4.x'
...
Closes gh-44213
2025-02-11 11:35:12 +00:00
30d7af4e38
Add CI with Java 24
...
Closes gh-44205
2025-02-11 11:34:43 +00:00
d9fc813fb5
Upgrade to Native Build Tools Plugin 0.10.5
...
Closes gh-44183
2025-02-08 16:04:17 +01:00
ff6168cde7
Upgrade to Native Build Tools Plugin 0.10.5
...
Closes gh-44179
2025-02-08 15:47:58 +01:00
ed5100ecee
Upgrade to Elasticsearch Client 8.17.0
...
See gh-44100
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-08 10:04:00 +00:00
1e73a7cf8b
Merge branch '3.4.x'
2025-02-06 15:51:12 +01:00
4fbbc3eda1
Clean up duplicate JsonView entry
2025-02-06 15:40:05 +01:00
0eb69445f2
Merge branch '3.4.x'
2025-02-06 14:27:17 +01:00
8552bc0d78
Merge branch '3.3.x' into 3.4.x
2025-02-06 14:27:06 +01:00
461e30f668
Add JsonView to PluginClasspathGradleBuild
2025-02-06 14:26:51 +01:00
b46698774d
Upgrade to Native Build Tools Plugin 0.10.5
...
Closes gh-44141
2025-02-05 14:57:50 +01:00
deb865b3d3
Merge branch '3.4.x'
...
Closes gh-44131
2025-02-05 08:48:53 +00:00
e6678b6d16
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44130
2025-02-05 08:48:38 +00:00
4b8d5f22de
Remove Java 8-specific build configuration that will never apply
...
With our Java 17 baseline, the build configuration that is only
applicable when building with Java 8 will never be used. This commit
removes it.
Closes gh-44129
2025-02-05 08:47:29 +00:00
a39556b8b8
Merge branch '3.4.x'
...
Closes gh-44056
2025-02-03 19:44:48 -08:00
0ec15c8f9b
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44055
2025-02-03 19:44:33 -08:00
80e8ab8779
Support commercial repositories in effective BOM and Ivy
...
Update `BomExtension` to resolve '{spring.mavenRepositories}' and add
credentials to `ivysettings.xml` and `settings.xml`.
Closes gh-44050
2025-02-03 18:22:53 -08:00
c9320de559
Use consistent exception messages in Assert calls
...
See gh-44044
Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-03 13:58:59 +01:00
a39e1c4a09
Polish
...
Signed-off-by: Johnny Lim <izeye@naver.com>
See gh-44034
2025-01-31 17:04:58 +01:00
f24ba9935c
Add ability to ignore configuration properties
...
Properties which should be ignored can be specified in the
additional-spring-configuration-metadata.json file. The ignored
properties section is copied into the final
spring-configuration-metadata.json file, and the ignored properties are
removed from the properties element in the final file.
Closes gh-2421
2025-01-28 11:09:26 +01:00
8ec61b9870
Polish 'Refactor `@ConfigurationProperties` that only use `prefix`'
...
See gh-43917
2025-01-24 14:59:32 -08:00
c1d97ffe16
Refactor `@ConfigurationProperties` that only use `prefix`
...
See gh-43917
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-24 14:58:36 -08:00
1e43b0003f
Merge branch '3.4.x'
...
Closes gh-43951
2025-01-24 08:54:50 +00:00
239a6e8901
Merge branch '3.4.x'
...
Closes gh-43870
2025-01-17 16:23:56 +00:00
86818b0e45
Ensure that junit-platform-launcher is on classpath
...
When testing with Gradle 7.6, junit-platform-launcher won't be
on the test runtime classpath unless it's declared as a dependency.
When testing with Gradle 8.x the dependency is added implicitly but
starting with Gradle 8.3 relying on this will result in a warning.
When junit-platform-launcher is absent, a failure occurs when testing
with Gradle as the class loader structure is such that JUnit tries
to load any test execution listeners, finds the listener declared in
spring-boot-actuator-autoconfigure but cannot then load the
implemented TestExecutionListener interface.
This problem is addressed by augmenting the component metadata for
spring-boot-starter-test to add a dependency on
junit-platform-launcher. This addresses the problem with
spring-boot-actuator-autoconfigure while also addressing a warning
with Gradle 8.3+.
Closes gh-43340
2025-01-17 16:01:41 +00:00
2f29a49a1d
Remove APIs deprecated for removal in 3.5
...
Closes gh-43788
2025-01-14 13:59:24 +00:00
a49719d73e
Use consistent exception messages in Assert calls
...
Update `Assert` calls to consistently use messages of the form
"'item' must [not] ...".
Closes gh-43780
2025-01-11 21:18:47 -08:00
f08188d5cf
Change relevant Assert calls to throw IllegalStateException
...
Change certain Assert class from `assert...` to `assertState`
so that a more appropriate `IllegalStateException` is thrown.
Fixes gh-43779
2025-01-11 21:16:36 -08:00
af2d176588
Merge branch '3.4.x'
2025-01-08 15:45:59 -08:00
d44f4b56d3
Merge branch '3.3.x' into 3.4.x
2025-01-08 15:45:54 -08:00
a2d038f2f5
Merge branch '3.4.x'
...
Closes gh-43731
2025-01-08 10:07:47 +00:00
ca3fbb26a2
Mention system libraries as a reason not to use tiny builder
...
Closes gh-43716
2025-01-08 10:07:05 +00:00
f802911f2d
Merge branch '3.4.x'
...
Closes gh-43726
2025-01-08 09:09:55 +00:00
f3c70a7af4
Consistently document the minimum supported versions of Gradle
...
Closes gh-43725
2025-01-08 09:09:36 +00:00
32393425d6
Merge branch '3.4.x'
...
Closes gh-43707
2025-01-06 21:32:25 -08:00
b6b9237f2c
Reset StatusLogger fallback listener stream on initialization
...
Update `Log4J2LoggingSystem` so that the `StatusLogger` fallback
listener has its print stream reset on each initialization. This
allows output capture to work with the status listener.
Fixes gh-43578
Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2025-01-06 17:58:21 -08:00
214e0281a9
Start work on Spring Boot 3.5
2025-01-06 15:29:25 +00:00
51d15c7c78
Merge branch '3.3.x'
...
Closes gh-43649 in 3.4.x
Closes gh-43651
2025-01-02 12:22:59 +00:00
d8a9ebd14b
Upgrade to Gradle 8.12
...
Closes gh-43649
2025-01-02 12:05:14 +00:00
734040abe2
Update Gradle test scripts to avoid warnings with 8.12
...
Closes gh-43496
2025-01-02 12:05:14 +00:00
9f8a6bba63
Merge branch '3.3.x'
...
Closes gh-43626
2024-12-29 10:30:30 +01:00
Moritz Halbritter
Andy Wilkinson
Tran Ngoc Nhan
Eddú Meléndez
Dmitry Sulman
Dmytro Nosan
Stéphane Nicoll
Phillip Webb
Johnny Lim
Yanming Zhou