Commit Graph

3617 Commits

Author SHA1 Message Date
Andy Wilkinson 23b89c8cb3 Merge branch '3.3.x' into 3.4.x
Closes gh-44445
2025-02-26 15:31:04 +00:00
Andy Wilkinson 3acea583ad Add support for working with resources in tests
Closes gh-44444
2025-02-26 15:29:20 +00:00
Moritz Halbritter 3be5e6cc3e Polish "Improve logging in DockerApi"
See gh-44412
2025-02-25 13:14:38 +01:00
Dmytro Nosan 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
Stéphane Nicoll 48e3de0cd1 Merge branch '3.4.x'
Closes gh-44410
2025-02-22 19:05:14 +01:00
Stéphane Nicoll de32c6ff79 Merge branch '3.3.x' into 3.4.x
Closes gh-44409
2025-02-22 19:05:07 +01:00
Tran Ngoc Nhan 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
Phillip Webb 360927186e Merge branch '3.4.x'
Closes gh-44365
2025-02-19 12:21:13 -08:00
Phillip Webb 792c13eaf0 Merge branch '3.3.x' into 3.4.x
Closes gh-44364
2025-02-19 12:21:04 -08:00
Dmytro Nosan e919fd806f Polish ClassPath
See gh-44355

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-19 12:20:10 -08:00
Moritz Halbritter ae16856bda Revert "Use noble buildpacks instead of jammy"
This reverts commit 4f672b9588.

See gh-42711
2025-02-19 16:00:27 +01:00
Moritz Halbritter 4f672b9588 Use noble buildpacks instead of jammy
Closes gh-42711
2025-02-19 13:59:21 +01:00
Phillip Webb 8c132711e4 Merge branch '3.4.x' 2025-02-18 17:44:28 -08:00
Phillip Webb 8c6e856340 Fix formatting 2025-02-18 17:44:24 -08:00
Phillip Webb 6076e9e2c1 Merge branch '3.4.x' 2025-02-18 17:29:38 -08:00
Phillip Webb 661fcfe033 Merge branch '3.3.x' into 3.4.x 2025-02-18 17:29:31 -08:00
Phillip Webb 082c5859e8 Polish 2025-02-18 17:22:53 -08:00
Phillip Webb 651a39b3f6 Merge branch '3.4.x' 2025-02-18 15:12:07 -08:00
Phillip Webb eeced8c629 Merge branch '3.3.x' into 3.4.x 2025-02-18 15:11:51 -08:00
Phillip Webb 8aea6d575a Update copyright year of changed files 2025-02-18 15:11:35 -08:00
Phillip Webb a3eccf63a1 Merge branch '3.4.x'
Closes gh-44346
2025-02-18 12:11:54 -08:00
Phillip Webb e4077cb2e9 Merge branch '3.3.x' into 3.4.x
Closes gh-44345
2025-02-18 12:11:48 -08:00
Dmytro Nosan 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
Phillip Webb 39aac00151 Merge branch '3.4.x'
Closes gh-44344
2025-02-18 12:10:01 -08:00
Phillip Webb bac9217b14 Merge branch '3.3.x' into 3.4.x
Closes gh-44343
2025-02-18 12:09:48 -08:00
Dmytro Nosan 616d4cb149 Polish ClasspathBuilder
See gh-44330

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-18 12:08:49 -08:00
Stéphane Nicoll 2997bb8836 Merge branch '3.4.x' 2025-02-18 17:00:35 +01:00
Stéphane Nicoll 1a4af5626c Merge branch '3.3.x' into 3.4.x 2025-02-18 17:00:28 +01:00
Stéphane Nicoll 29e498b6bc Only run Windows-related tests on Windows
See gh-44305
2025-02-18 16:59:32 +01:00
Stéphane Nicoll cb346d5860 Merge branch '3.4.x'
Closes gh-44329
2025-02-18 16:31:25 +01:00
Stéphane Nicoll 332958a8de Merge branch '3.3.x' into 3.4.x
Closes gh-44328
2025-02-18 16:31:12 +01:00
Stéphane Nicoll cd8c12da0b Polish "Use ArgFile for classpath argument on Windows"
See gh-44305
2025-02-18 16:25:57 +01:00
Dmytro Nosan 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
Andy Wilkinson 1d35deaaf0 Merge branch '3.4.x'
Closes gh-44262
2025-02-13 14:49:15 +00:00
Andy Wilkinson e12ae999b1 Merge branch '3.3.x' into 3.4.x
Closes gh-44261
2025-02-13 14:49:02 +00:00
Andy Wilkinson 2e00552130 Move MockPkcs11Security to spring-boot-testsupport
Closes gh-44260
2025-02-13 14:48:16 +00:00
Andy Wilkinson 0be4062116 Merge branch '3.4.x'
Closes gh-44213
2025-02-11 11:35:12 +00:00
Andy Wilkinson 30d7af4e38 Add CI with Java 24
Closes gh-44205
2025-02-11 11:34:43 +00:00
Stéphane Nicoll d9fc813fb5 Upgrade to Native Build Tools Plugin 0.10.5
Closes gh-44183
2025-02-08 16:04:17 +01:00
Stéphane Nicoll ff6168cde7 Upgrade to Native Build Tools Plugin 0.10.5
Closes gh-44179
2025-02-08 15:47:58 +01:00
Dmytro Nosan 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
Moritz Halbritter 1e73a7cf8b Merge branch '3.4.x' 2025-02-06 15:51:12 +01:00
Moritz Halbritter 4fbbc3eda1 Clean up duplicate JsonView entry 2025-02-06 15:40:05 +01:00
Moritz Halbritter 0eb69445f2 Merge branch '3.4.x' 2025-02-06 14:27:17 +01:00
Moritz Halbritter 8552bc0d78 Merge branch '3.3.x' into 3.4.x 2025-02-06 14:27:06 +01:00
Moritz Halbritter 461e30f668 Add JsonView to PluginClasspathGradleBuild 2025-02-06 14:26:51 +01:00
Stéphane Nicoll b46698774d Upgrade to Native Build Tools Plugin 0.10.5
Closes gh-44141
2025-02-05 14:57:50 +01:00
Andy Wilkinson deb865b3d3 Merge branch '3.4.x'
Closes gh-44131
2025-02-05 08:48:53 +00:00
Andy Wilkinson e6678b6d16 Merge branch '3.3.x' into 3.4.x
Closes gh-44130
2025-02-05 08:48:38 +00:00
Andy Wilkinson 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
Phillip Webb a39556b8b8 Merge branch '3.4.x'
Closes gh-44056
2025-02-03 19:44:48 -08:00
Phillip Webb 0ec15c8f9b Merge branch '3.3.x' into 3.4.x
Closes gh-44055
2025-02-03 19:44:33 -08:00
Phillip Webb 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
Johnny Lim 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
Johnny Lim a39e1c4a09 Polish
Signed-off-by: Johnny Lim <izeye@naver.com>

