Andy Wilkinson
fba03d89f6
Merge branch '4.1.x'
...
Closes gh-51926
2026-10-01 12:04:34 +01:00
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
4b6493f4f2
Merge branch '4.1.x'
...
Closes gh-51921
2026-10-01 12:14:30 +02: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
76cc145900
Merge branch '4.1.x'
...
Closes gh-51876
2026-09-28 09:21:07 +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
b015f43df4
Merge branch '4.1.x'
...
Closes gh-51874
2026-09-28 09:13:22 +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
Moritz Halbritter
f0f435a8bb
Polish "Switch to ubuntu-resolute-builder as the default builder"
...
See gh-51249
2026-09-24 13:52:22 +02:00
Anthony Dahanne
93880ced79
Switch to ubuntu-resolute-builder as the default builder
...
See gh-51249
Signed-off-by: Anthony Dahanne <anthony.dahanne@gmail.com >
2026-09-24 13:52:22 +02:00
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
Wan bin yu
0d223cbc77
Filter additional configuration metadata from archives
...
Signed-off-by: Wan bin yu <3431359639@qq.com >
See gh-51386
2026-09-09 08:30:08 +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
dc80919a96
Merge branch '4.1.x'
...
Closes gh-51624
2026-09-08 13:57:22 +01: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
5893438a3a
Merge branch '4.1.x'
...
Closes gh-51621
2026-09-08 11:23:45 +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
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
Andy Wilkinson
f6d986d0bd
Merge branch '4.1.x'
2026-08-25 08:38:29 +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
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
Stéphane Nicoll
3380f9236b
Polish "Upgrade to Kotlin 2.4.10"
...
Closes gh-51205
2026-08-03 16:02:19 +02:00
Phillip Webb
a26ff99296
Revert "Temporarily disable test caching to test CI"
...
This reverts commit 53099aec33 .
2026-07-31 09:35:50 +01:00
Phillip Webb
53099aec33
Temporarily disable test caching to test CI
2026-07-31 09:16:13 +01:00