Commit Graph
1254 Commits
Author SHA1 Message Date
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 154a77cae9 Make reactive resource server back off with custom security
Previously, the auto-configuration of reactive OAuth 2 resource
server based web security did not back off when a custom
SecurityWebFilterChain was defined. This did not match the
equivalent servlet-based auto-configuration which backs off when
a custom SecurityFilterChain is defined.

This commit updates the reactive auto-configuration to behave in
the same way as the servlet auto-configuration. A new annotation,
@ConditionalOnDefaultReactiveWebSecurity, is introduced. The
existing servlet-specific annotation,
@ConditionalOnDefaultWebSecurity is deprecated and a replacement
named @ConditionalOnDefaultServletWebSecurity is introduced.

Fixes gh-50778
2026-09-04 16:08:58 +01:00
Andy Wilkinson 61a62d56d8 Merge branch '4.0.x' into 4.1.x
Closes gh-51584
2026-09-04 12:58:36 +01:00
Manu Sridharan 1c50b1cb7c Fix new warnings from NullAway 0.14.1
Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-51507
2026-09-04 12:56:34 +01:00
Andy Wilkinson 9380e958d3 Merge branch '4.0.x' into 4.1.x
Closes gh-51578
2026-09-04 10:14:19 +01:00
Andy Wilkinson a833fe58f9 Merge pull request #51546 from yyuneu
Closes gh-51546

* gh-51546:
  Apply RabbitMQ credential fallbacks for null values
2026-09-04 10:12:14 +01:00
Andy Wilkinson c38c15b3b7 Merge branch '4.0.x' into 4.1.x
Closes gh-51576
2026-09-04 09:53:28 +01:00
Vladimir Sitnikov ff3086700b Fix unrecognized JSpecify nullable annotations
Signed-off-by: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>

See gh-51555
2026-09-04 09:40:47 +01:00
Andy Wilkinson 4c5ed7e087 Merge branch '4.0.x' into 4.1.x
Closes gh-51574
2026-09-04 09:35:30 +01:00
kdomo 3d037f9df6 Correct Assert messages that name the wrong parameter
Three Assert messages named a parameter that does not exist on the
method. In each case the correct name is already used by neighbouring
code in the same class.

Signed-off-by: kdomo <dongho5088@naver.com>

See gh-51568
2026-09-04 09:10:05 +01:00
Phillip Webb ba82b96e9c Align authoritiesClaimExpressions setter
Align setter for `authoritiesClaimExpressions` which was missed from
commit f2981d1bdc.

Closes gh-51562
2026-09-03 18:01:25 -07:00
JaeHyunAn 7fd64281e0 Apply RabbitMQ credential fallbacks for null values
Docker records an environment variable that is declared without a value
as a bare name, which DockerEnv maps to a null value rather than
omitting the key. Map.getOrDefault only falls back when the key is
absent, so both the fallback key and the guest default were skipped.

See gh-51546

Signed-off-by: JaeHyunAn <98042706+yyuneu@users.noreply.github.com>
2026-09-02 22:40:57 +09:00
Andy Wilkinson 8e7128730f Merge branch '4.0.x' into 4.1.x
Closes gh-51544
2026-09-02 14:18:14 +01:00
Andy Wilkinson d6c2e687b0 Polish "Use constructor injection in classes that partipate in @Import"
See gh-51490

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-02 14:16:07 +01:00
piyushrajyadav e161167450 Use constructor injection in classes that partipate in @Import
See gh-51490

Signed-off-by: piyushrajyadav <piyushyadavrajyadav@gmail.com>
2026-09-02 14:15:45 +01:00
Stéphane Nicoll d2f0b8b339 Merge branch '4.0.x' into 4.1.x
Closes gh-51513
2026-08-30 20:27:47 +02:00
Stéphane Nicoll 60445a5069 Polish "Fix null customizer checks in HTTP client builders"
See gh-51509
2026-08-30 20:21:43 +02:00
kdomo 93a24eabb1 Fix null customizer checks in HTTP client builders
AbstractClientHttpRequestFactoryBuilder.mergedCustomizers and its
reactive counterpart asserted on the customizers field rather than
the customizer parameter. The field is never null since the
constructor defaults it to an empty list, so the assertion always
passed and a null customizer was not rejected.

