Commit Graph
62526 Commits
Author SHA1 Message Date
Phillip Webb eaaa8334bc Drop LibraryVersion and introduce LinkedVersion
Remove `LibraryVersion` in favor of working directly with
`DependencyVersion` for most tasks. As of commit 510c7815
`LibraryVersion` is only being used as a wrapper for the link
factory function. Introducing a dedicated `LinkedVersion` for
that purpose simplifies a lot of code.

See gh-51498
2026-09-01 14:49:26 -07:00
Andy Wilkinson 7ced0b100c Merge branch '4.1.x'
Closes gh-51521
2026-09-01 16:12:22 +01:00
Andy Wilkinson 40e8911734 Merge branch '4.0.x' into 4.1.x
Closes gh-51520
2026-09-01 16:12:05 +01:00
Andy Wilkinson 837f44f764 Return correct total when read(ByteBuffer) cannot fill buffer
Fixes gh-51515
2026-09-01 16:03:12 +01:00
Phillip Webb 32b235f4d7 Merge branch '4.1.x' 2026-08-31 21:25:00 -07:00
Phillip Webb 25a99a84c0 Merge branch '4.0.x' into 4.1.x 2026-08-31 21:24:40 -07:00
Phillip Webb 2e1502e5d7 Refactor BOM link DSL
Update link DSL with a new `Links` type and an enum for the type
rather than a name. This update also fixes Hibernate links which were
broken.

See gh-51498
2026-08-31 21:22:46 -07:00
Stéphane Nicoll b28ee13698 Merge branch '4.1.x'
Closes gh-51514
2026-08-30 20:28:03 +02: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 f0e7cd9c5e Merge pull request #51509 from kdomo
Closes gh-51509

* fix-http-client-assert:
  Polish "Fix null customizer checks in HTTP client builders"
  Fix null customizer checks in HTTP client builders
2026-08-30 20:27:41 +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 9d76c1fd32 Merge branch '4.1.x'
Closes gh-51512
2026-08-30 20:01:24 +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 fea4844b1a Merge pull request #51466 from scottfrederick
Closes gh-51466

* gh-51146-tomcat-customization-init:
  Polish contribution
  Retain SSL host config customizations during Tomcat initialization
2026-08-30 20:01:08 +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
Phillip Webb cf5f3b9ea6 Merge branch '4.1.x'
Closes gh-51501
2026-08-28 22:27:44 -07:00
Phillip Webb b47fb32f51 Merge branch '4.0.x' into 4.1.x
Closes gh-51500
2026-08-28 22:27:36 -07:00
Phillip Webb 83ed4b5487 Add javdoc and sources variants to spring-graphql dependencies
Closes gh-51499
2026-08-28 22:27:02 -07:00
Phillip Webb d7025a8cbe Merge branch '4.1.x'
Closes gh-51496
2026-08-28 15:51:53 -07:00
Phillip Webb 57dfc416b5 Merge branch '4.0.x' into 4.1.x
Closes gh-51495
2026-08-28 15:50:48 -07:00
Phillip Webb aefb3a4398 Add javdoc and sources variants to spring-framework dependencies
Closes gh-51494
2026-08-28 15:43:29 -07:00
Andy Wilkinson 4c37d12916 Merge pull request #51461 from seanxuu
Closes gh-51461

* gh-51461:
  Polish "Configure required authentication operation types for embedded LDAP"
  Configure required authentication operation types for embedded LDAP
2026-08-27 14:58:10 +01:00
Andy Wilkinson 74f1e37c3d Polish "Configure required authentication operation types for embedded LDAP"
See gh-51461
2026-08-27 14:51:49 +01:00
Sean ab642b82da Configure required authentication operation types for embedded LDAP
Signed-off-by: Sean <seanxu@connect.hku.hk>

See gh-51461
2026-08-27 14:47:11 +01:00
Andy Wilkinson 37a20a302b Merge branch '4.1.x'
Closes gh-51482
2026-08-27 14:42:31 +01:00
Andy Wilkinson b7333fa1aa Merge branch '4.0.x' into 4.1.x
Closes gh-51481
2026-08-27 14:42:20 +01:00
Andy Wilkinson fb4896741c Merge pull request #51467 from 2heunxun
Closes gh-51467

* gh-51467:
  Honor existing 'encrypt' JDBC parameter for SQL Server Docker Compose
2026-08-27 14:41:51 +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
Andy Wilkinson c4786891ba Merge branch '4.1.x'
Closes gh-51480
2026-08-27 14:30:13 +01:00
Andy Wilkinson a16c8a2479 Merge branch '4.0.x' into 4.1.x
Closes gh-51479
2026-08-27 14:29:50 +01:00
Andy Wilkinson 71a51a0277 Merge pull request #51453 from dependabot[bot]
Closes gh-51453