See gh-44034
2025-01-31 17:04:58 +01:00
Moritz Halbritter 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
Phillip Webb 8ec61b9870 Polish 'Refactor `@ConfigurationProperties` that only use `prefix`'
See gh-43917
2025-01-24 14:59:32 -08:00
Yanming Zhou 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
Andy Wilkinson 1e43b0003f Merge branch '3.4.x'
Closes gh-43951
2025-01-24 08:54:50 +00:00
Andy Wilkinson 239a6e8901 Merge branch '3.4.x'
Closes gh-43870
2025-01-17 16:23:56 +00:00
Andy Wilkinson 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
Andy Wilkinson 2f29a49a1d Remove APIs deprecated for removal in 3.5
Closes gh-43788
2025-01-14 13:59:24 +00:00
Phillip Webb 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
Phillip Webb 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
Phillip Webb af2d176588 Merge branch '3.4.x' 2025-01-08 15:45:59 -08:00
Phillip Webb d44f4b56d3 Merge branch '3.3.x' into 3.4.x 2025-01-08 15:45:54 -08:00
Andy Wilkinson a2d038f2f5 Merge branch '3.4.x'
Closes gh-43731
2025-01-08 10:07:47 +00:00
Andy Wilkinson ca3fbb26a2 Mention system libraries as a reason not to use tiny builder
Closes gh-43716
2025-01-08 10:07:05 +00:00
Andy Wilkinson f802911f2d Merge branch '3.4.x'
Closes gh-43726
2025-01-08 09:09:55 +00:00
Andy Wilkinson f3c70a7af4 Consistently document the minimum supported versions of Gradle
Closes gh-43725
2025-01-08 09:09:36 +00:00
Phillip Webb 32393425d6 Merge branch '3.4.x'
Closes gh-43707
2025-01-06 21:32:25 -08:00
Dmytro Nosan 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
Andy Wilkinson 214e0281a9 Start work on Spring Boot 3.5 2025-01-06 15:29:25 +00:00
Andy Wilkinson 51d15c7c78 Merge branch '3.3.x'
Closes gh-43649 in 3.4.x
Closes gh-43651
2025-01-02 12:22:59 +00:00
Andy Wilkinson d8a9ebd14b Upgrade to Gradle 8.12
Closes gh-43649
2025-01-02 12:05:14 +00:00
Andy Wilkinson 734040abe2 Update Gradle test scripts to avoid warnings with 8.12
Closes gh-43496
2025-01-02 12:05:14 +00:00
Stéphane Nicoll 9f8a6bba63 Merge branch '3.3.x'
Closes gh-43626
2024-12-29 10:30:30 +01:00
Johnny Lim b8abfb8c9b Remove MavenBuildOutputTimestampTests.shouldParseIso8601WithSeconds()
See gh-43625
2024-12-29 10:30:09 +01:00
Stéphane Nicoll a2cd1f0040 Merge branch '3.3.x' 2024-12-28 10:27:12 +01:00
Stéphane Nicoll 8fbd14b4dd Polish 2024-12-28 10:27:01 +01:00
Stéphane Nicoll 3e39b0256d Merge branch '3.3.x'
Closes gh-43617
2024-12-26 16:08:26 +01:00
Stéphane Nicoll 7e9fda8216 Polish "Preserve milliseconds in build info timestamp"
See gh-43612
2024-12-26 15:58:09 +01:00
Gaurav 0944b07c90 Preserve milliseconds in build info timestamp
See gh-43612
2024-12-26 15:52:08 +01:00
Chris Bono 02f748bd2d Update version of Pulsar test container image
This commit updates the version of the Pulsar container from 3.2.4 to
3.3.3 (the recommended version in the Spring Boot 3.4.x line).

