Commit Graph

30096 Commits

Author SHA1 Message Date
Andy Wilkinson f944c49e31 Move persistence exception translation auto-config into tx module
Closes gh-46084
2025-07-01 11:58:30 +01:00
Andy Wilkinson 971acab9bb Create spring-boot-websocket module
Closes gh-46144
2025-07-01 11:58:28 +01:00
Andy Wilkinson 8e75b1dbc5 Move autoconfigure.container package into spring-boot-autoconfigure
See gh-46071
2025-07-01 11:58:24 +01:00
Andy Wilkinson f495e5e9d4 Move AOP auto-configuration into spring-boot-autoconfigure
See gh-46071
2025-07-01 11:58:24 +01:00
Andy Wilkinson 35818d1f70 Create spring-boot-netty module
Closes gh-46143
2025-07-01 11:58:23 +01:00
Andy Wilkinson c449158b2a Create spring-boot-reactor module
Closes gh-46142
2025-07-01 11:58:20 +01:00
Andy Wilkinson dc176e9dc2 Create spring-boot-graphql module
See gh-46141
2025-07-01 11:58:16 +01:00
Andy Wilkinson 4c688249e1 Create spring-boot-sql module
Closes gh-46140
2025-07-01 11:58:12 +01:00
Andy Wilkinson 7431a8e4eb Create spring-boot-session modules
See gh-46139
2025-07-01 11:58:09 +01:00
Andy Wilkinson cddad4a857 Create spring-boot-webflux module
See gh-46138
2025-07-01 11:58:05 +01:00
Andy Wilkinson 18a6f889f9 Create spring-boot-http-codec module
See gh-46119
2025-07-01 11:58:02 +01:00
Andy Wilkinson 47e08d7662 Create spring-boot-security-saml2 module
Closes gh-46137
2025-07-01 11:57:58 +01:00
Andy Wilkinson 877873e11c Create spring-boot-security-oauth2-authorization-server
Closes gh-46136
2025-07-01 11:57:55 +01:00
Andy Wilkinson 50c2823ba9 Create spring-boot-security-oauth2-resource-server module
Closes gh-46135
2025-07-01 11:57:51 +01:00
Andy Wilkinson 9eab3c926b Create spring-boot-security-oauth2-client module
Closes gh-46134
2025-07-01 11:57:48 +01:00
Andy Wilkinson c4af8095d3 Create spring-boot-security module
See gh-46133
2025-07-01 11:57:44 +01:00
Stéphane Nicoll 23e8b315fe Create spring-boot-cache module
See gh-46132
2025-07-01 11:57:41 +01:00
Stéphane Nicoll a4f9f35255 Create spring-boot-data-web module
See gh-46131
2025-07-01 11:57:37 +01:00
Stéphane Nicoll b70370da0b Create spring-boot-data-rest module
Closes gh-46130
2025-07-01 11:57:33 +01:00
Stéphane Nicoll c897e6e42d Create spring-boot-data-r2dbc module
Closes gh-46129
2025-07-01 11:57:30 +01:00
Stéphane Nicoll a8ba255379 Create spring-boot-data-jdbc module
Closes gh-46128
2025-07-01 11:57:27 +01:00
Stéphane Nicoll 051530cdd9 Create spring-boot-data-couchbase module
Closes gh-46127
2025-07-01 11:57:24 +01:00
Stéphane Nicoll 973ecd0913 Create spring-boot-data-redis module
See gh-46126
2025-07-01 11:57:20 +01:00
Andy Wilkinson 2b42f026b8 Create spring-boot-webservices module
Closes gh-46125
2025-07-01 11:57:16 +01:00
Andy Wilkinson 914eb653d0 Break the link between spring-boot-test and spring-boot-all
See gh-46071
2025-07-01 11:57:13 +01:00
Andy Wilkinson e3bb0c144c Create spring-boot-data-neo4j module
Closes gh-46124
2025-07-01 11:57:12 +01:00
Stéphane Nicoll 796aefa232 Create spring-boot-data-elasticsearch module
See gh-46123
2025-07-01 11:57:08 +01:00
Stéphane Nicoll 2d9ccff40a Create spring-boot-data-cassandra module
Closes gh-46122
2025-07-01 11:57:04 +01:00
Phillip Webb b7bf177353 Remove Thymeleaf from WelcomePageIntegrationTests
Closes gh-46110
2025-07-01 11:57:01 +01:00
Andy Wilkinson 9823b93ecf Create spring-boot-webmvc module
See gh-46121
2025-07-01 11:56:57 +01:00
Andy Wilkinson f25ab3e5ca Create spring-boot-http module
See gh-46118
See gh-46119
See gh-46120
2025-07-01 11:56:53 +01:00
Andy Wilkinson 45fb73e681 Create spring-boot-hateoas module
Closes gh-46117
2025-07-01 11:56:43 +01:00
Andy Wilkinson 7c13605b59 Create spring-boot-jersey module
See gh-46116
2025-07-01 11:56:39 +01:00
Andy Wilkinson 3fe58a2c39 Create spring-boot-data-mongodb module
See gh-46115
2025-07-01 11:56:35 +01:00
Andy Wilkinson 54e9da7ecd Create spring-boot-mongodb module
See gh-46114
2025-07-01 11:56:31 +01:00
Moritz Halbritter d7c21fb69b Create spring-boot-h2console module
Closes gh-46113
2025-07-01 11:56:27 +01:00
Moritz Halbritter c4e6d94f37 Create spring-boot-gson module
Closes gh-46112
2025-07-01 11:56:23 +01:00
Moritz Halbritter 9aff22d98f Create spring-boot-sendgrid module
Closes gh-46111
2025-07-01 11:56:20 +01:00
Moritz Halbritter 637ee8b7f2 Create spring-boot-thymeleaf module
See gh-46110
2025-07-01 11:56:17 +01:00
Stéphane Nicoll 9d8e9e0daf Create spring-boot-data-ldap module
Closes gh-46109
2025-07-01 11:56:14 +01:00
Stéphane Nicoll 3c4c644f52 Create spring-boot-ldap module
See gh-46108
2025-07-01 11:56:10 +01:00
Stéphane Nicoll ba445c5645 Create spring-boot-quartz module
See gh-46107
2025-07-01 11:56:06 +01:00
Stéphane Nicoll 5ffebc70e0 Create spring-boot-neo4j module
See gh-46106
2025-07-01 11:56:02 +01:00
Moritz Halbritter 66b07d7c9e Create spring-boot-mustache module
Closes gh-46105
2025-07-01 11:55:58 +01:00
Andy Wilkinson f50fdffc68 Create spring-boot-cassandra module
See gh-46104
2025-07-01 11:55:53 +01:00
Stéphane Nicoll feb953cf03 Create spring-boot-couchbase module
See gh-46103
2025-07-01 11:55:49 +01:00
Stéphane Nicoll 2186da3cb5 Create spring-boot-jooq module
Closes gh-46101
2025-07-01 11:55:39 +01:00
Andy Wilkinson 7dc1a09e4f Create spring-boot-batch module
See gh-46100
2025-07-01 11:55:35 +01:00
Stéphane Nicoll 322ff2b841 Create spring-boot-hazelcast module
See gh-46099
2025-07-01 11:55:31 +01:00
Andy Wilkinson 2bd1c1e98d Create spring-boot-integration module
See gh-46098
2025-07-01 11:55:27 +01:00
Andy Wilkinson d86d94be1b Create spring-boot-rsocket module
Closes gh-46097
2025-07-01 11:55:22 +01:00
Stéphane Nicoll cf752d3ae8 Create spring-boot-data-jpa module
Closes gh-46096
2025-07-01 11:55:18 +01:00
Stéphane Nicoll 1b816bd22d Create spring-boot-jpa module
See gh-46095
2025-07-01 11:55:13 +01:00
Andy Wilkinson 3140c4d924 Create spring-boot-r2dbc module
See gh-46094
2025-07-01 11:55:10 +01:00
Andy Wilkinson 937356330b Create spring-boot-pulsar module
See gh-46093
2025-07-01 11:55:06 +01:00
Andy Wilkinson 0850df50a9 Create spring-boot-kafka module
See gh-46092
2025-07-01 11:55:01 +01:00
Brian Clozel c7bcc3d64d Create spring-boot-elasticsearch module
See gh-46091
2025-07-01 11:54:57 +01:00
Moritz Halbritter 855b6a6fac Create spring-boot-freemarker module
Closes gh-46090
2025-07-01 11:54:52 +01:00
Phillip Webb 5659d2c8a2 Create spring-boot-groovy-templates module
Closes gh-46089
2025-07-01 11:54:48 +01:00
Phillip Webb 0f1c0d97d1 Create spring-boot-liquibase module
See gh-46088
2025-07-01 11:54:44 +01:00
Stéphane Nicoll 74f6c75b00 Create spring-boot-validation module
Closes gh-46087
2025-07-01 11:54:39 +01:00
Stéphane Nicoll 80933d86b4 Create spring-boot-flyway module
See gh-46086
2025-07-01 11:54:34 +01:00
Andy Wilkinson 3a90b32ac0 Pull up setDisableMBeanRegistry
Closes gh-44070
2025-07-01 11:54:29 +01:00
Andy Wilkinson 5addbc70e7 Create spring-boot-jdbc module
See gh-46085
2025-07-01 11:54:24 +01:00
Andy Wilkinson 67cb03b8b4 Create spring-boot-tx module
See gh-46084
2025-07-01 11:54:19 +01:00
Stéphane Nicoll 4acdc5ee7c Create spring-boot-artemis module
See gh-46083
2025-07-01 11:54:15 +01:00
Stéphane Nicoll fd13ac80e8 Create spring-boot-activemq module
See gh-46082
2025-07-01 11:54:10 +01:00
Stéphane Nicoll 11d1825154 Create spring-boot-jms module
See gh-46081
2025-07-01 11:54:06 +01:00
Andy Wilkinson 98baaf8b0e Move SQL packages from -all modules into corresponding non-all modules
See gh-46071
2025-07-01 11:54:02 +01:00
Brian Clozel 7471d01a72 Create spring-boot-jsonb module
Closes gh-46080
2025-07-01 11:54:01 +01:00
Brian Clozel cfabd67175 Create spring-boot-mail module
See gh-46079
2025-07-01 11:53:58 +01:00
Andy Wilkinson 6c89a6bcbe Create spring-boot-jackson-module
Closes gh-46078
2025-07-01 11:53:53 +01:00
Andy Wilkinson 1cb6a23cd5 Remove web concerns from template package and move out of -all
See gh-46071

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2025-07-01 11:53:49 +01:00
Andy Wilkinson 3f477c4b40 Separate R2DBC and JDBC database initialization
See gh-46071

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2025-07-01 11:53:49 +01:00
Brian Clozel dcf0eb36d3 Create spring-boot-amqp module
See gh-46077
2025-07-01 11:53:48 +01:00
Phillip Webb 4db4db347e Temporarily disable auto-configuration checks
Found auto-configuration class problems:
  - org.springframework.boot.actuate.autoconfigure.amqp.RabbitHealthContributorAutoConfiguration:
    - after 'org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration' is from an optional dependency and should be declared in afterName
  - org.springframework.boot.actuate.autoconfigure.metrics.amqp.RabbitMetricsAutoConfiguration:
    - after 'org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration' is from an optional dependency and should be declared in afterName