See gh-51509

Signed-off-by: kdomo <dongho5088@naver.com>
2026-08-30 20:16:15 +02:00
Stéphane Nicoll a557f6b93a Merge branch '4.0.x' into 4.1.x
Closes gh-51511
2026-08-30 20:01:13 +02:00
Stéphane Nicoll b1b145de21 Polish contribution
See gh-51466
2026-08-30 19:59:11 +02:00
Scott Frederick 4ca8304959 Retain SSL host config customizations during Tomcat initialization
Applying an SSL bundle to a Tomcat server replaced any `SSLHostConfig`
already registered on the connector for a host name, so an
`SSLHostConfig` could not be configured before Spring Boot applied a
bundle to it.

Reuse any existing `SSLHostConfig` during initial configuration, so an
`SSLHostConfig` registered on the connector before the bundle is
applied retains settings such as `trustManagerClassName`,
`truststoreProvider`, or `truststoreAlgorithm`.

Client authentication settings are only applied when creating a new
`SSLHostConfig`, so the `certificateVerification` of an existing
`SSLHostConfig` is retained rather than being overwritten with the
value derived from the `server.ssl.client-auth` property.

See gh-51466

Signed-off-by: Scott Frederick <scottyfred@gmail.com>
2026-08-30 19:54:00 +02:00
Andy Wilkinson b7333fa1aa Merge branch '4.0.x' into 4.1.x
Closes gh-51481
2026-08-27 14:42:20 +01:00
2heunxun 9847c9613e Honor existing 'encrypt' JDBC parameter for SQL Server Docker Compose
Signed-off-by: 2heunxun <seapeon@naver.com>

See gh-51467
2026-08-27 14:32:40 +01:00
Phillip Webb 9d617d0cae Merge branch '4.0.x' into 4.1.x
Closes gh-51457
2026-08-25 18:54:05 -07:00
Phillip Webb fa163d4f2d Polish "Retain SSL host config customizations when reloading SSL bundles"
See gh-51290
2026-08-25 18:53:05 -07:00
Scott Frederick cbbe588d1f Retain SSL host config customizations when reloading SSL bundles
Tomcat's SSL configuration is applied to an `SSLHostConfig` for each
host name. When an SSL bundle was updated, a new `SSLHostConfig` was
created and used to replace the existing one for that host name,
discarding any customizations that had been applied to it (for example
by a `TomcatConnectorCustomizer`).

Reuse the existing `SSLHostConfig` for the host name when one is
present, applying the updated bundle to it rather than replacing it. The
existing `SSLHostConfigCertificate` is also reused, as adding a second
certificate with an undefined type to an `SSLHostConfig` is rejected by
Tomcat.

See gh-51290

Signed-off-by: Scott Frederick <scottyfred@gmail.com>
2026-08-25 18:52:34 -07:00
Phillip Webb 914f39384c Merge branch '4.0.x' into 4.1.x
Closes gh-51454
2026-08-25 14:07:23 -07:00
Phillip Webb 5a21e0d698 Upgrade to spring-javaformat 0.0.48
Closes gh-51452
2026-08-25 13:58:58 -07:00
Phillip Webb cd5d2decf9 Merge branch '4.0.x' into 4.1.x
Closes gh-51450
2026-08-25 12:43:03 -07:00
Phillip Webb 53c04499b4 Create properties despite used-defined ClientRegistrationRepository
Update `OAuth2ClientConfigurations` so that properties are created
regardless of a user-defined `ClientRegistrationRepository` bean.

