Commit Graph
763 Commits
Author SHA1 Message Date
Andy Wilkinson ef1f4e2fa2 Merge branch '4.0.x'
Closes gh-48700
2026-01-08 12:01:09 +00:00
Andy Wilkinson 9bd1a460a1 Correct packaging of test code
Closes gh-48699
2026-01-08 11:43:43 +00:00
Phillip Webb d3bb525bc9 Merge branch '4.0.x'
Closes gh-48696
2026-01-07 17:47:19 -08:00
Phillip Webb 70ce043f80 Bind HttpServiceClientProperties directly
Update `HttpServiceClientProperties` to use direct binding rather than
using `@ConfigurationProperties`. The prevents metadata and IDE issues
and also allows the class API to be simplified.

Closes gh-48616
2026-01-07 17:39:56 -08:00
Andy Wilkinson 86330d8402 Merge branch '4.0.x'
Closes gh-48689
2026-01-07 09:27:15 +00:00
Andy Wilkinson 19be9b648f Remove unnecessary jetty-ee11-servlets dependency
Closes gh-48677
2026-01-07 09:21:30 +00:00
Andy Wilkinson 96865d341d Improve how system requirements config affects Eclipse
See gh-48684
2026-01-07 08:53:05 +00:00
Phillip Webb 7af5e6e244 Merge branch '4.0.x'
Closes gh-48687
2026-01-06 13:37:26 -08:00
Phillip Webb 72aea01732 Make spring-boot-security module optional from spring-boot-cloudfoundry
Fixes gh-48685
2026-01-06 13:36:31 -08:00
Phillip Webb c66ad70311 Merge branch '4.0.x' 2026-01-06 13:24:16 -08:00
Phillip Webb 581f648c3c Fix Assertions static imports
See gh-48630
2026-01-06 13:23:46 -08:00
Phillip Webb dad1ca5e95 Merge branch '4.0.x' 2026-01-06 12:54:30 -08:00
Phillip Webb a4f35688aa Merge branch '3.5.x' into 4.0.x 2026-01-06 12:54:11 -08:00
Andy Wilkinson 56928bbe38 Upgrade to jOOQ 3.20 and require Java 21 to use it
Closes gh-48619
2026-01-06 13:03:11 +00:00
Stéphane Nicoll 82cb083869 Merge branch '4.0.x'
Closes gh-48683
2026-01-06 12:36:06 +01:00
Stéphane Nicoll 2e2981bfe4 Merge branch '3.5.x' into 4.0.x
Closes gh-48682
2026-01-06 12:35:34 +01:00
Phillip Webb 21cf377f7e Add 'WAR_SOURCE_DIRECTORY' environment variable support
Add an escape hatch for users that deviate from the standard
`src/main/webbapp` directory structure.

Fixes gh-23829
2026-01-05 16:44:45 -08:00
Stéphane Nicoll 3e8df5d901 Merge branch '4.0.x'
Closes gh-48660
2026-01-02 14:03:07 +01:00
Stéphane Nicoll cb1596e8c8 Merge branch '3.5.x' into 4.0.x
Closes gh-48659
2026-01-02 14:02:59 +01:00
Stéphane Nicoll 754a3aa2ab Merge branch '4.0.x'
Closes gh-48654
2025-12-31 17:13:18 +01:00
Stéphane Nicoll 1f4a8dff98 Restore RANDOM_PORT handing in tests with a separate management port
This commit fixes a regression where RANDOM_PORT was no longer honored
if a defined management port is set. Due to the modularization efforts,
the code has moved from an EnvironmentPostProcessor to an
ApplicationListener. Unfortunately, the listener is registered too
late to handle the event it is listening to. While the event type could
have been changed, the listener was added on the ApplicationContext
which are not honored before the ApplicationContext is in a state to be
used.

The contract of ContextCustomizerFactory is already giving us everything
we need. While the environment is post-processed later than we would
like, it is still post-processed before the refresh state so that the
additional property is honored.

This commit also adds an integration test to cover this scenario.

Closes gh-48653
2025-12-31 17:10:39 +01:00
Stéphane Nicoll 12652a313e Deprecate Derby support since Apache Derby is retired
Closes gh-48567
2025-12-30 17:36:53 +01:00
Brian Clozel 9d1db6830f Fix message converter customizers order
Prior to this commit, gh-48310 separated client and server message
converter configurations by switching from message converter instances
as beans in the application context, to server/client customizers that
are applied to the `HttpMessageConverters` instances while being built.

This change did not order the new ClientHttpMessageConvertersCustomizer
or ServerHttpMessageConvertersCustomizer, letting those being at the
"lowest precedence" default. As customizers, this means they are applied
last and custom instances cannot take over.

This commit ensures that such customizers provided by Spring Boot are
now ordered at "0" to let applications ones take over.

Fixes gh-48635
2025-12-29 14:39:43 +01:00
Brian Clozel 3948e7c4da Fix message converter customizers order
Prior to this commit, gh-48310 separated client and server message
converter configurations by switching from message converter instances
as beans in the application context, to server/client customizers that
are applied to the `HttpMessageConverters` instances while being built.

This change did not order the new ClientHttpMessageConvertersCustomizer
or ServerHttpMessageConvertersCustomizer, letting those being at the
"lowest precedence" default. As customizers, this means they are applied
last and custom instances cannot take over.

This commit ensures that such customizers provided by Spring Boot are
now ordered at "0" to let applications ones take over.

Fixes gh-48609
2025-12-29 13:41:12 +01:00
Stéphane Nicoll 4fd2dc50cb Merge branch '4.0.x'
Closes gh-48633
2025-12-29 13:15:48 +01:00
Stéphane Nicoll 22d6f6a7de Allow a custom JsonFactory to be used with JsonMapper.Builder
This commit improves the auto-configuration of the JSonMapper.Builder
to accept a custom JsonFactory if a bean of this type is present.