See gh-46071
2025-07-01 11:53:44 +01:00
Andy Wilkinson 760b80818f Create spring-boot-reactor-netty module
See gh-46076
2025-07-01 11:53:43 +01:00
Andy Wilkinson b8df90ad20 Create spring-boot-jetty module
See gh-46075
2025-07-01 11:53:39 +01:00
Andy Wilkinson 04b0590162 Create spring-boot-undertow module
See gh-46074
2025-07-01 11:53:35 +01:00
Andy Wilkinson a0b28610e5 Move Tomcat auto-configuration into spring-boot-tomcat
See gh-46073
2025-07-01 11:53:30 +01:00
Andy Wilkinson bc840b741d Move tests that use Tomcat out of spring-boot-all
See gh-46073
2025-07-01 11:53:26 +01:00
Andy Wilkinson 83b26a7362 Move tests that use Tomcat out of spring-boot-test
See gh-46073
2025-07-01 11:53:22 +01:00
Andy Wilkinson 693c27c6e3 Start splitting up spring-boot-autoconfigure
See gh-46071
2025-07-01 11:53:18 +01:00
Andy Wilkinson 6384e3265c Create beginnings of spring-boot-tomcat module
See gh-46073
2025-07-01 11:53:17 +01:00
Andy Wilkinson 71f74c7ee2 Start splitting up spring-boot
See gh-46071
2025-07-01 11:53:13 +01:00
Phillip Webb 5a1b6d2269 Reduce number of test dependencies
Reduce the number of direct test dependencies and instead rely on
transitive test support dependencies.

