150 Commits
Author SHA1 Message Date
Andy Wilkinson 721f93fb6e Merge branch '4.0.x' into 4.1.x
Closes gh-51925
2026-10-01 12:04:25 +01:00
Andy Wilkinson 8c457932e7 Polish "Preserve property descriptions during Gradle incremental compilation"
See gh-50489

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-10-01 12:02:46 +01:00
Agustin Bereciartua f135b3fb88 Preserve property descriptions during Gradle incremental compilation
Cache descriptions in a location outside CLASS_OUTPUT so that Gradle's
incremental compilation does not lose javadoc-based descriptions for
types passed as .class files.

See gh-50489

Signed-off-by: Agustin Bereciartua <bereciartua.agustin@gmail.com>
2026-10-01 11:54:46 +01:00
Moritz Halbritter d08663b9e8 Merge branch '4.0.x' into 4.1.x
Closes gh-51920
2026-10-01 12:13:53 +02:00
Moritz Halbritter 56facf449c Upgrade to Maven 3.10.0
Closes gh-51911
2026-10-01 12:13:12 +02:00
Stéphane Nicoll ed674dc20c Merge branch '4.0.x' into 4.1.x
Closes gh-51875
2026-09-28 09:21:01 +02:00
dependabot[bot] 6b5c574916 Bump org.bouncycastle:bcprov-jdk18on
Bumps [org.bouncycastle:bcprov-jdk18on](https://github.com/bcgit/bc-java) from 1.84 to 1.85.
- [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.md)
- [Commits](https://github.com/bcgit/bc-java/commits)

---
updated-dependencies:
- dependency-name: org.bouncycastle:bcprov-jdk18on
  dependency-version: '1.85'
  dependency-type: direct:production
...

See gh-51839

Signed-off-by: dependabot[bot] <support@github.com>
2026-09-28 09:20:16 +02:00
Stéphane Nicoll 79853c1197 Merge branch '4.0.x' into 4.1.x
Closes gh-51873
2026-09-28 09:13:11 +02:00
dependabot[bot] b418533eb8 Bump org.bouncycastle:bcprov-jdk18on
Bumps [org.bouncycastle:bcprov-jdk18on](https://github.com/bcgit/bc-java) from 1.84 to 1.85.
- [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.md)
- [Commits](https://github.com/bcgit/bc-java/commits)

---
updated-dependencies:
- dependency-name: org.bouncycastle:bcprov-jdk18on
  dependency-version: '1.85'
  dependency-type: direct:production
...

See gh-51838

Signed-off-by: dependabot[bot] <support@github.com>
2026-09-28 09:11:43 +02: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 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 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 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 e7a324357f Merge branch '4.0.x' into 4.1.x
Closes gh-51623
2026-09-08 13:57:12 +01:00
Andy Wilkinson f956f588d5 Configure attributes on dev-only configurations
Closes gh-51492
2026-09-08 13:56:26 +01:00
Andy Wilkinson a87fd2c9ba Merge branch '4.0.x' into 4.1.x
Closes gh-51620
2026-09-08 11:23:31 +01:00
Andy Wilkinson bb1ad4ce36 Manage TomlJ's version in spring-boot-internal-dependencies
Closes gh-51618
2026-09-08 09:25:56 +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
Andy Wilkinson e33f3c6781 Expect deprecation warnings from Protobuf plugin
See gh-51428
2026-08-25 08:37:58 +01:00
Andy Wilkinson ee059ae3ca Add CI for Java 27
Closes gh-51423
2026-08-24 14:52:36 +01: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 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 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 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 15c7518da5 Merge branch '4.0.x' into 4.1.x
Closes gh-50959
2026-07-16 11:09:08 +02:00
Sebastien Tardif c3153dc39f Close JarFile when finding main class from archive
MainClassFinder.findSingleMainClass(JarFile, ...) does not close the
JarFile; the caller owns the resource. FindMainClass passed a newly
opened JarFile without closing it, unlike sibling call sites that use
try-with-resources.

See gh-50949

Signed-off-by: Sebastien Tardif <sebtardif@ncf.ca>
2026-07-16 11:08:06 +02:00
Stéphane Nicoll a500eaaefe Merge branch '4.0.x' 2026-07-15 08:02:02 +02:00
Stéphane Nicoll 8c6c3fd1e4 Polish "Upgrade to Gradle 9.6.1"
Stop using providers.properties as it is deprecated

See gh-50793
2026-07-15 07:51:22 +02:00
Stéphane Nicoll c7dd44815a Upgrade to Native Build Tools Plugin 1.1.4
Closes gh-50947
2026-07-14 16:20:52 +02:00
Stéphane Nicoll 2eedeabe9a Upgrade to Gradle 9.6.1
This commit also suppresses new warnings from the Native Build Tools
Plugin, see https://github.com/graalvm/native-build-tools/pull/903

Closes gh-50793
2026-07-14 16:03:14 +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 7483278e7d Only apply grpc defaults when grpc plugin is configured
Previously, Spring Boot's Gradle plugin reacted to the Protobuf
plugin by configuring Protobuf's grpc plugin. This worked well for
projects using gRPC but went too far for those using Protobuf
without gRPC.

This commit dials the support back a little bit. Now, our recommended
gRPC defaults are only applied when Protobuf is configured with the
grpc plugin.

Closes gh-50822
2026-06-24 08:58:17 +01:00
Stéphane Nicoll 6a625e292c Merge branch '4.0.x'
Closes gh-50620
2026-05-29 12:36:56 +02:00
Stéphane Nicoll 8845b31cf9 Merge branch '3.5.x' into 4.0.x
Closes gh-50619
2026-05-29 12:36:08 +02: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
Dongliang Xie 6d307ed250 Align protoc version with protobuf-java
Update `ProtobufPluginAction` to align the protoc version with
`protobuf-java` rather than `protobuf-java-util`. The util
jar is only required for server gRPC code.

See gh-50405

Signed-off-by: Dongliang Xie <dragonfsky@gmail.com>
2026-05-12 08:58:47 -07:00
Phillip Webb b23ad48047 Simplify ProtobufPluginAction versionFromRuntimeClasspath
Simplify the stream logic to make use of `getAllComponents()`
rather than using `getAllDependencies()` and
`DependencyResult::getFrom`.

See gh-50405
2026-05-12 08:56:00 -07:00
Phillip Webb 796b0343c6 Merge branch '4.0.x'
Closes gh-50291
2026-05-04 15:37:42 -07:00