See gh-43534
2024-12-16 16:09:55 -08:00
Phillip Webb 54b96c86ce Merge branch '3.3.x'
Closes gh-43526
2024-12-16 10:44:33 -08:00
Phillip Webb 239fa0356f Remove trailing slashes from all link URLs
Closes gh-43518
2024-12-16 10:44:20 -08:00
Stéphane Nicoll cc877987a4 Merge branch '3.3.x'
Closes gh-43519
2024-12-16 10:42:55 +01:00
Tran Ngoc Nhan 7832d3be73 Fix typo
See gh-43512
2024-12-16 10:42:22 +01:00
Phillip Webb 4d6fc85c8e Merge branch '3.3.x' 2024-12-13 19:03:48 -08:00
Phillip Webb 45da43c6b4 Update copyright year of changed files 2024-12-13 19:03:43 -08:00
Johnny Lim 4d15ee5bf0 Polish
See gh-43498
2024-12-13 13:29:20 -08:00
Phillip Webb 123502b8d7 Restore use of fixed version when calling docker APIs
Update `DockerApi` so that calls are made using a fixed version. For
most calls this will be `v1.24`, however, for calls with a platform
we must use the `v1.41`.

When possible, we check that the Docker version in use meets the
required minimum, however, if we can't detect the running version
we now proceed and let the actual API call fail. This is due to the
fact that the `/_ping` endpoint may not always be available. For
example, it is restricted when building from a BitBucket CI pipeline.

Fixes gh-43452
2024-12-10 13:14:20 -08:00
Phillip Webb e394cadc48 Merge branch '3.3.x'
Closes gh-43436
2024-12-06 19:01:30 -08:00
Phillip Webb f21402d4c3 Consistently return non-zero exit codes for jarmode failures
Update jar mode launchers to catch all exceptions and return a non-zero
exit code. This refinement also allows us to consolidate the existing
error reporting logic to a central locations. Modes that wish to report
a simple error rather than a full stacktrace can throw the newly
introduced `JarModeErrorException`.

Fixes gh-43435
2024-12-06 19:00:50 -08:00
Moritz Halbritter 4dca6ee5d3 Polish "Only set imagePlatform if it has text"
See gh-43424
2024-12-05 11:03:14 +01:00
Leonid Bogdanov fe1f9b3002 Only set imagePlatform if it has text
See gh-43424
2024-12-05 10:59:17 +01:00
Phillip Webb 916efb632c Merge branch '3.3.x' 2024-12-04 15:04:22 -08:00
Phillip Webb 9e7972a9b4 Polish code with code cleanup rules 2024-12-04 15:03:40 -08:00
Phillip Webb dd64b0648f Merge branch '3.3.x'
Closes gh-43356
2024-12-02 13:59:53 -08:00
Phillip Webb 0afbc0b23c Polish 'Accept Docker progress on numbers >2GB'
Restore `int` returns for existing methods and deprecate them in
favor of a new `asPercentage()` method.

See gh-43328
2024-12-02 13:58:03 -08:00