Commit Graph
1312 Commits
Author SHA1 Message Date
Andy Wilkinson 1958b39214 Use new isEnabled methods when testing CBOR and XML feature config
Closes gh-47774
2026-10-02 17:59:02 +01:00
Phillip Webb a5bc294685 Merge branch '4.0.x' into 4.1.x
Closes gh-51897
2026-09-28 14:20:12 -07:00
Phillip Webb 7a871ff117 Polish 'Use instanceof pattern matching to avoid an explicit cast'
See gh-51896
2026-09-28 14:18:55 -07:00
Tran Ngoc Nhan 68c321499a Use instanceof pattern matching to avoid an explicit cast
See gh-51896

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2026-09-28 14:18:41 -07:00
Stéphane Nicoll 3af085d914 Merge branch '4.0.x' into 4.1.x
Closes gh-51890
2026-09-28 13:16:33 +02:00
Stéphane Nicoll e3805a9601 Polish contribution
See gh-51872
2026-09-28 13:08:02 +02:00
Kosuke Yanagihara f0987da4bb Back off DevTools' JDBC and R2DBC support when modules are missing
DevToolsDataSourceAutoConfiguration and DevToolsR2dbcAutoConfiguration
were only guarded by classes from the JDK and r2dbc-spi respectively.
When a single user-defined DataSource or ConnectionFactory bean was
present, their conditions went on to reference classes from
spring-boot-jdbc or spring-boot-r2dbc. Both are optional dependencies
of spring-boot-devtools, so startup failed with a NoClassDefFoundError
when they were absent.

This commit adds a class from each module to the class conditions.
Without the modules the conditions could never match, so this only
turns the failure into a back-off.

See gh-51872

Signed-off-by: Kosuke Yanagihara <11373191+ksky8864@users.noreply.github.com>
2026-09-28 12:44:47 +02:00
Stéphane Nicoll 708a58c2cf Merge branch '4.0.x' into 4.1.x
Closes gh-51888
2026-09-28 12:42:30 +02:00
ohchanKyu 5e2730eb01 Recognize MARIADB_ALLOW_EMPTY_ROOT_PASSWORD in Docker Compose support
MariaDbEnvironment checked for MARIADB_ALLOW_EMPTY_PASSWORD, which the
official MariaDB image does not support. The documented variable is
MARIADB_ALLOW_EMPTY_ROOT_PASSWORD. As a result, a compose service that
used the documented variable started fine but Spring Boot failed with
"No MariaDB password found".

See gh-51870

Signed-off-by: ohchanKyu <okc0202@naver.com>
2026-09-28 12:41:32 +02:00
Stéphane Nicoll aecce0a0a5 Merge branch '4.0.x' into 4.1.x
Closes gh-51886
2026-09-28 11:23:16 +02:00
Hyunwoo Jung 032ed4eabf Fix actuator endpoint property names in Javadoc
See gh-51869

Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>
2026-09-28 11:21:22 +02:00
Stéphane Nicoll dda41fef36 Merge branch '4.0.x' into 4.1.x
Closes gh-51884
2026-09-28 11:07:14 +02:00
Tran Ngoc Nhan 3fe8d42485 Remove unnecessary cast to null
See gh-51850

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2026-09-28 10:54:13 +02:00
Stéphane Nicoll a2a08124f1 Merge branch '4.0.x' into 4.1.x
Closes gh-51877
2026-09-28 10:11:10 +02:00
Stéphane Nicoll a55d5985fc Polish contribution
See gh-51842
2026-09-28 10:06:38 +02:00
Dmitry Sulman ea72da3604 Apply auto-configured Kotlinx Serialization JSON codec customization
See gh-51842

Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
2026-09-28 10:05:53 +02:00
Phillip Webb caec174dee Merge branch '4.0.x' into 4.1.x
Closes gh-51865
2026-09-25 15:35:16 -07:00
itaekyung a0df183115 Enable nullability checking of spring-boot-jersey's tests
See gh-51861

Signed-off-by: itaekyung <taeyun1411@gmail.com>
2026-09-25 15:32:57 -07:00
Phillip Webb 9b531f1043 Merge branch '4.0.x' into 4.1.x
Closes gh-51828
2026-09-17 17:01:25 -07:00
HongJongMin 88ab24ff99 Enable nullability checking of spring-boot-batch-data-mongodb's tests
Signed-off-by: HongJongMin <gwa7417@gmail.com>

See gh-51780
2026-09-16 11:14:11 +01:00
Andy Wilkinson 6fe126afed Merge branch '4.0.x' into 4.1.x 2026-09-16 09:09:12 +01:00
Andy Wilkinson d9abd902f5 Revert "Merge pull request #51549 from aashikantkumar"
This reverts commit ad8f14e785, reversing
changes made to 1d79f56ad7.

