89 Commits
Author SHA1 Message Date
Phillip Webb c01e1b34b6 Merge branch '4.1.x'
Closes gh-51748
2026-09-14 20:27:24 -07:00
Phillip Webb 9fff25f9ff Merge branch '4.0.x' into 4.1.x
Closes gh-51747
2026-09-14 20:27:17 -07:00
Phillip Webb 036caad4e2 Fix reference to restart property
Correct incorrect `spring.devtools.remote.restart.enabled` property
reference to `spring.devtools.restart.enabled`.

Closes gh-51743
2026-09-14 20:25:05 -07:00
Andy Wilkinson 59379ae449 Merge branch '4.1.x'
Closes gh-51652
2026-09-09 15:32:53 +01:00
Andy Wilkinson 5b3631bfe9 Merge branch '4.0.x' into 4.1.x
Closes gh-51651
2026-09-09 15:31:57 +01:00
COBI-98 bfd05e38b5 Add SBOM manifest attributes to repackaged Maven wars
Packager#isCycloneDxBom only recognized CycloneDX SBOMs beneath
META-INF/sbom/. In a war, the CycloneDX Maven plugin's output is
packaged beneath WEB-INF/classes/META-INF/sbom/, so repackaging did
not add the SBOM manifest attributes.

Also check beneath Layout#getClassesLocation(), which findMainMethod
already uses to locate application classes. Continue to support the
root location used by jars.

Signed-off-by: COBI-98 <tkdgus968@naver.com>

See gh-51551
2026-09-09 14:44:33 +01:00
Andy Wilkinson 677efea937 Merge branch '4.1.x'
Closes gh-51646
2026-09-09 10:37:59 +01:00
Andy Wilkinson d601081bd5 Merge branch '4.0.x' into 4.1.x
Closes gh-51645
2026-09-09 10:37:08 +01:00
Tran Ngoc Nhan fd7a52b954 Remove redundant whitespace
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>

See gh-51644
2026-09-09 10:00:23 +01:00
Stéphane Nicoll 03d367bb07 Merge branch '4.1.x'
Closes gh-51629
2026-09-08 17:29:34 +02:00
Stéphane Nicoll 18292d400c Merge branch '4.0.x' into 4.1.x
Closes gh-51628
2026-09-08 16:57:00 +02:00
Stéphane Nicoll b1e91c942e Add support for creating a container from a TestImage value
This commit improves TestImage so that an explicit image can trigger
the creation of the container, with optional additional setup. This
removes the need of creating additional container types for images that
have multiple flavors, and to please the static method that can only
create a container based on a single match.

Closes gh-51082
2026-09-08 16:46:48 +02:00
Andy Wilkinson 57b44b0594 Merge branch '4.1.x'
Closes gh-51600
2026-09-07 08:27:14 +01:00
Andy Wilkinson ea613dc511 Merge branch '4.0.x' into 4.1.x
Closes gh-51599
2026-09-07 08:26:42 +01:00
Manu Sridharan 25a3f8feb9 Remove unnecessary NullAway suppressions
Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-51591
2026-09-07 08:18:11 +01:00
Stéphane Nicoll bb23ef72b6 Add testClasspath option to run and start goals
Deprecate the `useTestClasspath` flag in favor of a `testClasspath`
parameter on the `run` and `start` goals. It accepts `off`,
`dependencies`, or `all`, with `all` also adding the project's test
classes directory to the classpath so that a main class located in
`src/test/java` can be found and run, matching the `test-run` goal's
existing behaviour.

Closes gh-36115
2026-08-07 16:40:21 +02:00
Stéphane Nicoll 5b2dbdbb8b Merge branch '4.1.x' 2026-08-04 16:37:53 +02:00
Stéphane Nicoll 7b2cf7f27b Merge branch '4.0.x' into 4.1.x 2026-08-04 16:37:45 +02:00
Stéphane Nicoll e61ef57f30 Restore additional repositories for integrtion tests as well
As it turns out, intTest are also affected.

See gh-51266
2026-08-04 16:30:58 +02:00
Stéphane Nicoll 258a1f28a0 Merge branch '4.1.x'
Closes gh-51268
2026-08-04 15:55:14 +02:00
Stéphane Nicoll d70bcd5389 Merge branch '4.0.x' into 4.1.x
Closes gh-51267
2026-08-04 15:52:30 +02:00
Stéphane Nicoll 4c8de39294 Restore additional repositories for docker tests
This commit reverts partially what was done in gh-49397 to let docker
tests have access to additional maven repositories. Unfortunately, maven
build executions with the Spring Boot Maven Plugin do not use the BOM
for dependency management. As such, if one of the dependency requires
a dependency that has not been prepared in the local repository, it will
need to be able to download it from the relevant repository.

This is the case with spring-core that the maven plugin depends on when
Spring Framework and Spring Boot do not use the same Micrometer version:
the build prepares the version that Spring Boot uses, but the build
execution attempts to download the one that Spring Framework relies on.

