Commit Graph
1296 Commits
Author SHA1 Message Date
Moritz Halbritter 969f1c03bf Polish "Add SSL bundle support to LDAP auto-configuration"
Configure the SSL bundle through the context source's base environment
rather than a DirContextAuthenticationStrategy. The strategy is not
consulted when read-only operations use an anonymous environment,
which is the default when no username is set, so LDAPS connections
silently used the JVM's default trust material. It was also bypassed
entirely when a custom strategy bean was defined.
Register an SSL bundle update handler so that reloaded key and trust
material is used by subsequent connections.

Target LDAPS rather than StartTLS by setting the JNDI
java.naming.ldap.factory.socket property, and fail at startup if a
bundle is combined with a non-ldaps URL or with a socket factory that
has also been set through spring.ldap.base-environment. Delegate all
socket factory methods so that a configured connect timeout is
applied.

Add spring.ldap.ssl.enabled to use the platform's default trust and
key material without a bundle, default the URL to
ldaps://localhost:636 when SSL is enabled, and register the reflection
hint that JNDI needs to load the socket factory by name in a native
image. Cover the result with integration tests that search over LDAPS
against OpenLDAP and LLDAP containers, including certificates that are
untrusted or issued to a different host.

See gh-51382
2026-08-26 10:35:57 +02:00
dhruv9b 255677d8e7 Add SSL bundle support to LDAP auto-configuration
See gh-51382

Signed-off-by: dhruv9b <9bdhruv@gmail.com>
2026-08-26 08:23:35 +02:00
Phillip Webb 862b763d00 Merge branch '4.1.x'
Closes gh-51458
2026-08-25 18:54:13 -07: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 ef4f1404a1 Merge branch '4.1.x'
Closes gh-51455
2026-08-25 14:19:47 -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 7538153cc1 Merge branch '4.1.x'
Closes gh-51451
2026-08-25 12:43:08 -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 ca0772effd Merge branch '4.1.x'
Closes gh-51442
2026-08-25 11:49:40 -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 3f7cebd802 Polish "Allow configuring Micrometer Tracing MDC keys"
Derive logging.pattern.correlation from the configured MDC keys so that
log correlation keeps working when the keys are customized, instead of
silently rendering a blank correlation field.

Reject empty MDC keys and only clear Brave's default correlation fields
when the keys have been customized, so that applications using the
defaults are unaffected if Brave adds a default field.

Replace the tests that asserted on bean wiring with integration tests
covering the MDC contents, plus a smoke test for the log output.

See gh-50595
2026-08-25 13:54:00 +02:00
Phil Clay dc2274e5b6 Allow configuring Micrometer Tracing MDC keys
See gh-50595

Signed-off-by: Phil Clay <philsttr@users.noreply.github.com>
2026-08-25 13:51:28 +02:00
Moritz Halbritter 16445f82a6 Merge branch '4.1.x'
Closes gh-51434
2026-08-25 09:14:57 +02: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
Moritz Halbritter 7a6be52eae Polish
See gh-50461
2026-08-25 08:45:47 +02:00
Phillip Webb e694cf15d9 Polish 2026-08-24 19:10:38 -07:00
Moritz Halbritter 6af1fb5c26 Polish "Align OTLP signal-specific properties with common fallback configuration"
Allow `management.opentelemetry.otlp.compression` to act as a common
default for OTLP compression, mirroring the existing endpoint/headers
fallback. Tracing, logging and metrics exporters now fall back to it
when their own signal-specific compression property is unset.

See gh-50461
2026-08-24 14:51:43 +02:00
somiljain2006 faf93946cd Align OTLP signal-specific properties with common fallback configuration
See gh-50461

Signed-off-by: somiljain2006 <somil16022006@gmail.com>
2026-08-24 14:09:52 +02:00
Stéphane Nicoll 2051b60a1a Merge branch '4.1.x'
Closes gh-51420
2026-08-24 10:50:15 +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
Jonatan IvanovandStéphane Nicoll 188860f730 Adapt to changes in micrometer snapshots
See https://github.com/micrometer-metrics/micrometer/issues/2297

Co-authored-by: Stéphane Nicoll <stephane.nicoll@broadcom.com>
2026-08-14 08:16:26 +02:00
Stéphane Nicoll bfb9c8dbca Merge branch '4.1.x'
Closes gh-51370
2026-08-11 17:49:09 +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 6f6d8307c9 Merge branch '4.1.x'
Closes gh-51364
2026-08-11 14:47:08 +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 df902aee83 Merge branch '4.1.x'
Closes gh-51362
2026-08-11 12:36:21 +01: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 a31bf32ae6 Adapt to changes in micrometer snapshots
See https://github.com/micrometer-metrics/micrometer/issues/2297
2026-08-10 17:57:20 +02:00
Stéphane Nicoll 6bbab506a9 Merge branch '4.1.x' 2026-08-10 15:37:08 +02: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 6dc87d9d17 Merge branch '4.1.x'
Closes gh-51291
2026-08-07 11:18:17 +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 9ae8f7b9cf Merge branch '4.1.x'
Closes gh-51278
2026-08-05 11:40:50 +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 ba2e9f078c Upgrade to OpenTelemetry 1.64.0
Closes gh-51231
2026-08-03 19:45:39 +02:00
Stéphane Nicoll 7f15ee9983 Start building against Spring AMQP 4.2.0-M1 snapshots
See gh-51221
2026-08-03 19:45:37 +02:00
Brian Clozel 66a093dbfa Refine Forwarded headers configuration for Reactor servers
This commit introduces new properties for configuring the HTTP headers
that should be used for forward support.
The new `server.netty.forwarded-headers.header-format` property allows
"standard" or "x_forwarded" to select "Forwarded" or "X-Forwarded-*"
headers.

This aligns the behavior of Netty server with the "FRAMEWORK" strategy.

Closes gh-51031
2026-07-31 14:10:21 +02:00
Brian Clozel 941045a2f4 Refine Forwarded headers configuration for Jetty servers
This commit introduces new properties for configuring the HTTP headers
that should be used for forward support.
The new `server.jetty.forwarded-headers.header-format` property allows
"standard" or "x_forwarded" to select "Forwarded" or "X-Forwarded-*"
headers.

This aligns the behavior of Jetty server with the "FRAMEWORK" strategy.

Closes gh-51148
2026-07-30 15:12:48 +02:00
Stéphane Nicoll e398c1ad97 Merge branch '4.1.x'
Closes gh-51160
2026-07-30 08:45:02 +02:00