Closes gh-46072
2025-07-01 11:53:12 +01:00
Phillip Webb 61a89e994a Add useful transitive dependencies to spring-boot-test-support
Add more `api` dependencies to `spring-boot-test-support` to reduce
the number of test dependencies needing in sub-modules.

See gh-46072
2025-07-01 11:53:08 +01:00
Phillip Webb 2077e4f96e Split up BackgroundPreinitializer
Closes gh-44065
2025-07-01 11:53:04 +01:00
Andy Wilkinson 3c6eaa71c6 Move WebServer-specific properties out of ManagementServerProperties
Closes gh-44324
2025-07-01 11:53:00 +01:00
Andy Wilkinson fe288070cb Move server-specific properties out of ServerProperties
Closes gh-44064
2025-07-01 11:52:56 +01:00
Andy Wilkinson 4dff8ab081 Repackage web server classes
Closes gh-44286
Closes gh-44067
2025-07-01 11:52:51 +01:00
Andy Wilkinson ca8e70f330 Move server-specific knowledge out of general child context creation
Closes gh-44200
2025-07-01 11:52:43 +01:00
Andy Wilkinson 33ce2abf33 Move JerseyApplicationPath into a Jersey-specific package
Closes gh-44066
2025-07-01 11:52:38 +01:00
Stéphane Nicoll 999beea456 Merge branch '3.5.x'
Closes gh-46237
2025-07-01 11:17:39 +02:00
Stéphane Nicoll 596dd95108 Merge branch '3.4.x' into 3.5.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46236
2025-07-01 11:17:29 +02:00
Yanming Zhou 520f7abb9f Replace fully qualified class to import
See gh-46234

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-07-01 11:10:51 +02:00
Andy Wilkinson b6b570ebeb Merge branch '3.5.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
Run CodeQL Analysis / run-analysis (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Has been cancelled Details
Build and Deploy Snapshot / Trigger Docs Build (push) Has been cancelled Details
Build and Deploy Snapshot / Verify (push) Has been cancelled Details
Closes gh-46226
2025-06-27 16:04:08 +01:00
Andy Wilkinson 55fcad3498 Merge branch '3.4.x' into 3.5.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
Run CodeQL Analysis / run-analysis (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Has been cancelled Details
Build and Deploy Snapshot / Trigger Docs Build (push) Has been cancelled Details
Build and Deploy Snapshot / Verify (push) Has been cancelled Details
Closes gh-46225
2025-06-27 16:00:38 +01:00
Andy Wilkinson 5479f5c3d3 Make Hikari's pool accessible via reflection in a native image
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
Run CodeQL Analysis / run-analysis (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Has been cancelled Details
Build and Deploy Snapshot / Trigger Docs Build (push) Has been cancelled Details
Build and Deploy Snapshot / Verify (push) Has been cancelled Details
When it's inaccessible, the jdbc.connections.active and
jdbc.connections.idle metrics are lost.

Closes gh-46214
2025-06-27 15:52:54 +01:00
Stéphane Nicoll 3d6a6372c1 Merge branch '3.5.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46224
2025-06-27 13:01:20 +02:00
Stéphane Nicoll 8499888c74 Merge branch '3.4.x' into 3.5.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46223
2025-06-27 13:01:09 +02:00
Dmytro Nosan 67f380c2bc Add @EnabledOnLocale annotation for locale-based tests
Introduce @EnabledOnLocale annotation to enable or disable tests
based on the system's default locale.

See gh-46211

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-06-27 12:45:35 +02:00
Brian Clozel 3168b594fd Revert temporary workaround for HttpMessageConverters
Two additional issues were fixed in spring-projects/spring-framework#33894

* ordering of the multipart converter for server apps
* the classpath detection is now more static for GraalVM

Fixes gh-46221
2025-06-27 11:09:45 +02:00
Phillip Webb fd34f80bf1 Restore HttpMessageConverters ordering
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Temporarily add reordering logic to `HttpMessageConverters` to restore
the Spring Boot 3.5 order.

See gh-46221
2025-06-26 22:31:31 -07:00
Brian Clozel aae3df0cdc Adapt to HttpMessageConverters changes in Framework
See spring-projects/spring-framework#33894
2025-06-26 17:26:00 +02:00
Andy Wilkinson 741561d4ba Make sure elasticsearch-rest-client is on the classpath
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
9.0.3 of elasticsearch-java switched its dependency on
elasticsearch-rest-client from api to compileOnly so it is no longer
on the classpath of a consumer.

This commit reinstates the dependency so that our auto-configuration
of the RestClient still happens.

gh-46061 is tracking a switch to the new Rest5Client.

See gh-46207
2025-06-26 10:35:26 +01:00
Andy Wilkinson 19818fb844 Adapt to changes in Framework's Hibernate support
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
See gh-45487
2025-06-25 21:30:51 +01:00
Andy Wilkinson 414117ebac Upgrade to Elasticsearch Client 9.0.3
Closes gh-46207
2025-06-25 17:44:12 +01:00
Andy Wilkinson 350dec4e5e Merge branch '3.5.x' 2025-06-25 17:32:25 +01:00
Andy Wilkinson 4c414b9281 Tolerate Gradle 9's change of archive entry ordering
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
2025-06-25 17:07:41 +01:00
Andy Wilkinson bbcb31c140 Merge branch '3.5.x'
See gh-46206
2025-06-25 15:15:06 +01:00
Andy Wilkinson 5ae646ea01 Merge branch '3.4.x' into 3.5.x
See gh-46205
2025-06-25 15:14:45 +01:00
Andy Wilkinson 49fdc31532 Add jars that were missed due to .gitignore
See gh-46043
2025-06-25 15:14:04 +01:00
Andy Wilkinson 607baa9c64 Merge branch '3.5.x'
Closes gh-46206
2025-06-25 14:48:51 +01:00
Andy Wilkinson 0510f10b5d Merge branch '3.4.x' into 3.5.x
Closes gh-46205
2025-06-25 14:48:34 +01:00
Andy Wilkinson bdee9c9b19 Ensure consistent versions between dev and production classpaths
Prior to this change, versions in the dev and production classpaths
could differ. These differing versions could result in a transitive
dependency that should have been present in both development and
production only being present in the former. This would likely
result in failures at runtime.

This commit aligns the versions by adding constraints to the
production runtime classpath for each dependency in the runtime
classpath.

Closes gh-46043
2025-06-25 13:35:39 +01:00
Andy Wilkinson 1f03576647 Merge branch '3.5.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46204
2025-06-25 13:33:31 +01:00
Andy Wilkinson 822c2be5f9 Merge branch '3.4.x' into 3.5.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46203
2025-06-25 13:31:20 +01:00
Andy Wilkinson 640793c60e Streamline CRC and hash calculation when preparing stored entries
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46202
2025-06-25 13:31:04 +01:00
Andy Wilkinson ddf3984569 Upgrade to JUnit Jupiter 5.13.1
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46058
2025-06-24 20:09:19 +01:00
Phillip Webb fe049e6570 Merge branch '3.5.x'
Fixes gh-46197
2025-06-24 11:36:09 -07:00
Phillip Webb 6fe696b5cf Restore binding of system environment using legacy names
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Remove `Binder` optimization introduced in commit 8f14dca164 so that
legacy format names in environment variables can be used again.

Fixes gh-46184
2025-06-24 11:34:58 -07:00
Andy Wilkinson 1b1fa0b0a3 Merge branch '3.5.x' 2025-06-24 15:17:13 +01:00
Andy Wilkinson a06ce997a1 Test against Gradle 9.0.0-rc-1
See gh-43573
2025-06-24 15:16:25 +01:00
Andy Wilkinson 0d13264c81 Merge branch '3.5.x'
Closes gh-46195
2025-06-24 14:46:46 +01:00
Andy Wilkinson 07eaf82f29 Merge branch '3.4.x' into 3.5.x
Closes gh-46194
2025-06-24 14:46:28 +01:00
Andy Wilkinson 0932c4a1c6 Apply permissions consistently when creating uber jars and wars
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46193
2025-06-24 14:46:05 +01:00
Andy Wilkinson 2549159f3b Merge branch '3.5.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46189
2025-06-24 11:52:23 +01:00
Andy Wilkinson b1574da542 Merge branch '3.4.x' into 3.5.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46188
2025-06-24 11:52:13 +01:00
Andy Wilkinson a2067af1b3 Use version-spring-boot attribute to reference Spring Boot's version
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46187
2025-06-24 11:51:14 +01:00
Andy Wilkinson dcddff2d01 Merge branch '3.5.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46181
2025-06-23 20:33:18 +01:00
Andy Wilkinson e9033a81c7 Merge branch '3.4.x' into 3.5.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46180
2025-06-23 20:32:53 +01:00
Andy Wilkinson 1c404767c4 Make Servlet-specific customization back off without undertow-servlet
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46178
2025-06-23 20:31:24 +01:00
Phillip Webb ef1638e6e6 Merge branch '3.5.x'
Closes gh-46177
2025-06-23 10:37:45 -07:00
Phillip Webb cf6dd4b631 Merge branch '3.4.x' into 3.5.x
Closes gh-46176
2025-06-23 10:37:30 -07:00
Phillip Webb 2128a84492 Never attempt to resolve local address for nested URLs
Update `nested:` Handler to always return `null` from `getHostAddress`
in an attempt to improve performance on Windows.

Fixes gh-46063
2025-06-23 10:37:09 -07:00
Moritz Halbritter 0374587d1f Merge branch '3.5.x'
Closes gh-46175
2025-06-23 15:08:50 +02:00
Moritz Halbritter 250027d93e Merge branch '3.4.x' into 3.5.x
Closes gh-46174
2025-06-23 15:08:33 +02:00
Moritz Halbritter e2571a41bf Exclude ReactorAutoConfiguration from lazy initialization
Closes gh-45846
2025-06-23 14:58:47 +02:00
Stéphane Nicoll a13b40b882 Merge branch '3.5.x'
Closes gh-46173
2025-06-23 14:50:23 +02:00
Dmitry Sulman a8f11004e7 Add Logback Access Reactor Netty to community starters
See gh-46060

Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
2025-06-23 14:49:46 +02:00
Stéphane Nicoll 7e0d1647d1 Fix import
See gh-46064
2025-06-23 14:35:40 +02:00
Stéphane Nicoll f07e0dee96 Fix import
See gh-46064
2025-06-23 13:44:11 +02:00
Moritz Halbritter 402af1b343 Merge branch '3.5.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46171
2025-06-23 13:43:18 +02:00
Moritz Halbritter 4fad815743 Merge branch '3.4.x' into 3.5.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46170
2025-06-23 13:42:51 +02:00
Dmytro Nosan 4b7e3519c2 Exclude NettyAutoConfiguration from global lazy init
This commits registers LazyInitializationExcludeFilter to exclude
NettyAutoConfiguration from global lazy init.

See gh-46164

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-06-23 13:42:35 +02:00
Stéphane Nicoll 94afd9e2c5 Fix import 2025-06-23 13:40:28 +02:00
Stéphane Nicoll 1f1d663447 Merge branch '3.5.x'
Closes gh-46169
2025-06-23 13:38:44 +02:00
Stéphane Nicoll 73e4cccd8c Merge branch '3.4.x' into 3.5.x
Closes gh-46168
2025-06-23 13:34:59 +02:00
Stéphane Nicoll 399cee4b0e Polish "Fix issues with Kotlin examples in Antora docs"
See gh-46064
2025-06-23 13:32:37 +02:00
Dmitry Sulman eb9e2f19a8 Fix issues with Kotlin examples in Antora docs
See gh-46064

Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
2025-06-23 13:25:50 +02:00
Moritz Halbritter 7fd6f457df Merge branch '3.5.x'
Closes gh-46163
2025-06-23 10:33:41 +02:00
Moritz Halbritter e99c3a900f Merge branch '3.4.x' into 3.5.x
Closes gh-46011
2025-06-23 10:32:32 +02:00
Stéphane Nicoll a08e40d8d8 Merge branch '3.5.x'
Closes gh-46165
2025-06-23 10:17:00 +02:00
Tran Ngoc Nhan af0e7ace3e Adapt tests to run assertions on map in ContextPairsTests
See gh-46160

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-06-23 10:15:05 +02:00
Moritz Halbritter e661f6ec1b Use fixed clock when testing SslInfo
Closes gh-45573
2025-06-23 09:40:56 +02:00
Stéphane Nicoll 2982d0fa92 Upgrade to Maven Clean Plugin 3.5.0
Closes gh-46059
2025-06-21 17:40:02 +02:00
Stéphane Nicoll 7ea9c26446 Upgrade to Hibernate Validator 9.0.1.Final
Closes gh-46057
2025-06-21 15:52:39 +02:00
Stéphane Nicoll d74dece8b1 Upgrade to Hibernate 7.0.2.Final
Closes gh-46056
2025-06-21 15:52:38 +02:00
Stéphane Nicoll 2dd8f79699 Upgrade to Flyway 11.9.2
Closes gh-46055
2025-06-21 15:52:38 +02:00
Phillip Webb 3312979c77 Merge branch '3.5.x'
See gh-46067
2025-06-20 17:22:43 -07:00
Phillip Webb 61c2d0766b Merge branch '3.4.x' into 3.5.x
See gh-46066
2025-06-20 17:21:58 -07:00
Phillip Webb 3aeb18d618 Add license header to gradle files
See gh-46065
2025-06-20 17:20:50 -07:00
Phillip Webb ea2cf80311 Merge branch '3.5.x'
See gh-46067
2025-06-20 17:20:07 -07:00
Phillip Webb 198745fe4f Merge branch '3.4.x' into 3.5.x
See gh-46066
2025-06-20 17:19:38 -07:00
Phillip Webb 9863d3da66 Add license header to kotlin files
See gh-46065
2025-06-20 17:18:53 -07:00
Phillip Webb 509e7b5807 Merge branch '3.5.x'
See gh-46067
2025-06-20 17:18:19 -07:00
Phillip Webb bd9b1d2a25 Merge branch '3.4.x' into 3.5.x
See gh-46066
2025-06-20 17:18:02 -07:00
Phillip Webb 6cfc7196f4 Add license header to java files
See gh-46065
2025-06-20 17:17:39 -07:00
Phillip Webb 1bb1c13a61 Merge branch '3.5.x'
See gh-46067
2025-06-20 17:16:13 -07:00
Phillip Webb a37c84b7c5 Merge branch '3.4.x' into 3.5.x
See gh-46066
2025-06-20 17:14:59 -07:00
Phillip Webb d66b28fcba Update end copyright year to 'present'
See gh-46065
2025-06-20 17:12:38 -07:00
Stéphane Nicoll af926e2aef Restore behavior of TestImage with Elasticsearch
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
See gh-46052
2025-06-20 17:45:48 +02:00
Stéphane Nicoll 4aff06aa17 Polish "Upgrade to Elasticsearch 9.0.2"
CLoses gh-46052
2025-06-20 15:47:07 +02:00
Stéphane Nicoll fb43b65e23 Polish "Start building against Spring Data 2025.1.0-M4 snapshots"
See gh-46048
2025-06-20 14:30:06 +02:00
Brian Clozel 33f0b4012e Start building against Spring for GraphQL 2.0.0-M1 snapshots
See gh-46053
2025-06-20 12:55:44 +02:00
Stéphane Nicoll 5dc4af69a4 Start building against Spring Integration 7.0.0-M1 snapshots
See gh-46054
2025-06-20 12:37:34 +02:00
Stéphane Nicoll ccecd98b58 Upgrade to MongoDB 5.5.1
Closes gh-45866
2025-06-20 12:19:06 +02:00
Stéphane Nicoll 5cf190fec1 Upgrade to Elasticsearch 9.0.2
CLoses gh-46052
2025-06-20 12:19:06 +02:00
Stéphane Nicoll 04e58c998f Start building against Spring Data 2025.1.0-M4 snapshots
See gh-46048
2025-06-20 12:19:05 +02:00
Stéphane Nicoll b7a8d6447d Start building against Spring HATEOAS 3.0.0-M4 snapshots
See gh-46049
2025-06-20 12:00:39 +02:00
Stéphane Nicoll bb56f20e11 Start building against Spring AMQP 4.0.0-M3 snapshots
See gh-46047
2025-06-20 12:00:38 +02:00
Stéphane Nicoll 8077a0dfc3 Upgrade to Netty 4.2.2.Final
Closes gh-46050
2025-06-20 12:00:38 +02:00
Stéphane Nicoll 3ec9cee8cb Start building against Reactor 2025.0.0-M5 snapshots
See gh-46046
2025-06-20 11:40:31 +02:00
Stéphane Nicoll 710f00ff39 Prepare regular dependency upgrades
This commit syncs dependencies from 3.5.x and restores the use of the
"type: dependency-upgrade" label.

Closes gh-46045
2025-06-20 10:38:40 +02:00
Phillip Webb 920640be78 Merge branch 'main' into 4.0.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
2025-06-19 15:15:04 -07:00
Phillip Webb 18e5e0647d Merge branch '3.4.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46040
2025-06-19 15:14:35 -07:00
Phillip Webb cb9cf45b7f Restore previous source in Context.withSource calls
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Fix `Context.withSource` is the `Binder` to ensure that the previous
source is restored once the callback has completed.

This update is especially important in Spring Boot 3.5+ since indexed
binding calls `withSource` multiple times.

Fixes gh-46039
2025-06-19 15:12:52 -07:00
Phillip Webb d6e1828210 Merge branch 'main' into 4.0.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
2025-06-19 08:59:29 -07:00
Phillip Webb 7b553d9093 Protect against null names when filter is applied more than once
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Update `FilteredIterableConfigurationPropertiesSource` to fix a
regression caused by commit 8f14dca1 that occurs if the `filter()`
method is called on an already filtered source.

Fixes gh-46032
2025-06-19 08:57:55 -07:00
Andy Wilkinson 2bdd968742 Merge branch 'main' into 4.0.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
2025-06-19 08:55:43 +01:00
Andy Wilkinson 74fe4adcaf Upgrade to HttpClient5 5.5
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46031
2025-06-19 08:22:41 +01:00
Andy Wilkinson dba25d7d2c Merge branch 'main' into 4.0.x 2025-06-19 08:14:10 +01:00
Andy Wilkinson 98632a1f48 Merge branch '3.4.x'
Closes gh-46030
2025-06-19 08:13:54 +01:00
Andy Wilkinson 50e5bfe912 Align our Lettuce version with that of Spring Data Redis
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-45704
2025-06-19 08:12:01 +01:00
Stéphane Nicoll a1e758d09c Merge branch 'main' into 4.0.x 2025-06-19 08:13:44 +02:00
Stéphane Nicoll 02f31f1ce2 Upgrade to Testcontainers 1.21.2
Closes gh-46029
2025-06-19 08:09:02 +02:00
Phillip Webb 4e8d711bc4 Merge branch 'main' into 4.0.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
2025-06-18 13:47:33 -07:00
Phillip Webb 8fcd4c6ece Merge branch '3.4.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46028
2025-06-18 13:47:16 -07:00
Phillip Webb aa4bf73464 Merge branch '3.3.x' into 3.4.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46027
2025-06-18 13:46:56 -07:00
Phillip Webb 206785f838 Only cache JarFile URL keys that are cheap to lookup
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Update `JarFileUrlKey` so that only URLs that have a cheap `equals()`
method call are cached. This should prevent expensive DNS lookups from
being performed.

Fixes gh-46015
2025-06-18 13:46:31 -07:00
Andy Wilkinson 29dcf4d504 Merge branch 'main' into 4.0.x 2025-06-18 17:39:19 +01:00
Andy Wilkinson e525837c88 Merge branch '3.4.x'
Closes gh-46021
2025-06-18 17:39:07 +01:00
Andy Wilkinson 95a569987f Merge branch '3.3.x' into 3.4.x
Closes gh-46020
2025-06-18 17:38:57 +01:00
Andy Wilkinson 9c09bf859e Merge branch 'main' into 4.0.x 2025-06-18 17:38:20 +01:00
Andy Wilkinson d1ebe43805 Merge branch '3.4.x'
Closes gh-46019
2025-06-18 17:38:08 +01:00
Andy Wilkinson 7560e38adf Merge branch '3.3.x' into 3.4.x
Closes gh-46018
2025-06-18 17:37:52 +01:00
David LJ f4e04227f7 Fix Docker security options broken link in OCI images packaging docs
See gh-46016

Signed-off-by: David LJ <mail@davidlj95.com>
2025-06-18 17:36:55 +01:00
Andy Wilkinson bab9071539 Revert "Work around Spring Framework cache pollution bug"
This reverts commit 4af0ee20d1.

Closes gh-45984
2025-06-18 16:10:05 +01:00
Stéphane Nicoll f6c88840e0 Upgrade to Spring Integration 6.3.11
Closes gh-45756
2025-06-18 14:16:04 +02:00
Moritz Halbritter f16da46233 Merge branch 'main' into 4.0.x 2025-06-18 13:34:16 +02:00
Moritz Halbritter a6798172c6 Merge branch '3.4.x'
Closes gh-46009
2025-06-18 13:34:04 +02:00
Moritz Halbritter d4db78987c Merge branch '3.3.x' into 3.4.x
Closes gh-46008
2025-06-18 13:33:54 +02:00
Moritz Halbritter 6ef1830bc8 Document that /error is secured by default
Closes gh-45663
2025-06-18 13:33:38 +02:00
Andy Wilkinson 00b5970666 Polish 6de3c1ce9d 2025-06-18 10:15:25 +01:00
Moritz Halbritter 8f5045b2a1 Merge branch 'main' into 4.0.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
2025-06-18 11:07:47 +02:00
Moritz Halbritter ac50eb73db Merge branch '3.4.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-46006
2025-06-18 11:07:21 +02:00
Moritz Halbritter 498df4939f Remove unused JKS privateKeyPassword property from Couchbase
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-45883
2025-06-18 11:06:53 +02:00
Andy Wilkinson 6de3c1ce9d Merge branch 'main' into 4.0.x 2025-06-18 09:56:27 +01:00
Andy Wilkinson fa81ecddc1 Merge branch '3.4.x'
Closes gh-45872
2025-06-18 09:56:06 +01:00
Andy Wilkinson b6d8e72891 Merge branch '3.3.x' into 3.4.x
Closes gh-45870
2025-06-18 09:54:24 +01:00
Andy Wilkinson d9e4b66eee Add properties for new max part count and max part header size
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
To address CVE-2025-48976 and CVE-2025-48988, Tomcat 10.1.42 has
introduced two new configuration settings – maxPartCount and
maxPartHeaderSize. The default values for these configuration
settings have proven hard to get right and some applications have
had to increase the default limits. To ease their configuration in
Spring Boot, this commit introduces configuration properties for
the new settings:

-  server.tomcat.max-part-count (maxPartCount)
-  server.tomcat.max-part-header-size (maxPartHeaderSize)

The defaults are aligned with those of Tomcat 10.1.42
(10 and 512 bytes respectively).

Closes gh-45869
2025-06-18 09:46:09 +01:00
Moritz Halbritter 80b1f9cc8b Merge branch 'main' into 4.0.x 2025-06-18 10:23:39 +02:00
Moritz Halbritter 01cb25e7a4 Merge branch '3.4.x'
Closes gh-46005
2025-06-18 10:23:31 +02:00
Moritz Halbritter 84e0db53b3 Merge branch '3.3.x' into 3.4.x
Closes gh-46004
2025-06-18 10:23:19 +02:00
Moritz Halbritter 0f77dcb402 Use system properties to detect OpenJ9 JVMs when doing heapdumps
Closes gh-45973
2025-06-18 10:16:25 +02:00
Moritz Halbritter 4d349ec9d2 Merge branch 'main' into 4.0.x 2025-06-18 09:58:10 +02:00
Moritz Halbritter 86f736b677 Merge branch '3.4.x'
Closes gh-46002
2025-06-18 09:58:01 +02:00
Johnny Lim c6ba46c120 Polish gh-45721
See gh-46001

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-06-18 09:55:45 +02:00
Phillip Webb 486d0e9635 Merge branch 'main' into 4.0.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
2025-06-17 12:33:22 -07:00
Phillip Webb ad0f08f8a2 Polish 'Improve binding performance of 'local.management.port' property source'
See gh-45968
2025-06-17 12:32:13 -07:00
tanruian d5464a44f0 Improve binding performance of 'local.management.port' property source
Update `ManagementContextAutoConfiguration` to use an immutable
`EnumerablePropertySource` to provide better property binding
performance.

See gh-45968

Signed-off-by: tanruian <tanruiantra@qq.com>
2025-06-17 12:32:12 -07:00
Phillip Webb 8f14dca164 Restore IndexedElementsBinder knownIndexedChildren checking logic
Restore knownIndexedChildren logic in IndexedElementsBinder to that of
Spring Boot 3.4, effectively reverting commit 93113a415f.

The performance improvements unfortunately caused the unwanted
side-effect of no longer checking the all indexed elements were fully
bound. Performance was also actually reduced for non iterable property
sources that used deeply nested structures.

In order to keep some performance improvements, the updated code
also makes the following changes:

* A `Set` is used rather than `LinkedMultiValueMap` for tracking. The
  full list of unbound properties are now only calculated when the
  exception is thrown.

* If possible, the source is filtered early and passed down for child
  element binding. This should help reduce repeated full scans of
  all configuration property names.

* The `FilteredIterableConfigurationPropertiesSource` has been optimized
  for immutable `SpringIterableConfigurationPropertySource` use.

Fixes gh-45994
See gh-45970
See gh-44867
2025-06-17 12:32:12 -07:00
Andy Wilkinson 7057388d23 Merge branch 'main' into 4.0.x 2025-06-17 20:06:53 +01:00
Andy Wilkinson 34a8f3773d Merge branch '3.4.x'
Closes gh-46000
2025-06-17 20:06:38 +01:00
Andy Wilkinson 8893f4c18b Merge branch '3.3.x' into 3.4.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-45999
2025-06-17 20:05:53 +01:00
Andy Wilkinson c13dc92286 Test against Gradle 7.6.5
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-45998
2025-06-17 20:05:03 +01:00
Stéphane Nicoll 2f1c7be451 Upgrade to Spring Session 3.5.1
Closes gh-45787
2025-06-17 20:32:59 +02:00
Stéphane Nicoll da66949792 Upgrade to Spring Kafka 3.3.7
Closes gh-45782
2025-06-17 20:32:59 +02:00
Stéphane Nicoll 575a25d678 Upgrade to Spring Authorization Server 1.5.1
Closes gh-45779
2025-06-17 20:32:59 +02:00
Stéphane Nicoll 23b011760d Upgrade to Spring WS 4.0.15
Closes gh-45775
2025-06-17 20:31:54 +02:00
Stéphane Nicoll e4609284ce Upgrade to Spring Session 3.4.4
Closes gh-45774
2025-06-17 20:31:54 +02:00
Stéphane Nicoll 77e27b758a Upgrade to Spring Kafka 3.3.7
Closes gh-45769
2025-06-17 20:31:54 +02:00
Stéphane Nicoll 7b8b18b964 Upgrade to Spring Authorization Server 1.4.4
Closes gh-45766
2025-06-17 20:31:54 +02:00
Stéphane Nicoll c96d674ffb Upgrade to Spring WS 4.0.15
Closes gh-45762
2025-06-17 20:31:46 +02:00
Stéphane Nicoll 0d9fc6d069 Upgrade to Spring Kafka 3.2.10
Closes gh-45757
2025-06-17 20:31:46 +02:00
Stéphane Nicoll cf5a3b9bab Upgrade to Spring Authorization Server 1.3.7
Closes gh-45753
2025-06-17 20:31:46 +02:00
Andy Wilkinson fdda5ea821 Merge branch 'main' into 4.0.x 2025-06-17 19:31:32 +01:00
Andy Wilkinson 82f9491a74 Improve description of TestRestTemplate's Apache client defaults
Closes gh-45842
2025-06-17 19:30:16 +01:00
Andy Wilkinson b48b1ddc83 Merge branch 'main' into 4.0.x 2025-06-17 19:19:38 +01:00