Commit Graph
100 Commits
Author SHA1 Message Date
Andy Wilkinson 3d6671d47a Merge branch '4.0.x'
Closes gh-48701
2026-01-08 12:14:50 +00:00
Andy Wilkinson ef1f4e2fa2 Merge branch '4.0.x'
Closes gh-48700
2026-01-08 12:01:09 +00:00
Andy Wilkinson 0ffffee4bf Upgrade to Nullability Plugin 0.0.9
Closes gh-48638
2026-01-08 11:59:51 +00:00
Andy Wilkinson 9bd1a460a1 Correct packaging of test code
Closes gh-48699
2026-01-08 11:43:43 +00:00
Andy Wilkinson 5edd5213ac Merge branch '4.0.x'
Closes gh-48693
2026-01-07 12:19:29 +00:00
Andy Wilkinson a7122b0ece Merge branch '3.5.x' into 4.0.x
Closes gh-48691
2026-01-07 12:04:22 +00:00
Andy Wilkinson 40ab604d15 Move CloudFoundryVcapEnvironmentPostProcessorTests to correct package
Closes gh-48690
2026-01-07 11:43:56 +00: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 b8b1373f2e Document that jOOQ support requires Java 21
See gh-48619
2026-01-07 08:53:06 +00:00
Andy Wilkinson 96865d341d Improve how system requirements config affects Eclipse
See gh-48684
2026-01-07 08:53:05 +00: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
Andy Wilkinson a749b2fd58 Allow projects to configure their system requirements
Closes gh-48684
2026-01-06 12:31:23 +00:00
Andy Wilkinson 66ba20555e Merge pull request #48315 from CatiaCorreia
* gh-48315:
  Polish "Add LDAPS support to embedded LDAP server"
  Add LDAPS support to embedded LDAP server

Closes gh-48315
2025-12-19 11:26:09 +00:00
Andy Wilkinson dfd41a6b9f Polish "Add LDAPS support to embedded LDAP server"
See gh-48315
2025-12-19 11:26:02 +00:00
Andy Wilkinson 613c40b86b Next development version (v4.0.2-SNAPSHOT) 2025-12-18 17:57:31 +00:00
Andy Wilkinson 252b218ac9 Correct renaming of Kotlinx Serialization JSON starters
Closes gh-48262
2025-12-18 14:42:24 +00:00
Andy Wilkinson eea16211d8 Upgrade to Spring Batch 6.0.1
Closes gh-48437
2025-12-17 12:07:37 +00:00
Andy Wilkinson da7641a7de Merge pull request #48552 from candrews
* gh-48552:
  JdbcSessionAutoConfiguration after DataSourceAutoConfiguration

Closes gh-48552
2025-12-17 10:32:47 +00:00
Andy Wilkinson 404ab717e2 Upgrade to Log4j2 2.25.3
Closes gh-48551
2025-12-16 16:19:51 +00:00
Andy WilkinsonandChristoph Strobl 1a4426a369 Temporarily add hints needed for Hibernate 7.2
See gh-48518

Co-Authored-By: Christoph Strobl <christoph.strobl@broadcom.com>
2025-12-16 12:15:27 +00:00
Andy Wilkinson 495467dca6 Make OTLP logging connection details back off
Previously, the connection details would only back off if another
PropertiesOtlpLoggingConnectionDetails was defined. This commit
corrects this so that they will back of if any
OtlpLoggingConnectionDetails implementation is defined as a bean.

Closes gh-48536
2025-12-16 08:42:18 +00:00
Andy Wilkinson 4c3d232f45 Upgrade to Hibernate 7.2.0.Final
Closes gh-48518
2025-12-15 17:30:56 +00:00
Andy Wilkinson 7b0abcbdb2 Decouple Session auto-configuration from ServerProperties
Fixes gh-48493
2025-12-11 15:34:22 +00:00
Andy Wilkinson 2930849e77 Upgrade to MongoDB 5.6.2
Closes gh-48501
2025-12-11 15:34:02 +00:00
Andy Wilkinson 3873f25eee Merge branch '3.5.x'
Closes gh-48500
2025-12-11 14:57:29 +00:00
Andy Wilkinson 5400539ba8 Merge branch '3.4.x' into 3.5.x
Closes gh-48499
2025-12-11 14:57:11 +00:00
Andy Wilkinson f64042b337 Remove duplicate @Configuration from test config class hierarchies
Closes gh-48498
2025-12-11 14:56:40 +00:00
Andy Wilkinson ed6e2e3965 Merge branch '3.5.x' 2025-12-08 11:51:08 +00:00
Andy Wilkinson abe596cf2c Merge branch '3.4.x' into 3.5.x
Closes gh-48450
2025-12-08 11:50:41 +00:00
Andy Wilkinson 0cb86e1627 Tolerate multiple calls to UndertowWebServer.destroy()
Undertow's DeploymentManagerImpl is not idempotent. Calling undeploy()
multiple times will result in an NPE. Similarly, calling start() or
stop() after undeploy() will also result in an NPE.