* gh-51453:
  Bump Homebrew/actions/setup-homebrew from 2026.08.14.1 to 2026.08.24.1
2026-08-27 14:29:29 +01:00
dependabot[bot] 0452f6d110 Bump Homebrew/actions/setup-homebrew from 2026.08.14.1 to 2026.08.24.1
Bumps [Homebrew/actions/setup-homebrew](https://github.com/homebrew/actions) from 2026.08.14.1 to 2026.08.24.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/8f3d1ec8a696b3b9d9a6c3696b6c73033cab69e4...a657b8b0cd35d0f65cce41fce9b24cf054b49869)

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

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

See gh-51453
2026-08-27 14:26:37 +01:00
Andy Wilkinson 32d72335ba Merge branch '4.1.x'
Closes gh-51478
2026-08-27 14:19:44 +01:00
Andy Wilkinson 03de7a801b Merge branch '4.0.x' into 4.1.x
Closes gh-51477
2026-08-27 14:19:24 +01:00
Andy Wilkinson 31f7eeda68 Upgrade to Nullability Plugin 0.0.15
Closes gh-51475
2026-08-27 13:57:08 +01:00
Moritz Halbritter 99274e3143 Fix embedded LDAP SSL and reuse client auto-configuration
Replace the hand-rolled LdapContextSource of the embedded server
with an LdapConnectionDetails implementation, so that
LdapAutoConfiguration creates the context source for both the external
and the embedded case. Previously, the embedded context source derived
the URL scheme from spring.ldap.ssl and never applied an SSL bundle to
the JNDI environment, leaving an embedded LDAPS server unreachable. It
also ignored spring.ldap.anonymous-read-only, spring.ldap.referral,
spring.ldap.base-environment and any DirContextAuthenticationStrategy
bean, all of which now apply.

The embedded server provides everything that describes a connection to
it, so spring.ldap.urls, spring.ldap.username, spring.ldap.password and
spring.ldap.ssl are now ignored while it is used. A spring.ldap
configuration meant for a production server therefore no longer has to
be unset for a test to run against the embedded server. This is a
behavior change: spring.ldap.urls used to take precedence and silently
pointed the client away from the embedded server.

As spring.ldap.base-environment now applies to the embedded case, a
socket factory set there would be replaced by the one of the SSL
bundle. Startup fails instead of using either silently.

LdapProperties.determineUrls has been removed. Its local.ldap.port
handling only ever served the embedded case, which the embedded
connection details now cover, and the default URL derivation has moved
to PropertiesLdapConnectionDetails, its only caller.

Closes gh-51465
2026-08-27 09:32:13 +02:00
Moritz Halbritter bf1b583596 Fail fast if ssl.enabled = true without an SSL bundle
Setting spring.ldap.embedded.ssl.enabled without an SSL bundle started a
plain LDAP listener silently. It now fails at startup as a bundle is
required to provide the server's certificate and private key.

Closes gh-51471
2026-08-27 09:32:13 +02:00
Moritz Halbritter 6c33f551e7 Add missing tests for reflection hints
See gh-51382
2026-08-27 09:32:13 +02:00
Phillip Webb 8b35236d92 Merge branch '4.1.x' 2026-08-26 14:40:02 -07:00
Phillip Webb a63e99407e Merge branch '4.0.x' into 4.1.x 2026-08-26 14:08:23 -07:00
Phillip Webb 9c8bf507d4 Simplify documentation dependencies 2026-08-26 14:03:44 -07:00
Phillip Webb 293c56bf52 Merge branch '4.1.x' 2026-08-26 11:11:03 -07:00
Phillip Webb 25194625b5 Merge branch '4.0.x' into 4.1.x 2026-08-26 11:09:18 -07:00
Phillip Webb fd0f76304c Sort implementation dependencies in spring-boot-docs 2026-08-26 11:03:23 -07:00
Phillip Webb ffd9190409 Merge branch '4.1.x' 2026-08-26 10:48:37 -07:00
Phillip Webb 4cdd2015e7 Merge branch '4.0.x' into 4.1.x 2026-08-26 10:45:35 -07:00
Phillip Webb a1cc95e8a6 Polish gradle dependency declarations
Remove 'path:' prefix when possible.
2026-08-26 10:39:28 -07:00
Moritz Halbritter 4a3cad7983 Add SSL support for LDAP in Docker Compose
Also fixes missing LDAP entries in the documentation.

See gh-51382
2026-08-26 11:53:08 +02:00