Commit Graph
62233 Commits
Author SHA1 Message Date
Andy Wilkinson 5b3631bfe9 Merge branch '4.0.x' into 4.1.x
Closes gh-51651
2026-09-09 15:31:57 +01:00
Andy Wilkinson 69ad59c413 Merge pull request #51551 from COBI-98
Closes gh-51551

* gh-51551:
  Polish "Add SBOM manifest attributes to repackaged Maven wars"
  Add SBOM manifest attributes to repackaged Maven wars
2026-09-09 15:31:48 +01:00
Andy Wilkinson 007ca201e1 Polish "Add SBOM manifest attributes to repackaged Maven wars"
See gh-51551

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-09 14:44:51 +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 6c0d47e3da Merge branch '4.0.x' into 4.1.x
Closes gh-51647
2026-09-09 11:00:01 +01:00
Andy Wilkinson d34a479879 Merge pull request #51635 from noojung
Closes gh-51635

* gh-51635:
  Avoid using the deprecated Project.getProperties method
2026-09-09 10:57:41 +01:00
Hyunwoo Jung 6823d37408 Avoid using the deprecated Project.getProperties method
Gradle 9.6 deprecates Project.getProperties, which will be removed
in Gradle 10.

Use ProviderFactory.gradleProperty to read the required properties
in AntoraAsciidocAttributes and the image system tests build script.
Preserve null handling for missing Antora properties and fall back
to the project version when springBootVersion is not configured.

Update the provider mocks and add tests for the GraalVM
plugin version attribute.

Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>

See gh-51635
2026-09-09 10:42:17 +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
Andy Wilkinson abbb298039 Merge pull request #51644 from ngocnhan-tran1996
Closes gh-51644

* gh-51644:
  Polish "Remove redundant whitespace"
  Remove redundant whitespace
2026-09-09 10:36:59 +01:00
Andy Wilkinson a9fbd4a24c Polish "Remove redundant whitespace"
See gh-51644

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-09 10:00:36 +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
Andy Wilkinson f310611d20 Merge branch '4.0.x' into 4.1.x
Closes gh-51641
2026-09-09 08:26:48 +01:00
Andy Wilkinson 3b5706b397 Merge pull request #51634 from dependabot[bot]
Closes gh-51634

* gh-51634:
  Bump Homebrew/actions/setup-homebrew from 2026.08.31.1 to 2026.09.07.1