This commit protects against this by checking that the deployment
manager's state is not UNDEPLOYED before calling stop() and
undeploy().

Fixes gh-48446
2025-12-08 11:49:53 +00:00
Andy Wilkinson 8a2f25e6b1 Merge branch '3.5.x'
Closes gh-48373
2025-12-02 08:11:29 +00:00
Andy Wilkinson dd586f516b Merge branch '3.4.x' into 3.5.x
Closes gh-48372
2025-12-02 08:11:18 +00:00
Andy Wilkinson 69b7914564 Upgrade to Spring Boot Release Verification 0.0.15
Closes gh-48371
2025-12-02 08:10:38 +00:00
Andy Wilkinson c1e4375049 Merge branch '3.5.x'
Closes gh-48360
2025-12-01 12:01:30 +00:00
Andy Wilkinson 3e0c1a66c3 Merge branch '3.4.x' into 3.5.x
Closes gh-48359
2025-12-01 11:59:13 +00:00
Andy Wilkinson c4df126d75 Document need for aspectjweaver dependency
Closes gh-48358
2025-12-01 11:58:24 +00:00
Andy Wilkinson 2e80fe6e78 Merge pull request #48357 from hktechn0
* gh-48357:
  Change annotation from ConfigurationPropertiesScan to ConfigurationPropertiesSource

Closes gh-48357
2025-12-01 11:43:27 +00:00
Andy Wilkinson e1d85b3678 Apply default property inclusion to content
Previously, the setting was only applied to values. This worked
for POJOs but had no effect on maps.

Fixes gh-48343
2025-12-01 10:57:11 +00:00
Andy Wilkinson c6c6ff0103 Merge branch '3.5.x'
Closes gh-48328
2025-11-28 10:09:05 +00:00
Andy Wilkinson 625abc5282 Merge branch '3.4.x' into 3.5.x
Closes gh-48326
2025-11-28 10:02:36 +00:00
Andy Wilkinson 9eab00727d Merge pull request #48320 from youngledo
* gh-48320:
  Set the version to 'unknown' when redis_version is missing

Closes gh-48320
2025-11-28 09:55:15 +00:00
Andy Wilkinson 7946f0e831 Merge branch '3.5.x'
Closes gh-48325
2025-11-28 09:44:43 +00:00
Andy Wilkinson 7f2ffca789 Merge branch '3.4.x' into 3.5.x
Closes gh-48324
2025-11-28 09:42:28 +00:00
Andy Wilkinson 8becf59d34 Merge pull request #48319 from berry120
* gh-48319:
  Polish "Stop closing parent's MeterRegistry beans when child context closes"
  Stop closing parent's MeterRegistry beans when child context closes

Closes gh-48319
2025-11-28 09:42:10 +00:00
Andy Wilkinson e65baba3a7 Polish "Stop closing parent's MeterRegistry beans when child context closes"
See gh-48319
2025-11-28 09:26:29 +00:00
Andy Wilkinson c3e51d32b8 Allow a JwtTypeValidator bean to override Security's default
A change in Spring Security [1] means that type validation is now
performed by default by Spring Security. A breaking side-effect of
this is that setting validateTypes to false no longer has an effect
and the default JwtTypeValidator is still present. Its presence,
wrapped in a DelegatingOAuth2TokenValidator, prevents a user's
JwtTypeValidator bean from being used for type validation.

This commit updates Boot's auto-configuration to change how the
type validators are created. We avoid wrapping in a
DelegatingOAuth2TokenValidator so that the user's custom
JwtTypeValidator can be detected and used in place of the default.
This requires us to create the JwtIssuerValidator rather than using
the createDefaultWithIssuer method as it does not allow additional
validators to be provided.

Fixes gh-48301

[1] https://github.com/spring-projects/spring-security/commit/6d3b54df21ec0cffc30c8b3e0784220bd117a87d
2025-11-27 14:18:10 +00:00
Andy Wilkinson 46f22b2374 Polish NativeImageRequirementsNotMetException
Closes gh-48307
2025-11-26 15:31:48 +00:00
Andy Wilkinson b5703eaa4c Merge branch '3.5.x'
Closes gh-48300
2025-11-26 12:43:51 +00:00
Andy Wilkinson bd6049dde6 Merge pull request #48295 from arey
* gh-48295:
  Update references for RestTemplateBuilder and Customizer