Closes gh-51266
2026-08-04 15:41:43 +02:00
Andy Wilkinson 3407166818 Merge branch '4.1.x'
Closes gh-51165
2026-07-30 12:38:43 +01:00
Andy Wilkinson 811f3a225b Merge branch '4.0.x' into 4.1.x
Closes gh-51164
2026-07-30 12:38:23 +01:00
Andy Wilkinson 6c19b31fb7 Update the build for release train participation
Closes gh-51163
2026-07-30 12:37:42 +01:00
Stéphane Nicoll 5bd3e6435c Polish "Add support for image-based build caches"
See gh-50899
2026-07-27 18:22:16 +02:00
Tim Ysewyn a36d078632 Add support for image-based build caches
Added a new image cache option that uses the lifecycle's
`-cache-image` argument for the creator, analyzer, restorer and
exporter phases, so the build cache can be stored in an image and
shared between hosts via an image registry.

Exposed the option in the Maven (`<buildCache><image>`) and Gradle
(`buildCache { image { } }`) plugins.

Reject image caches configured for the launch cache, which the
lifecycle does not support.

See gh-50899

Signed-off-by: Tim Ysewyn <Tim.Ysewyn@me.com>
2026-07-27 18:20:48 +02:00
Stéphane Nicoll 2351527ab4 Merge branch '4.1.x'
Closes gh-51105
2026-07-23 12:25:33 +02:00
Stéphane Nicoll d107f342f0 Merge branch '4.0.x' into 4.1.x
Closes gh-51104
2026-07-23 12:25:25 +02:00
Manu Sridharan b6f117c9cd Adapt function types in ClassPath to avoid nullability warning
See gh-51091

Signed-off-by: Manu Sridharan <msridhar@gmail.com>
2026-07-23 12:19:57 +02:00
Stéphane Nicoll 6d28fc10f9 Start development of Spring Boot 4.2.x 2026-07-15 10:30:43 +02:00
Andy Wilkinson 7a45ee8767 Merge branch '4.0.x'
Closes gh-50851
2026-06-24 19:12:35 +01:00
Yanming Zhou 9d5c98b7e9 Replace isAssignableFrom() with isInstance() where feasible
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

See gh-50750
2026-06-24 19:11:59 +01:00
Doehyun Baek f7c2c0b2a6 Align documentation with changes made during 4.1's development
Signed-off-by: Doehyun Baek <doehyunbaek@gmail.com>

See gh-50800
2026-06-24 15:44:05 +01:00
Andy Wilkinson 6a74bb85a3 Merge branch '4.0.x'
Closes gh-50440
2026-05-14 15:03:44 +01:00
Andy Wilkinson add52b6ccd Merge branch '3.5.x' into 4.0.x
Closes gh-50439
2026-05-14 15:02:24 +01:00
Phillip Webb 796b0343c6 Merge branch '4.0.x'
Closes gh-50291
2026-05-04 15:37:42 -07:00
Phillip Webb a6895e3da2 Merge branch '3.5.x' into 4.0.x
Closes gh-50289
2026-05-04 14:03:03 -07:00
Stéphane Nicoll 61ca2f51cd Merge branch '4.0.x'
Closes gh-50114
2026-04-18 09:40:21 +02:00
Stéphane Nicoll 63fd49758c Merge branch '3.5.x' into 4.0.x
Closes gh-50113
2026-04-18 09:40:14 +02:00
Stéphane Nicoll ee4457457d Merge branch '4.0.x'
Closes gh-50112
2026-04-18 09:31:24 +02:00
Stéphane Nicoll a9f458c55a Merge branch '3.5.x' into 4.0.x
Closes gh-50111
2026-04-18 09:31:17 +02:00
Stéphane Nicoll 3972d42a8f Add support for loading layers configuration from the plugin classpath
This commit introduces an alternative to load layers configuration from
the classpath. This lets user package their custom layers XML at
META-INF/spring/layers/<name>.xml in a plugin dependency rather than
referencing a file path directly.

The name of the layers configuration can then be referenced using the
new `configurationName` property.

Closes gh-32466
2026-03-27 17:39:18 +01:00
Moritz Halbritter 662f5841df Merge branch '4.0.x'
Closes gh-49513
2026-03-09 09:48:15 +01:00
Moritz Halbritter 1edf7b8e9b Merge branch '3.5.x' into 4.0.x
Closes gh-49512
2026-03-09 09:48:00 +01:00
Andy Wilkinson 5ba6340ed7 Merge branch '4.0.x' 2026-03-05 20:52:39 +00:00
Andy Wilkinson b6f52e6d63 Merge branch '3.5.x' into 4.0.x 2026-03-05 20:52:28 +00:00
Andy Wilkinson b8a710bcc4 Merge branch '4.0.x'
Closes gh-49398
2026-03-04 12:31:04 +00:00
Andy Wilkinson 85dd0c72b4 Merge branch '3.5.x' into 4.0.x
Closes gh-49397
2026-03-04 12:30:47 +00:00
Stéphane Nicoll 7cc47e60ec Merge branch '4.0.x'
Closes gh-49296
2026-02-23 12:49:20 +01:00