2026-09-09 08:26:41 +01:00
dependabot[bot] 07ad2a4e17 Bump Homebrew/actions/setup-homebrew from 2026.08.31.1 to 2026.09.07.1
Bumps [Homebrew/actions/setup-homebrew](https://github.com/homebrew/actions) from 2026.08.31.1 to 2026.09.07.1.
- [Release notes](https://github.com/homebrew/actions/releases)
- [Changelog](https://github.com/Homebrew/actions/blob/main/release.test.mts)
- [Commits](https://github.com/homebrew/actions/compare/3cdb78d0f62ad29dd32de765782654f4eedea607...f8d4222eb633e65c2a0157383cf80861fc7fae7f)

---
updated-dependencies:
- dependency-name: Homebrew/actions/setup-homebrew
  dependency-version: 2026.09.07.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

See gh-51634
2026-09-09 08:24:23 +01:00
Andy Wilkinson e383449a5d Merge branch '4.0.x' into 4.1.x
Closes gh-51639
2026-09-09 08:21:12 +01:00
Andy Wilkinson 06c0fa8d5c Retain WebFlux's default SameSite when property not set
Fixes gh-51636
2026-09-09 08:18:47 +01:00
Andy Wilkinson fd1dec5794 Merge branch '4.0.x' into 4.1.x
Closes gh-51637
2026-09-09 08:07:53 +01:00
Andy Wilkinson 304b57c839 Merge pull request #51625 from noojung
Closes gh-51625

* gh-51625:
  Avoid implicit property lookup in parent projects
2026-09-09 08:07:42 +01:00
Hyunwoo Jung fd1fd6d285 Avoid implicit property lookup in parent projects
Gradle 9.6 deprecated the implicit lookup of properties in parent
projects, which currently causes the build to emit deprecation
warnings and will become an error in Gradle 10.

The settings script for the gradle/plugins build sets properties
from the root gradle.properties file only on its root project. The
cycle-detection-plugin subproject then resolves javaFormatVersion
and checkstyleToolVersion by walking up to its parent, which
triggers the deprecation.

This commit uses GradleLifecycle#beforeProject rather than
Gradle#rootProject so that the properties are defined directly on
every project in the build. As an isolated action, it also avoids
carrying the settings script into each project's configuration,
which keeps the build friendlier to the configuration cache.

It also enables the NO_IMPLICIT_LOOKUP_IN_PARENT_PROJECTS feature
preview so that any reintroduction of the deprecated behavior fails
the build rather than only emitting a warning.

Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>

See gh-51625
2026-09-09 08:00:59 +01:00
Stéphane Nicoll 163fac2cb1 Merge branch '4.0.x' into 4.1.x 2026-09-08 18:30:45 +02:00
Stéphane Nicoll 4fc987180d Polish "Add support for creating a container from a TestImage value"
See gh-51082
2026-09-08 18:30:35 +02:00
Andy Wilkinson 7c11fcf97f Merge branch '4.0.x' into 4.1.x
Closes gh-51632
2026-09-08 16:55:15 +01:00
Andy Wilkinson fac21d7379 Merge pull request #51627 from ohchanKyu
Closes gh-51627

* gh-51627:
  Fix typo in deprecated Pushgateway base-url property metadata
2026-09-08 16:55:06 +01:00
ohchanKyu afc3178f33 Fix typo in deprecated Pushgateway base-url property metadata
The deprecation entry for
management.prometheus.metrics.export.pushgateway.base-url was declared
as "management.promethus", so the deprecation was never reported.

Signed-off-by: ohchanKyu <okc0202@naver.com>

See gh-51627
2026-09-08 16:54:18 +01:00
Andy Wilkinson e158494508 Merge branch '4.0.x' into 4.1.x
Closes gh-51630
2026-09-08 16:51:49 +01:00
Andy Wilkinson bfc2935ad4 Merge pull request #51619 from yyuneu
Closes gh-51619

* gh-51619:
  Honor authorities-claim-delimiter when set on its own
2026-09-08 16:43:39 +01:00
JaeHyunAn 537c80dbb9 Honor authorities-claim-delimiter when set on its own
See gh-51619

Signed-off-by: JaeHyunAn <98042706+yyuneu@users.noreply.github.com>
2026-09-08 16:39:54 +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 60dc60c5f6 Merge branch '4.0.x' into 4.1.x
Closes gh-51616
2026-09-08 09:19:33 +01:00
Andy Wilkinson ad8f14e785 Merge pull request #51549 from aashikantkumar
Closes gh-51549

* gh-51549:
  Polish "Preserve firewall in reactive CF security auto-configuration"
  Preserve firewall in reactive CF security auto-configuration
2026-09-08 09:19:27 +01:00
Andy Wilkinson 23275d826b Polish "Preserve firewall in reactive CF security auto-configuration"
See gh-51549

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-08 09:18:26 +01:00
Andy Wilkinson c1900d0bc9 Merge branch '4.0.x' into 4.1.x
Closes gh-51614
2026-09-08 09:15:55 +01:00
aashikantkumar 4f3d0349f3 Preserve firewall in reactive CF security auto-configuration
Prior to this commit, CloudFoundryReactiveActuatorAutoConfiguration
registered a BeanPostProcessor replaced the WebFilterChainProxy bean
with one that handled CF security and delegated to the existing
chain.

Constructing a new WebFilterChainProxy resulted in the loss of any
firewall customization on the existing chain as Spring Security does
not provide an API to retreive the firewall from the existing chain
and apply it to the new chain.

This commit changes the approach and aligns it with its Servlet
counterpart. Instead of post-processing the filter chain proxy, a new
SecurityWebFilterChain that handles cloudfoundryapplication/**
is defined. This chain becomes part of the existing
WebFilterChainProxy, preserving any firewall customization.

Signed-off-by: aashikantkumar <aashikantkumar2@gmail.com>

See gh-51549
2026-09-08 08:56:38 +01:00
Andy Wilkinson 1d79f56ad7 Return 503 for missing application ID or cloud controller URL
Previously, the CloudFoundryAuthorizationExceptions thrown for a
missing application ID or cloud controller URL were not routed
through the error handling that turned them into a SecurityResponse
with a 503 status code. As a result, they were processed by the
general exception handling which resulted in a 500 response.

This commit updates the reactive SecurityInterceptor so that the
exceptions are processed through
SecurityInterceptor::getErrorResponse. This aligns the behavior of
the Cloud Foundry security intergration in a reactive application
more closely with that of a Servlet application.

Fixes gh-51613
2026-09-08 08:51:58 +01:00
Andy Wilkinson c6ed90e28c Set ignore_optional_problems on all proto-generated source
Closes gh-51604
2026-09-07 14:56:54 +01:00
Andy Wilkinson 8dac80a6ea Merge branch '4.0.x' into 4.1.x
Closes gh-51608
2026-09-07 12:38:11 +01:00
Andy Wilkinson 159bdeb76e Merge pull request #51598 from noojung
Closes gh-51598

* gh-51598:
  Avoid using Project objects as dependency notation
2026-09-07 12:38:00 +01:00
Hyunwoo Jung ceefb553c4 Avoid using Project objects as dependency notation
Gradle 9.6 deprecates passing a Project instance as dependency notation,
which currently causes the build to emit deprecation warnings and will
become an error in Gradle 10.

This commit updates AggregatorPlugin to use
DependencyFactory#createProjectDependency instead.

Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>

See gh-51598
2026-09-07 12:37:25 +01:00
Andy Wilkinson 50350d0c83 Merge branch '4.0.x' into 4.1.x
Closes gh-51606
2026-09-07 12:20:30 +01:00
Andy Wilkinson 03cf0c49ce Merge pull request #51590 from noojung
Closes gh-51590

* gh-51590:
  Fix typos
2026-09-07 12:19:32 +01:00
Hyunwoo Jung 528c8bd1ea Fix typos
Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>

See gh-51590
2026-09-07 11:53:30 +01:00
Andy Wilkinson 61275b0c64 Merge branch '4.0.x' into 4.1.x
Closes gh-51601
2026-09-07 08:43:48 +01:00
Andy Wilkinson 2a30bbc70a Merge pull request #51593 from fabio-grassi
Closes gh-51593

* gh-51593:
  Switch to Java 17 variants of Oracle JDBC dependencies
2026-09-07 08:43:37 +01:00
Fabio Grassi b49f9e2c32 Switch to Java 17 variants of Oracle JDBC dependencies
Signed-off-by: Fabio Grassi <40345396+fabio-grassi@users.noreply.github.com>

See gh-51593
2026-09-07 08:31:23 +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