Closes gh-48295
2025-11-26 10:58:02 +00:00
Andy Wilkinson 7b1b834fce Merge branch '3.4.x' into 3.5.x
Closes gh-48299
2025-11-26 10:45:02 +00:00
Andy Wilkinson 710e567ba5 Check javadoc macros in adoc files
Closes gh-48298
2025-11-26 10:41:49 +00:00
Andy Wilkinson cf1ecca81c Add missing spring-boot-restclient for Docker-based test
See gh-48253
2025-11-25 15:30:48 +00:00
Andy Wilkinson 3e82ede609 Require spring-boot-restclient dependency to use TestRestTemplate
Previously, spring-boot-restclient was a required dependency of
spring-boot-resttestclient. This had the unwanted side-effect of
increasing the risk of the test classpath enabling auto-configuration
for RestClient.Builder when it was main code that needed such a bean.
This could lead to integration tests passing but the application
itself failing to start when its run through its main method.

This commit makes spring-boot-restclient an optional dependency of
spring-boot-resttestclient. As a result, a dependency on
spring-boot-resttestclient is no longer sufficient to auto-configure
a RestClient.Builder bean, although it is still sufficient to
auto-configure a RestTestClient bean.

Those that wish to use TestRestTemplate rather than migrating to
RestTestClient will now have to add a dependency on
spring-boot-restclient. This makes it presence more obvious. It now
has to be declared directly rather than being somewhat hidden due to
being pulled in transitively. The hope is that this will reduce the
chances of the dependency being accidentially on the test classpath
when main code requires it to be on the runtime classpath.

Fixes gh-48253
2025-11-25 14:38:33 +00:00
Andy Wilkinson 635e331587 Mention using AutoConfigureRestTestClient in a WebMvcTest
Closes gh-47948
2025-11-24 14:15:38 +00:00
Andy Wilkinson 5f52a77480 Merge branch '3.5.x'
Closes gh-48269
2025-11-24 12:04:40 +00:00
Andy Wilkinson b72628c0ff Merge branch '3.4.x' into 3.5.x
Closes gh-48268
2025-11-24 12:03:20 +00:00
Andy Wilkinson 780b412415 Upgrade to actions/checkout@v6
Closes gh-48267
2025-11-24 12:02:29 +00:00
Andy Wilkinson 1761ff0ff4 Clarify Batch docs on the need for a DataSource and DB-based repository
Closes gh-48233
2025-11-24 11:41:17 +00:00
Andy Wilkinson 4d3e374ad1 Merge branch '3.5.x'
Closes gh-48266
2025-11-24 11:30:45 +00:00
Andy Wilkinson a30efc8e0a Merge branch '3.4.x' into 3.5.x
Closes gh-48265
2025-11-24 11:23:22 +00:00
Andy Wilkinson 835199c9e8 Clarify effects of @EnableBatchProcessing
Closes gh-48264
2025-11-24 11:22:50 +00:00
Andy Wilkinson 04ba4120a4 Document need for JdbcDialect bean with Sring Data JDBC and AOT
Closes gh-48240
2025-11-24 10:55:56 +00:00
Andy Wilkinson 4b8db9b630 Fix problems with auto-configuration architecture checks
Closes gh-48216
2025-11-21 16:57:56 +00:00
Andy Wilkinson 85bbbc99ad Merge branch '3.5.x'
Closes gh-48229
2025-11-21 16:54:25 +00:00
Andy Wilkinson 01d93513c7 Merge branch '3.4.x' into 3.5.x
Closes gh-48226
2025-11-21 16:47:11 +00:00
Andy Wilkinson 40453e76f0 Merge branch '3.5.x'
Closes gh-48228
2025-11-21 16:47:00 +00:00
Andy Wilkinson 7459fe0163 Merge branch '3.4.x' into 3.5.x
Closes gh-48227
2025-11-21 16:46:26 +00:00
Andy Wilkinson 859606ae13 Split architecture checks by language as well as source set
Closes gh-48224
2025-11-21 16:44:54 +00:00
Andy Wilkinson fc8f9a322d Annotation Kotlin auto-config examples with @AutoConfiguration
Closes gh-48220
2025-11-21 16:44:54 +00:00
Andy Wilkinson 0884005212 Generate individual modules' javadoc without web fonts
Closes gh-48208
2025-11-20 19:57:14 +00:00
Andy Wilkinson 34879288f9 Merge branch '3.5.x'
Closes gh-48205
2025-11-20 14:20:03 +00:00
Andy Wilkinson 29b8e96978 Switch make-default in preparation for Spring Boot 4.0.0
Closes gh-48203
2025-11-20 14:17:57 +00:00
Andy Wilkinson 88da0ddb94 Merge branch '3.5.x' 2025-11-20 14:17:00 +00:00
Andy Wilkinson 56feeaa9a0 Next development version (v3.5.9-SNAPSHOT) 2025-11-20 14:16:24 +00:00
Andy Wilkinson 3becdc7d47 Move server.error properties to spring.web.error
Closes gh-48201
2025-11-20 11:55:23 +00:00
Andy Wilkinson 75da8b80ec Align restclient-test properties with module's name
Closes gh-48193
2025-11-20 09:20:02 +00:00
Andy Wilkinson 331e9bcbf7 Remove metadata for previously deleted property
Closes gh-48199
2025-11-20 09:15:42 +00:00
Andy Wilkinson 81ec7aeb70 Fix clashing bean name with JsonTest and Jacksons 2 and 3
Fixes gh-48198
2025-11-20 09:14:46 +00:00
Andy Wilkinson 7f15cc827b Upgrade to Spring RESTDocs 4.0.0
Closes gh-47831
2025-11-19 14:46:39 +00:00
Andy Wilkinson b1d78efbf3 Merge branch '3.5.x'
Closes gh-48174
2025-11-18 16:40:47 +00:00
Andy Wilkinson 45f4da7eef Merge branch '3.4.x' into 3.5.x
Closes gh-48173
2025-11-18 16:40:36 +00:00
Andy Wilkinson aecdff1bbd Merge pull request #48172 from dependabot[bot]
* gh-48172:
  Bump js-yaml from 4.1.0 to 4.1.1 in /antora