Closes gh-48594
2025-12-29 13:11:03 +01:00
Stéphane Nicoll c2b20009cc Merge branch '4.0.x'
Closes gh-48626
2025-12-27 10:09:21 +01:00
Stéphane Nicoll 2c55ccfa7f Provide Micrometer's observation test with micrometer test modules
Closes gh-48386
2025-12-27 10:05:32 +01:00
Stéphane Nicoll 916c1fd3ff Merge branch '4.0.x'
Closes gh-48623
2025-12-26 09:02:21 +01:00
Stéphane Nicoll 9b7451ed9d Merge branch '3.5.x' into 4.0.x
Closes gh-48622
2025-12-26 09:01:59 +01:00
Stéphane Nicoll 54fc77b51f Prevent default WebServiceMessageFactory to be created
This commit improves the builder to provide the message factory upfront
rather than setting it after the WebServiceTemplate has been
instantiated.

By providing the factory upfront (if it is set), it prevents the
default strategy to be created first to be then erased by the custom
factory.

Closes gh-48615
2025-12-24 14:51:00 +01:00
Stéphane Nicoll 5399793faf Reinstate Spock support
Closes gh-48513
2025-12-19 15:31:59 +01:00
Andy Wilkinson dfd41a6b9f Polish "Add LDAPS support to embedded LDAP server"
See gh-48315
2025-12-19 11:26:02 +00:00
CatiaCorreia 0934edf556 Add LDAPS support to embedded LDAP server
Signed-off-by: CatiaCorreia <catia.correia97@gmail.com>

See gh-48315
2025-12-19 11:25:52 +00:00
Stéphane Nicoll 46f653504b Polish "Use Charset instead of String for Mustache templates support"
This replaces the use of charset name for our Mustache support.

See gh-48347
2025-12-19 12:21:55 +01:00
djlee 0ac7068f9d Use Charset instead of String for Mustache templates support
The MustacheResourceTemplateLoader previously defined the template
encoding as a String, defaulting to "UTF-8". This change replaces the
field with a Charset and initializes it with StandardCharsets.UTF_8.

Using Charset improves type safety and aligns with modern Spring Boot
standards, while avoiding implicit charset lookup issues.

See gh-48347

Signed-off-by: djlee <ddongjunn@gmail.com>
2025-12-19 12:21:55 +01:00
Stéphane Nicoll d0fed0ea6b Fix formatting
See gh-47802
2025-12-19 11:58:02 +01:00
Moritz Halbritter b3a4ddbbfd Merge branch '4.0.x'
Closes gh-48586
2025-12-19 11:55:28 +01:00
Moritz Halbritter 77807f53ee Add dependency to spring-boot-opentelemetry module
Closes gh-48585
2025-12-19 11:53:14 +01:00
Stéphane Nicoll e3ae9100c6 Polish "Associate MeterConventions for JVM and system metrics"
See gh-47935
2025-12-19 11:48:25 +01:00
Dmytro Nosan 8abff71009 Associate MeterConventions for JVM and system metrics
This commit auto-configures the following beans with their corresponding
conventions, when available:

- ProcessorMetrics with JvmCpuMeterConventions
- JvmMemoryMetrics with JvmMemoryMeterConventions
- JvmThreadMetrics with JvmThreadMeterConventions
- ClassLoaderMetrics with JvmClassLoadingMeterConventions

See gh-47935

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-12-19 11:48:25 +01:00
Stéphane Nicoll 9602be20aa Polish contribution
See gh-47802
2025-12-19 11:46:52 +01:00
Lansana DIOMANDE b8cefd2b9c Add support for configuring additional PersistenceUnitPostProcessor
See gh-47802

Signed-off-by: Lansana DIOMANDE <lansana.diomande@epfedu.fr>
2025-12-19 11:46:51 +01:00
Stéphane Nicoll 30a56c2de9 Polish "Add support for configuring SimpleMessageListenerContainer"
See gh-47716
2025-12-19 11:42:48 +01:00
Vedran Pavic 98d843214b Add support for configuring SimpleMessageListenerContainer
This commit introduces a `SimpleJmsListenerContainerFactoryConfigurer`
that can be used to conveniently apply settings provided
by JMS auto-configuration to `SimpleJmsListenerContainerFactory`
instances.

See gh-47716

Signed-off-by: Vedran Pavic <vedran@vedranpavic.com>
2025-12-19 11:42:48 +01:00
Moritz Halbritter ce1efb02a1 Back off if spring-boot-micrometer-observation or spring-boot-micrometer-metrics is missing
Closes gh-48581
2025-12-19 11:25:32 +01:00
Stéphane Nicoll d489aa685c Polish "Update AOT tests to fail if deprecated code is not suppressed"
Include use of API that has been marked for removal.

See gh-48566
2025-12-17 15:41:26 +01:00
Stéphane Nicoll 8e895b3bc0 Update AOT tests to fail if deprecated code is not suppressed
Closes gh-48566
2025-12-17 15:30:44 +01:00
Stéphane Nicoll 15eaa461b2 Merge branch '3.5.x' 2025-12-17 15:01:27 +01:00
Craig Andrews f9f276bd46 JdbcSessionAutoConfiguration after DataSourceAutoConfiguration
JdbcSessionAutoConfiguration is conditional on the DataSource bean
which won't exist until after DataSourceAutoConfiguration; therefore,
JdbcSessionAutoConfiguration must auto-configure after
DataSourceAutoConfiguration.

Signed-off-by: Craig Andrews <candrews@integralblue.com>

See gh-48552
2025-12-17 10:32:41 +00:00