Fixes gh-51447
2026-08-25 12:41:23 -07:00
Phillip Webb 014bbcca82 Polish LdapHealthIndicator
See gh-51441
2026-08-25 11:46:03 -07:00
2heunxun d5ace369bd Fix LdapHealthIndicator reporting when LDAP version is unavailable
Fix regression caused by commit d26b6895 which caused
`doHealthCheck()` to only call `builder.up()` when the LDAP
server's protocol version (`java.naming.ldap.version`) could be
read from the JNDI environment.

See gh-51441

Signed-off-by: 2heunxun <seapeon@naver.com>
2026-08-25 11:43:49 -07:00
Moritz Halbritter 7a77c35d75 Merge branch '4.0.x' into 4.1.x
Closes gh-51433
2026-08-25 09:14:42 +02:00
2heunxun d00566ae5d Fix watchdog thread leak in JmsHealthIndicator on start failure
See gh-51412

Signed-off-by: 2heunxun <seapeon@naver.com>
2026-08-25 09:07:25 +02:00
Stéphane Nicoll d5cec292dc Polish "Honor a wrapper's unwrap when resolving the root DataSource"
See gh-51410
2026-08-24 10:41:17 +02:00
jjh75607 5eb30621db Honor a wrapper's unwrap when resolving the root DataSource
See gh-51410

Signed-off-by: jjh75607 <jjh7560734@gmail.com>
2026-08-24 10:38:51 +02:00
Stéphane Nicoll 1757021744 Merge branch '4.0.x' into 4.1.x
Closes gh-51369
2026-08-11 17:49:02 +02:00
Stéphane Nicoll ada7ac7c48 Apply consumer-specific security protocol
Closes gh-51365
2026-08-11 17:46:39 +02:00
Stéphane Nicoll 4518e11bf5 Polish "Remove code tag in property description"
See gh-51348
2026-08-11 14:43:45 +02:00
Tran Ngoc Nhan 328390acee Remove code tag in property description
See gh-51348

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2026-08-11 14:42:15 +02:00
Phillip Webb e665232b96 Upgrade to Grpc Java 1.83.1
Closes gh-51361
2026-08-11 12:34:44 +01:00
Stéphane Nicoll 84f8a6ff35 Polish "Backoff from exposing gRPC server port if gRPC is not available"
See gh-50825
2026-08-10 14:40:53 +02:00
Stéphane Nicoll bf461b085d Backoff from exposing gRPC server port if gRPC is not available
This moves the feature from a unconditional application listener that
can load gRPC types to an auto-configuration that backs off if the
necessary classes are not present.

Also updated the smoke tests to actually use the feature.

Closes gh-50825
2026-08-07 11:13:32 +02:00
Stéphane Nicoll 97ee86d1fe Merge branch '4.0.x' into 4.1.x
Closes gh-51277
2026-08-05 11:40:40 +02:00
Stéphane Nicoll 481f6f03fe Polish "Fix exception type documented by resolveConfigLocation"
This removes the throws entry altogether as we don't usually document
such exception.

See gh-51175
2026-08-05 11:38:43 +02:00
wantaek 010bc3c307 Fix exception type documented by resolveConfigLocation
The javadoc promises an IllegalArgumentException, but the method asserts
with Assert.state, which throws an IllegalStateException.

See gh-51175

Signed-off-by: wantaek <wantaekchoi@gmail.com>
2026-08-05 11:38:43 +02:00
Stéphane Nicoll aedcc514b8 Merge branch '4.0.x' into 4.1.x
Closes gh-51159
2026-07-30 08:44:46 +02:00
vvzvvv e02521d12b Remove unnecessary null check in GroovyTemplateAutoConfigurationTests
The context field is final and eagerly initialized, so it can
never be null at teardown time.

See gh-51147

Signed-off-by: vvzvvv <tmdgusv@gmail.com>
2026-07-30 08:41:53 +02:00
Moritz Halbritter 84d0caf7ee Merge branch '4.0.x' into 4.1.x
Closes gh-51135
2026-07-28 10:17:26 +02:00