See gh-51549
2026-09-16 09:08:23 +01:00
Hyun Lee fa8ecccc37 Apply cookie handling to reactive HttpComponents connector
The spring.http.clients.cookie-handling property and
HttpClientSettings.cookieHandling() were honored by every imperative
ClientHttpRequestFactoryBuilder and by the Jetty, JDK and Reactor
ClientHttpConnectorBuilders, but HttpComponentsHttpAsyncClientBuilder
ignored the setting. As a result, a WebClient backed by Apache
HttpComponents kept storing cookies even when cookie handling was
disabled.

Map the setting to the default request config's cookie spec, as
HttpComponentsHttpClientBuilder already does, and document the property
alongside the other global HTTP client settings.

See gh-51724

Signed-off-by: Hyun Lee <dlwhdugs4147@gmail.com>
2026-09-15 13:22:25 +01:00
Andy Wilkinson 7612f4a222 Merge branch '4.0.x' into 4.1.x
Closes gh-51763
2026-09-15 13:03:03 +01:00
Hyunwoo Jung ed63da9f5d Fix duplicated tests
Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>

See gh-51722
2026-09-15 12:48:22 +01:00
Stéphane Nicoll cd6efbd910 Merge branch '4.0.x' into 4.1.x
Closes gh-51730
2026-09-14 11:42:14 +02:00
Stéphane Nicoll 5c799bc0cf Polish "Fix detection of reactive web environments in DevTools"
See gh-51708
2026-09-14 11:34:05 +02:00
ohchanKyu f5b563934a Fix detection of reactive web environments in DevTools
DevToolsPropertyDefaultsPostProcessor looked for
ConfigurableReactiveWebEnvironment
in org.springframework.boot.web.reactive.context by name, but the class
moved to org.springframework.boot.web.context.reactive in 4.0. As a
result, reactive web applications were never identified as web
applications and the hint about setting logging.level.web to DEBUG was
not logged for them.

ConfigurableReactiveWebEnvironment is part of spring-boot, so it is now
referenced directly rather than by name. The servlet environment check
is unchanged as spring-web is an optional dependency.

See gh-51708

Signed-off-by: ohchanKyu <okc0202@naver.com>
2026-09-14 11:09:40 +02:00
Stéphane Nicoll 8b6a7863a9 Merge branch '4.0.x' into 4.1.x
Closes gh-51728
2026-09-14 10:58:39 +02:00
ohchanKyu 911c4a4326 Fix documented default of spring.test.database.replace
The default of @AutoConfigureTestDatabase's replace attribute changed
from ANY to NON_TEST in 3.4 but the manually declared metadata for
spring.test.database.replace still advertised "any" as the default.

See gh-51709

Signed-off-by: ohchanKyu <okc0202@naver.com>
2026-09-14 10:57:58 +02:00
Stéphane Nicoll 5c7eea8a84 Merge branch '4.0.x' into 4.1.x
Closes gh-51720
2026-09-13 17:21:20 +02:00
Tran Ngoc Nhan 338ac4b490 Remove unnecessary backtick in author tag
See gh-51719

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2026-09-13 17:14:27 +02:00
Andy Wilkinson 885720ae66 Merge branch '4.0.x' into 4.1.x
Closes gh-51667
2026-09-11 12:55:59 +01:00
Andy Wilkinson d08d6d053a Merge pull request #51666 from ohchanKyu
Closes gh-51666

* gh-51666:
  Polish "Use TLS port for Docker Compose RabbitMQ connection when SSL is configured"
  Use TLS port for Docker Compose RabbitMQ connection when SSL is configured
2026-09-11 12:47:17 +01:00
Andy Wilkinson 18295bf297 Polish "Use TLS port for Docker Compose RabbitMQ connection when SSL is configured"
See gh-51666

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-11 12:42:51 +01:00
ohchanKyu 458ed72f55 Use TLS port for Docker Compose RabbitMQ connection when SSL is configured
When a rabbitmq Docker Compose service has SSL bundle labels,
RabbitDockerComposeConnectionDetailsFactory created an SslBundle but
still resolved the address from container port 5672, the plain AMQP
listener. As the connection factory enables SSL when an SslBundle is
present, the TLS handshake was attempted against the non-TLS listener
and the connection failed.

The address is now resolved from container port 5671 when an SslBundle
is present, matching RabbitStreamDockerComposeConnectionDetailsFactory
and the Testcontainers-based RabbitContainerConnectionDetailsFactory.
The SSL integration test now opens a connection using the resolved
address and SslBundle so that it fails without this fix.

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

See gh-51666
2026-09-11 12:35:40 +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 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 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
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
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
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 60dc60c5f6 Merge branch '4.0.x' into 4.1.x
Closes gh-51616
2026-09-08 09:19:33 +01:00