Closes gh-48172
2025-11-18 16:40:23 +00:00
Andy Wilkinson 3d8c439091 Upgrade to Gradle 9.2.1
Closes gh-48167
2025-11-18 12:29:23 +00:00
Andy Wilkinson 7f6c00d52a Stop throwing PortInUseException for unassignable address
Fixes gh-47618
2025-11-17 11:33:34 -08:00
Andy Wilkinson 781035b409 Remove import of deleted auto-configuration class
See gh-47848
2025-11-14 11:14:36 +00:00
Andy Wilkinson 1fac16773d Upgrade to Elasticsearch Client 9.2.1
Closes gh-48137
2025-11-14 09:47:34 +00:00
Andy Wilkinson e6f6ee78da Move ReactiveElasticsearchClient auto-config to correct module
Closes gh-47848
2025-11-14 09:39:46 +00:00
Andy Wilkinson 8a52f4931b Merge branch '3.5.x'
Closes gh-48136
2025-11-14 09:10:21 +00:00
Andy Wilkinson bbedd1b5f2 Merge branch '3.4.x' into 3.5.x
Closes gh-48135
2025-11-14 09:09:23 +00:00
Andy Wilkinson 79a99eead5 Merge pull request #48125 from K-jun98
* gh-48125:
  Optimize StringBuilder initialization in CorrelationIdFormatter

Closes gh-48125
2025-11-14 09:01:24 +00:00
Andy Wilkinson b65fe6520a Merge branch '3.5.x'
Closes gh-48134
2025-11-14 08:57:57 +00:00
Andy Wilkinson 8494df1809 Merge branch '3.4.x' into 3.5.x
Closes gh-48133
2025-11-14 08:57:43 +00:00
Andy Wilkinson fe07ad8e51 Merge pull request #48124 from K-jun98
* gh-48124:
  Fix typo in PortInUseException Javadoc

Closes gh-48124
2025-11-14 08:57:34 +00:00
Andy Wilkinson 3a913ef480 Merge branch '3.5.x'
Closes gh-48131
2025-11-14 08:08:08 +00:00
Andy Wilkinson 2f1f964a2a Merge branch '3.4.x' into 3.5.x
Closes gh-48130
2025-11-14 08:07:51 +00:00
Andy Wilkinson afa2af1cf6 Correct docs on when setter is not needed with JavaBean binding
The two main changes are:

- A setter is no longer required when binding from a
  comma-separated list as long as the target list is mutable. The
  binder clears the list and then re-populates it.
- A setter is now required for arrays, previously the values
  coming from configuration properties where merged into an existing
  array. Now, the array is replaced.

Closes gh-43138
2025-11-14 08:07:41 +00:00
Andy Wilkinson 083a0a68af Polish "Add since to deprecations in config metadata JSON files"
This restores properties that were accidentally removed in the
changes for gh-48122.
2025-11-13 15:17:29 +00:00
Andy Wilkinson 5281f5c6bc Merge branch '3.5.x'
The issue had already been fixed in 4.0 as part of the nullability
work. As such, this commit doesn't fix anything. It does, however,
merge forward a test and makes some stylistic changes to the code so
that it's aligned with the same code in 3.5.x and 3.4.x
2025-11-13 14:06:46 +00:00
Andy Wilkinson 91cb68bd17 Merge branch '3.4.x' into 3.5.x
Closes gh-48123
2025-11-13 13:57:08 +00:00