Commit Graph

28688 Commits

Author SHA1 Message Date
Stéphane Nicoll be608631f9 Merge branch '3.4.x'
Closes gh-44842
2025-03-21 16:44:23 +01:00
Stéphane Nicoll 7368b34d85 Merge branch '3.3.x' into 3.4.x
Closes gh-44841
2025-03-21 16:44:16 +01:00
Stéphane Nicoll f94418dd6d Remove outdated classpath exclusions on Hazelcast client
Hazelcast client is no longer shipped as a separate JAR so the exclusion
doesn't do anything.

Closes gh-44835
2025-03-21 16:40:11 +01:00
Stéphane Nicoll 520d3431a9 Merge branch '3.4.x'
Closes gh-44840
2025-03-21 16:37:42 +01:00
Stéphane Nicoll ac7d921d87 Merge branch '3.3.x' into 3.4.x
Closes gh-44839
2025-03-21 16:37:32 +01:00
Stéphane Nicoll ced7eff799 Relocate JpaWebAutoConfigurationTests
Closes gh-44834
2025-03-21 16:29:19 +01:00
Moritz Halbritter 1bdb7dae41 Auto-configure Otel's MeterProvider where appropriate
Closes gh-44833
2025-03-21 14:18:29 +01:00
Yanming Zhou 509a790721 Polish
See gh-44814

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-03-21 08:32:34 +01:00
Stéphane Nicoll 09e19fdb9b Merge branch '3.4.x'
Closes gh-44829
2025-03-21 08:30:04 +01:00
Stéphane Nicoll 6280767870 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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], 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-44828
2025-03-21 08:29:28 +01:00
Stéphane Nicoll 1a608b7005 Add Yanming to the list of contributors
See gh-44800
2025-03-21 08:14:17 +01:00
Yanming Zhou 81db52063a Polishing BatchAutoConfigurationTests
1. Rename `TestConfiguration` to `TestJpaConfiguration` and remove unnecessary reference.
2. Use `withBean` instead of `withUserConfiguration` to avoid new configuration class.
3. Use kebab-case for configuration key

See gh-44800

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-03-21 08:12:45 +01:00
Stéphane Nicoll 07f8c47b59 Merge branch '3.4.x'
Closes gh-44827
2025-03-21 08:09:10 +01:00
Stéphane Nicoll 3460c0d19f Merge branch '3.3.x' into 3.4.x
Closes gh-44826
2025-03-21 08:09:01 +01:00
Stéphane Nicoll 28f8e3812b Fix code format
See gh-44787
2025-03-21 08:01:06 +01:00
Michael Yan 78b9eca670 Polish javadoc of SpringProfileAction
See gh-44787

Signed-off-by: Michael Yan <rain@rainboyan.com>
2025-03-21 07:59:35 +01:00
Stéphane Nicoll c2e4793b05 Merge branch '3.3.x' into 3.4.x
Closes gh-44823
2025-03-21 07:57:16 +01:00
Michael Yan 45a99f9e5a Remove extra whitespace in logback defaults.xml
See gh-44786

Signed-off-by: Michael Yan <rain@rainboyan.com>
2025-03-21 07:55:14 +01:00
Stéphane Nicoll 03d26e1410 Merge branch '3.4.x'
Closes gh-44822
2025-03-21 07:53:56 +01:00
Stéphane Nicoll ca61652edc Merge branch '3.3.x' into 3.4.x
Closes gh-44821
2025-03-21 07:53:51 +01:00
Stéphane Nicoll 3ea272ac2a Rewrite 2nd level cache to use ehcache
Closes gh-44809
2025-03-21 07:53:48 +01:00
Stéphane Nicoll 515ce3d44d Merge branch '3.4.x'
Closes gh-44820
2025-03-21 07:53:37 +01:00
Stéphane Nicoll c39226b7a7 Merge branch '3.3.x' into 3.4.x
Closes gh-44819
2025-03-21 07:53:32 +01:00
Stéphane Nicoll 9091f3f58f Make link to DataSourceAutoConfiguration explicit
This commit updates DataSourceTransactionManagerAutoConfiguration to
explicitly states it should run after DataSourceAutoConfiguration.

Closes gh-44810
2025-03-21 07:53:30 +01:00
Stéphane Nicoll 1f526d6136 Merge branch '3.4.x'
Closes gh-44818
2025-03-21 07:53:17 +01:00
Stéphane Nicoll 7d409f704c Merge branch '3.3.x' into 3.4.x
Closes gh-44817
2025-03-21 07:53:10 +01:00
Stéphane Nicoll 7733551e0b Stop relying on JPA entities from another module in tests
Closes gh-44804
2025-03-21 07:53:08 +01:00
Brian Clozel acb2465566 Add keep-alive property for GraphQL SSE handlers
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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], 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
This commit adds a new `spring.graphql.http.sse.keep-alive`
configuration property for MVC and WebFlux SSE handlers.

Closes gh-44743
2025-03-20 17:00:37 +01:00
Andy Wilkinson 95d5e35ff2 Provide @ConditionalOn… annotations for all concrete conditions
Closes gh-41044
2025-03-20 14:29:59 +00:00
Andy Wilkinson 6367074829 Polish "Add support for omitting SameSite attribute from session cookie"
See gh-44714
2025-03-20 12:52:01 +00:00
Filip Hrisafov ccbc4f91ec Add support for omitting SameSite attribute from session cookie
See gh-44714

Signed-off-by: Filip Hrisafov <filip.hrisafov@gmail.com>
2025-03-20 12:44:05 +00:00
Abel Salgado Romero 1ac039dbe5 Update org.cyclonedx.bom version in docs 2.2.0
See gh-44753

Signed-off-by: Abel Salgado Romero <abel.salgado@broadcom.com>
2025-03-20 12:41:33 +00:00
Yanming Zhou 7af7820a64 Auto-configu Batch to use JobsParametersConverter bean when available
See gh-44799

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-03-20 12:27:14 +00:00
Andy Wilkinson adae2e1946 Polish "Allow to configure validateTransactionState for Spring Batch"
See gh-44803
2025-03-20 12:14:12 +00:00
Yanming Zhou f4a9236e01 Allow to configure validateTransactionState for Spring Batch
See gh-44803

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-03-20 12:07:57 +00:00
Andy Wilkinson 4a2c26eeec Upgrade to Spring Batch 5.2.2
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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], 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-44591
2025-03-19 17:50:26 +00:00
Andy Wilkinson f86a6fb164 Upgrade to Spring Batch 5.2.2
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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], 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-44568
2025-03-19 17:48:56 +00:00
Andy Wilkinson b5628295da Upgrade to WebJars Locator Lite 1.1.0
Closes gh-44785
2025-03-19 09:29:59 +00:00
Andy Wilkinson 2b503650cf Upgrade to Spring WS 4.1.0-M1
Closes gh-44599
2025-03-19 09:29:59 +00:00
Andy Wilkinson fbd5dab421 Upgrade to Spring Security 6.5.0-M3
Closes gh-44598
2025-03-19 09:29:59 +00:00
Andy Wilkinson 9f3549a74c Upgrade to Spring Kafka 3.3.4
Closes gh-44595
2025-03-19 09:29:58 +00:00
Andy Wilkinson c10eea278f Upgrade to Spring Integration 6.5.0-M3
Closes gh-44594
2025-03-19 09:29:58 +00:00
Andy Wilkinson da8f3810ab Upgrade to Spring GraphQL 1.4.0-M1
Closes gh-44593
2025-03-19 09:29:58 +00:00
Andy Wilkinson b75fda2309 Upgrade to Spring Authorization Server 1.5.0-M2
Closes gh-44590
2025-03-19 09:29:58 +00:00
Andy Wilkinson c172372dc2 Upgrade to OpenTelemetry 1.48.0
Closes gh-44784
2025-03-19 09:29:58 +00:00
Andy Wilkinson bc79b35019 Upgrade to MSSQL JDBC 12.10.0.jre11
Closes gh-44783
2025-03-19 09:29:58 +00:00
Andy Wilkinson 02f82775a5 Upgrade to Logback 1.5.18
Closes gh-44781
2025-03-19 09:29:57 +00:00
Andy Wilkinson b60194441e Upgrade to JUnit Jupiter 5.12.1
Closes gh-44780
2025-03-19 09:29:57 +00:00
Andy Wilkinson 3d650e4ccf Upgrade to Jetty 12.0.18
Closes gh-44779
2025-03-19 09:29:57 +00:00
Andy Wilkinson 07efdb31f0 Upgrade to Flyway 11.4.0
Closes gh-44778
2025-03-19 09:29:57 +00:00
Andy Wilkinson 8dc58f06c7 Upgrade to Artemis 2.40.0
Closes gh-44777
2025-03-19 09:29:57 +00:00
Moritz Halbritter cb3874fdbe Merge branch '3.4.x' 2025-03-19 09:51:02 +01:00
Moritz Halbritter 6567609cbc 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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], 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
2025-03-19 09:49:43 +01:00
Moritz Halbritter 80b6c59669 Improve debuggability of DockerComposeTestExtension
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:22], 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:22], 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
2025-03-19 09:42:22 +01:00
Moritz Halbritter 6b9cd873ca Use gvenzl/oracle-free:23.6-slim which has ARM64 support
See gh-35249
2025-03-19 09:22:58 +01:00
Andy Wilkinson a4a88d910c Upgrade to Spring WS 4.0.12
Closes gh-44573
2025-03-19 08:08:15 +00:00
Andy Wilkinson 089ce80b81 Upgrade to Spring Security 6.4.4
Closes gh-44572
2025-03-19 08:08:15 +00:00
Andy Wilkinson 6dc824a963 Upgrade to Spring Kafka 3.3.4
Closes gh-44570
2025-03-19 08:08:14 +00:00
Andy Wilkinson bd70c5deef Upgrade to Spring Integration 6.4.3
Closes gh-44776
2025-03-19 08:08:14 +00:00
Andy Wilkinson f6bd6dcf8e Upgrade to Logback 1.5.18
Closes gh-44775
2025-03-19 08:08:14 +00:00
Andy Wilkinson 2f68799c58 Upgrade to Jetty 12.0.18
Closes gh-44774
2025-03-19 08:08:14 +00:00
Andy Wilkinson 7970c26888 Upgrade to Jetty Reactive HTTPClient 4.0.9
Closes gh-44773
2025-03-19 07:59:14 +00:00
Andy Wilkinson 5f11a6d42e Upgrade to Spring WS 4.0.12
Closes gh-44564
2025-03-19 07:40:12 +00:00
Andy Wilkinson bffbf84354 Upgrade to Spring Security 6.3.8
Closes gh-44563
2025-03-19 07:40:12 +00:00
Andy Wilkinson 2fdbc037b1 Upgrade to Spring Kafka 3.2.8
Closes gh-44772
2025-03-19 07:40:12 +00:00
Andy Wilkinson a8e91fd885 Upgrade to Spring Integration 6.3.9
Closes gh-44771
2025-03-19 07:40:12 +00:00
Andy Wilkinson ee901486dc Upgrade to Logback 1.5.18
Closes gh-44770
2025-03-19 07:40:11 +00:00
Andy Wilkinson afce8b9a10 Upgrade to Jetty 12.0.18
Closes gh-44769
2025-03-19 07:40:11 +00:00
Andy Wilkinson a3a6a5ead9 Upgrade to Jetty Reactive HTTPClient 4.0.9
Closes gh-44768
2025-03-19 07:39:09 +00:00
Andy Wilkinson 73b999e68d 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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], 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-44766
2025-03-18 19:26:59 +00:00
Andy Wilkinson 7ec8112721 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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], 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-44764
2025-03-18 19:26:48 +00:00
Andy Wilkinson 6105c5e50f Polish javadoc of SqlR2dbcScriptDatabaseInitializer
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:22], 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:22], 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-44763
2025-03-18 19:26:14 +00:00
Andy Wilkinson b6136a7bfd Merge branch '3.4.x'
Closes gh-44762
2025-03-18 19:21:04 +00:00
Andy Wilkinson e237390e66 Ignore prototype DataSource beans for metrics and health
Previously, if a prototype DataSource bean was defined, Actuator's
metrics and health would try to access an instance of it. At best
this was wasteful as the new instance would only be used for metrics
and health and would not be indicative of the app's DataSource usage.
At worst, it could cause a failure in the unusual case of the
prototype bean definition requiring arguments to be supplied using
ObjectProvider.getObject(Object...) or the like.

This commit address the problem by ignoring prototype DataSource
for metrics and health.

Other types of beans for which Actuator provides metrics and health
are similarly affected. They have not be fixed here as the situation
is so unusual. Should another problem arise in the future, it can be
addressed at that time when there's a clear need.

Closes gh-44706
2025-03-18 19:10:45 +00:00
Stéphane Nicoll fe163d3a9c 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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], 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-44760
2025-03-18 15:26:47 +01:00
Stéphane Nicoll 4dea97141c 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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], 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-44759
2025-03-18 15:25:57 +01:00
Stéphane Nicoll 08b2c560dd Order dependencies
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:22], 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:22], 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-44757
2025-03-18 15:22:26 +01:00
Moritz Halbritter c0b74480ab Merge branch '3.4.x'
Closes gh-44756
2025-03-18 14:03:55 +01:00
Moritz Halbritter c2075bf8e0 Document support for Java 24
Closes gh-44754
2025-03-18 14:00:14 +01:00
Moritz Halbritter b956754e8e Remove readonly flags from mojo parameters
Closes gh-43699
2025-03-18 13:10:11 +01:00
Brian Clozel 39a18948bd Remove TraceId HTTP response header 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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], 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-44752
2025-03-18 10:30:32 +01:00
Stéphane Nicoll 93d6caf7f9 Merge branch '3.4.x'
Closes gh-44751
2025-03-18 09:53:51 +01:00
Stéphane Nicoll 9515c6fb43 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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], 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-44750
2025-03-18 09:53:43 +01:00
Stéphane Nicoll 19de2263e2 Udate copyright year of changed file
See gh-44747
2025-03-18 09:50:20 +01:00
Yanming Zhou aa72f4d553 Remove workaround for Java Records in tests
See gh-44747

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-03-18 09:48:42 +01:00
Stéphane Nicoll e35a499b9e Merge branch '3.4.x'
Closes gh-44749
2025-03-18 09:48:13 +01:00
Stéphane Nicoll 274e2ed1ea Merge branch '3.3.x' into 3.4.x
Closes gh-44748
2025-03-18 09:48:04 +01:00
Tran Ngoc Nhan 5909d1e919 Remove redhat architect guide link
See gh-44724

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-03-18 09:47:39 +01:00
Stéphane Nicoll e728c76702 Upgrade to Spring Pulsar 1.2.4
Closes gh-44597
2025-03-17 17:54:43 +01:00
Stéphane Nicoll a425574001 Upgrade to Spring LDAP 3.3.0-M3
Closes gh-44596
2025-03-17 17:54:43 +01:00
Stéphane Nicoll 2f16b17e1d Upgrade to Spring AMQP 3.2.4
Closes gh-44742
2025-03-17 17:54:42 +01:00
Stéphane Nicoll 881f9ecc8a Upgrade to Hibernate 6.6.11.Final
Closes gh-44741
2025-03-17 17:54:38 +01:00
Stéphane Nicoll 928d61f864 Upgrade to Spring Pulsar 1.2.4
Closes gh-44571
2025-03-17 17:41:34 +01:00
Stéphane Nicoll e91da7be51 Upgrade to Spring AMQP 3.2.4
Closes gh-44740
2025-03-17 17:41:34 +01:00
Stéphane Nicoll 55b035bcf5 Upgrade to Hibernate 6.6.11.Final
Closes gh-44739
2025-03-17 17:41:29 +01:00
Stéphane Nicoll a0146f2f83 Upgrade to Spring Pulsar 1.1.10
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:22], 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:22], 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-44562
2025-03-17 17:39:15 +01:00
Stéphane Nicoll 2a5083c9ac Upgrade to Spring AMQP 3.1.10
Closes gh-44738
2025-03-17 17:39:15 +01:00
Andy Wilkinson be97e79ad6 Rationalize Groovy Template configuration properties
Previously, spring.groovy.template.configuration properties were
bound directly to GroovyMarkupConfigurer. This meant that the
properties had no description or default values in the metadata.
It also resulted in some duplicate where a specific
spring.groovy.template property was also provided.

This commit deprecates the spring.groovy.template.configuration.*
properties in favour of specific spring.groovy.template.* properties
that are mapped to the GroovyMarkupConfigurer.

Closes gh-44722
2025-03-17 16:03:34 +00:00
Stéphane Nicoll abc43894c7 Merge branch '3.4.x' 2025-03-17 16:06:38 +01:00
Stéphane Nicoll 0f7d46a992 Polish "Stop relying on broker's auto-configuration"
See gh-44735
2025-03-17 16:06:12 +01:00
Stéphane Nicoll b639f3759b Merge branch '3.4.x'
Closes gh-44736
2025-03-17 15:56:01 +01:00
Stéphane Nicoll aec59c7369 Merge branch '3.3.x' into 3.4.x
Closes gh-44735
2025-03-17 15:55:54 +01:00
Stéphane Nicoll bf4fface23 Stop relying on broker's auto-configuration
This commit isolates JmsAutoConfiguration tests so that they do not
rely on an actual broker. Some tests that are no longer relevant have
been adapted as well.

Closes gh-44734
2025-03-17 15:50:34 +01:00
Stéphane Nicoll d0cdae2369 Align nativeTest to native to make it multi-modules friendly
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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], 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
This commit harmonizes the behavior of the native and nativeTest Maven
profiles. Previously, enabling the nativeTest profile would
automatically add an execution of the Spring Boot and Native Build Tools
plugins, even in a module that doesn't represent an application or a
Spring Boot-related module.

With this commit, the native testing feature is only enabled if the
plugins are defined in the project, either directly, or in a parent.

The documentation has been updated as the behavior of both profiles is
now much more consistent.

Closes gh-44696
2025-03-17 11:32:35 +01:00
Jonatan Ivanov 97e71b7507 Add GarbageCollectorInfo to MemoryInfo
See gh-44704
2025-03-17 09:09:29 +01:00
Stéphane Nicoll 8daf7323c3 Merge branch '3.4.x'
Closes gh-44730
2025-03-17 09:02:23 +01:00
Stéphane Nicoll 0ca4be2d52 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[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run 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:false version:22], 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:22], 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-44729
2025-03-17 09:02:00 +01:00
Stéphane Nicoll 6ec6132cc2 Update copyright year of changed files
See gh-44725
2025-03-17 09:01:35 +01:00
Yanming Zhou fa9c1f0c41 Polish usage of @ConfigurationProperties
See gh-44725

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-03-17 09:01:08 +01:00
Moritz Halbritter 6d2fb65340 Merge branch '3.4.x'
Closes gh-44728
2025-03-17 08:55:25 +01:00
Moritz Halbritter 01719c41fa Merge branch '3.3.x' into 3.4.x
Closes gh-44727
2025-03-17 08:55:16 +01:00
youngjin_dev a164dab25d Fix Integer conversion in getProgress() method
See gh-44718

Signed-off-by: youngjin_dev <qazkyj0310@gmail.com>
2025-03-17 08:52:15 +01:00
Phillip Webb 951e7abfbc Merge branch '3.4.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (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:false version:22], 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:22], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], 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:23], map[id:windows-latest name:Windows]) (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
2025-03-14 17:24:51 -07:00
Phillip Webb 14e00c0c75 Merge branch '3.3.x' into 3.4.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true 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[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (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:false version:22], 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:22], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], 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:23], map[id:windows-latest name:Windows]) (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
2025-03-14 17:24:26 -07:00
Phillip Webb 109e4c8572 Update copyright year of changed files
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: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
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:22], 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:22], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], 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:23], map[id:windows-latest name:Windows]) (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
2025-03-14 17:24:06 -07:00
Phillip Webb 2e0f6f87d8 Merge branch '3.4.x' 2025-03-14 15:44:29 -07:00
Phillip Webb 5d688502ae Polish 2025-03-14 15:44:23 -07:00
Phillip Webb a55a6be4ed Merge branch '3.4.x' 2025-03-14 15:15:33 -07:00
Phillip Webb 6eb7d3411b Merge branch '3.3.x' into 3.4.x 2025-03-14 15:14:30 -07:00
Phillip Webb 896b5767fe Polish 2025-03-14 13:36:04 -07:00
Stéphane Nicoll 611a46cd81 Upgrade to Spring Data Bom 2025.0.0-M2
Closes gh-44592
2025-03-14 17:06:32 +01:00
Stéphane Nicoll e851832efe Upgrade to Spring Data Bom 2024.1.4
Closes gh-44569
2025-03-14 17:04:33 +01:00
Stéphane Nicoll 4c5ceb8c33 Upgrade to AspectJ 1.9.23
Closes gh-44720
2025-03-14 17:04:33 +01:00
Stéphane Nicoll 2d6eb6618b Upgrade to Spring Data Bom 2024.0.10
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:22], 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:22], 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-44561
2025-03-14 16:59:43 +01:00
Stéphane Nicoll e90e6355ed Upgrade to AspectJ 1.9.23
Closes gh-44719
2025-03-14 16:59:43 +01:00
Moritz Halbritter e6dd61a5a6 Merge branch '3.4.x'
Closes gh-44717
2025-03-14 14:53:52 +01:00
Moritz Halbritter a2a0adea8a Merge branch '3.3.x' into 3.4.x
Closes gh-44716
2025-03-14 14:53:40 +01:00
Moritz Halbritter 09b3461394 Remove use of self-signed.badssl.com
Closes gh-43708
2025-03-14 14:45:14 +01:00
Yanming Zhou 81048b42ca Introduce PollerMetadataCustomizer for Spring Integration
See gh-44637

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-03-14 13:58:21 +01:00
Stéphane Nicoll a1abd69257 Upgrade to AspectJ 1.9.23
Closes gh-44715
2025-03-14 10:49:06 +01:00
Moritz Halbritter d005e958d9 Merge branch '3.4.x' 2025-03-13 12:11:24 +01:00
Moritz Halbritter 84612f36ce Move UseApr enum inside the Tomcat class
See gh-44033
2025-03-13 12:03:27 +01:00
Moritz Halbritter 3bd75f6ce5 Revert back to the custom decode method for Otel decoding
https://github.com/spring-projects/spring-framework/issues/34570

See gh-44677
2025-03-13 11:26:23 +01:00
Dmytro Nosan 9229cb5cd7 Polish OpenTelemetryResourceAttributes
Update OpenTelemetryResourceAttributes to use StringUtils.uriDecode(...)
as it provides the same functionality as the custom decode(...) method.

See gh-44677

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-03-13 10:38:56 +01:00
Moritz Halbritter 79030e6b5f Polish "Introduce properties for configuring the OpenTelemetry BatchSpanProcessor"
See gh-44655
2025-03-13 10:21:19 +01:00
Dmytro Nosan ea4822177f Introduce properties for configuring the OpenTelemetry BatchSpanProcessor
This commit adds the following properties to allow customization
of the BatchSpanProcessor:

- management.tracing.opentelemetry.export.include-unsampled
- management.tracing.opentelemetry.export.timeout
- management.tracing.opentelemetry.export.max-batch-size
- management.tracing.opentelemetry.export.max-queue-size
- management.tracing.opentelemetry.export.schedule-delay

Default values were taken from BatchSpanProcessorBuilder.

See gh-44655

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-03-13 10:15:58 +01:00
Moritz Halbritter a53aba6abc Merge branch '3.4.x'
This sets the default value of 'server.tomcat.use-apr' to 'NEVER'.

Closes gh-44705
2025-03-13 08:58:18 +01:00
Moritz Halbritter 7fcf34eaeb Add property 'server.tomcat.use-apr' to control Tomcat's APR
The property's default depends on the Java version. On Java < 24, it defaults
to WHEN_AVAILABLE, on Java >=24 it defaults to NEVER.

Closes gh-44033
2025-03-13 08:40:16 +01:00
Andy Wilkinson 19c386040b Merge branch '3.4.x'
Closes gh-44698
2025-03-12 15:49:41 +00:00
Andy Wilkinson 59ddba1063 Merge branch '3.3.x' into 3.4.x
Closes gh-44697
2025-03-12 15:48:36 +00:00
Andy Wilkinson 9b15b4bce9 Consolidate mock web server factories
Closes gh-44674
2025-03-12 15:26:47 +00:00
Andy Wilkinson b61578d183 Merge branch '3.4.x'
Closes gh-44695
2025-03-12 12:54:27 +00:00
Andy Wilkinson 08b358e829 Merge branch '3.3.x' into 3.4.x
Closes gh-44694
2025-03-12 12:50:18 +00:00
Andy Wilkinson 3a6e4e9e58 Add checks for factories files
META-INF/spring.factories and META-INF/spring/aot.factories in the
main source set are now checked. The checks verify that:

- Each class listed in the values exists in the source set's output
- The classes are listed alphabetically
- Nested classes are identified using their binary name

Closes gh-44676
2025-03-12 12:44:18 +00:00
Andy Wilkinson 901feadc25 Merge branch '3.4.x'
Closes gh-44693
2025-03-12 12:43:25 +00:00
Andy Wilkinson b4c41c43f2 Merge branch '3.3.x' into 3.4.x
Closes gh-44692
2025-03-12 12:43:08 +00:00
Andy Wilkinson ad9f0a6164 Make logging system factory ordering more robust
Closes gh-44689
2025-03-12 12:42:28 +00:00
Andy Wilkinson 6f04cf032b Adapt test to change in Neo4j driver's internals
See gh-44690
2025-03-12 12:02:28 +00:00
Andy Wilkinson 8b50de8674 Upgrade to Neo4j Java Driver 5.28.3
Closes gh-44691
2025-03-12 11:52:44 +00:00
Andy Wilkinson a35c04aad6 Upgrade to Neo4j Java Driver 5.28.3
Closes gh-44690
2025-03-12 11:51:00 +00:00
Stéphane Nicoll bf54ab7756 Upgrade to Neo4j Java Driver 5.28.3
Closes gh-44687
2025-03-12 10:43:49 +01:00
Stéphane Nicoll 2c5672d472 Upgrade to Lettuce 6.5.5.RELEASE
Closes gh-44686
2025-03-12 10:43:44 +01:00
Stéphane Nicoll 73e1df24dd Prohibit upgrades to jOOQ 3.20.0
Closes gh-44372
2025-03-12 09:11:10 +01:00
Stéphane Nicoll 3ea9c56ea0 Merge branch '3.4.x'
Closes gh-44685
2025-03-12 08:59:27 +01:00
Stéphane Nicoll 322191f288 Merge branch '3.3.x' into 3.4.x
Closes gh-44684
2025-03-12 08:58:58 +01:00
Johnny Lim 3a5e059387 Polish
See gh-44447

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-03-12 08:49:26 +01:00
Stéphane Nicoll 5af92d1dee Merge branch '3.4.x'
Closes gh-44681
2025-03-12 08:39:27 +01:00
Stéphane Nicoll 20d8e47273 Merge branch '3.3.x' into 3.4.x
Closes gh-44680
2025-03-12 08:38:26 +01:00
Stéphane Nicoll 0f0180d9dc Prevent upgrade to Jetty 12.0.17
Closes gh-44611
2025-03-12 08:38:08 +01:00
Stéphane Nicoll dba091b21b Upgrade to Reactor Bom 2024.0.4
Closes gh-44589
2025-03-11 17:15:26 +01:00
Stéphane Nicoll f1aa051557 Upgrade to Micrometer Tracing 1.5.0-M3
Closes gh-44588
2025-03-11 17:15:26 +01:00
Stéphane Nicoll 49551bf43b Upgrade to Micrometer 1.15.0-M3
Closes gh-44587
2025-03-11 17:15:26 +01:00
Stéphane Nicoll ddf8681bb6 Upgrade to jOOQ 3.19.21
Closes gh-44672
2025-03-11 17:15:25 +01:00
Stéphane Nicoll 29242bd4f3 Upgrade to Hibernate 6.6.10.Final
Closes gh-44671
2025-03-11 17:15:20 +01:00
Stéphane Nicoll 1f30ae8f5d Upgrade to ActiveMQ 6.1.6
Closes gh-44670
2025-03-11 17:15:15 +01:00
Stéphane Nicoll f1eb2da00e Upgrade to Reactor Bom 2023.0.16
Closes gh-44560
2025-03-11 16:59:11 +01:00
Stéphane Nicoll 3e5062591f Upgrade to Micrometer Tracing 1.3.10
Closes gh-44559
2025-03-11 16:59:11 +01:00
Stéphane Nicoll 7a9589cc98 Upgrade to Micrometer 1.13.12
Closes gh-44558
2025-03-11 16:59:11 +01:00
Stéphane Nicoll d18ccfae3d Upgrade to jOOQ 3.19.21
Closes gh-44668
2025-03-11 16:59:11 +01:00
Stéphane Nicoll 4efb861c52 Upgrade to ActiveMQ 6.1.6
Closes gh-44667
2025-03-11 16:59:04 +01:00
Stéphane Nicoll 7dcacf2a40 Upgrade to Reactor Bom 2024.0.4
Closes gh-44567
2025-03-11 16:58:39 +01:00
Stéphane Nicoll b391945b33 Upgrade to Micrometer Tracing 1.4.4
Closes gh-44566
2025-03-11 16:58:39 +01:00
Stéphane Nicoll 7d06639a68 Upgrade to Micrometer 1.14.5
Closes gh-44565
2025-03-11 16:58:39 +01:00
Stéphane Nicoll a9499a2cc4 Upgrade to jOOQ 3.19.21
Closes gh-44665
2025-03-11 16:58:38 +01:00
Stéphane Nicoll ae16d8ac5e Upgrade to Hibernate 6.6.10.Final
Closes gh-44664
2025-03-11 16:58:34 +01:00
Stéphane Nicoll 466d15c7c5 Upgrade to ActiveMQ 6.1.6
Closes gh-44663
2025-03-11 16:58:28 +01:00
Moritz Halbritter d0a93dd7cd Merge branch '3.4.x' 2025-03-11 14:01:11 +01:00
Moritz Halbritter e7f8b22479 Enable platform mismatch test again
We now try to pull linux/arm64. The image only exists for linux/amd64, which should
throw the platform mismatch exception.

See gh-44059
2025-03-11 13:32:15 +01:00
Stéphane Nicoll f6d8ee166d Start building against Spring WS 4.1.0-M1 snapshots
See gh-44599
2025-03-11 07:51:22 +01:00
Andy Wilkinson b6bccc1378 Support DataSource auto-configuration without spring-jdbc
Prior to these changes, auto-configured a DataSource required
spring-jdbc to be on the classpath even if the app made no use of any
of its features.

The changes largely remove the use of spring-jdbc during DataSoruce
auto-configure or disable some support (configuring an unpooled,
embedded database) in its absense. The extra unwrapping in
DataSourceBuilder has been removed as it appears to be redundant.
The existing test for deriving from an embedded database continues
to work without it.

Closes gh-43786
2025-03-10 17:54:34 +00:00
Moritz Halbritter 58fab66163 Merge branch '3.4.x' 2025-03-10 16:15:48 +01:00
Moritz Halbritter 8fca1dbb6f Disable test until further investigation
See gh-44059
2025-03-10 16:12:33 +01:00
Moritz Halbritter 1aa1bab0a8 Merge branch '3.4.x' 2025-03-10 11:28:03 +01:00
Moritz Halbritter 24854f469c Use single-arch image to test platform mismatch detection
See gh-44059
2025-03-10 11:00:55 +01:00
Andy Wilkinson 207c8f54ab Merge branch '3.4.x' 2025-03-07 17:02:36 +00:00
Andy Wilkinson 92a063faca Merge branch '3.3.x' into 3.4.x 2025-03-07 17:02:22 +00:00
Andy Wilkinson e30ae372e3 Move resources into same packages as documentation tests
See gh-44639
2025-03-07 17:01:58 +00:00
Andy Wilkinson ea7caf9b8f Merge branch '3.4.x'
Closes gh-44642
2025-03-07 10:38:59 +00:00
Andy Wilkinson ec985d260e Merge branch '3.3.x' into 3.4.x
Closes gh-44641
2025-03-07 10:37:19 +00:00
Andy Wilkinson edf3cb1421 Position endpoint documentation tests alongside endpoint's auto-config
Closes gh-44639
2025-03-07 10:28:04 +00:00
Moritz Halbritter 12c9bfff2f Merge branch '3.4.x'
Closes gh-44640
2025-03-07 11:03:41 +01:00
Stéphane Nicoll 0e09a2d25f Polish "Add additional configuration properties for JdbcTemplate"
See gh-44470
2025-03-07 10:33:59 +01:00
Yanming Zhou baa89c5ce8 Add additional configuration properties for JdbcTemplate.
This commit adds configuration properties for additional settings of
the auto-configured JdbcTemplate:

* ignore-warnings
* skip-results-processing
* skip-undeclared-results
* results-map-case-insensitive

See gh-44470

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-03-07 10:33:59 +01:00
Dmytro Nosan b3f90337ec Polish OpenTelemetryResourceAttributesTests
See gh-44636

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-03-07 10:08:23 +01:00
Moritz Halbritter d93f4f5554 Throw exception if pulled image platform doesn't match the requested platform
Closes gh-44059
2025-03-07 09:28:17 +01:00
Moritz Halbritter 6f464e71da Merge branch '3.4.x' 2025-03-07 08:21:32 +01:00
Moritz Halbritter 282571ae1e Merge branch '3.3.x' into 3.4.x 2025-03-07 08:21:13 +01:00
Moritz Halbritter 5ec099756f Fix potential NPE when passing 'null' as params 2025-03-07 08:17:37 +01:00
Andy Wilkinson da5796f70c Merge branch '3.4.x'
Closes gh-44635
2025-03-06 18:35:16 +00:00
Andy Wilkinson ab66034e1b Merge branch '3.3.x' into 3.4.x
Closes gh-44634
2025-03-06 18:34:54 +00:00
Andy Wilkinson 67b0a26474 Improve structure of test resources in Actuator modules
Closes gh-44632
2025-03-06 18:31:35 +00:00
Moritz Halbritter dde9bfbeaa Merge branch '3.4.x'
Closes gh-44631
2025-03-06 17:41:08 +01:00
Moritz Halbritter 2e74ce8bf2 Merge branch '3.3.x' into 3.4.x
Closes gh-44630
2025-03-06 17:39:26 +01:00
Moritz Halbritter a807a07a59 Always try to deserialize message in case of Docker transport errors
Before this commit, if the status code was 4xx or 500, we tried to read the errors
object, consuming the http entity. When we tried to deserialize the message,
the http entity was already consumed, an IOException has been thrown and null
is returned for the message.

Now, we read the content in a byte[] and deserialize the errors and the message
from that. This ensures that we can read both the errors and the message.

Closes gh-44628
2025-03-06 17:27:00 +01:00
Stéphane Nicoll e0e1f2aeb3 Upgrade to Testcontainers 1.20.6
Closes gh-44625
2025-03-06 16:11:26 +01:00
Stéphane Nicoll a72fedec8f Upgrade to SLF4J 2.0.17
Closes gh-44624
2025-03-06 16:11:26 +01:00
Stéphane Nicoll a88d4bf93b Upgrade to Selenium HtmlUnit 4.29.0
Closes gh-44623
2025-03-06 16:11:26 +01:00
Stéphane Nicoll 38eadf608f Upgrade to Selenium 4.29.0
Closes gh-44622
2025-03-06 16:11:26 +01:00
Stéphane Nicoll 132fb6e18f Upgrade to R2DBC MySQL 1.4.0
Closes gh-44621
2025-03-06 16:11:26 +01:00
Stéphane Nicoll ee5ebeacc8 Upgrade to Pulsar 4.0.3
Closes gh-44620
2025-03-06 16:11:26 +01:00
Stéphane Nicoll 21569a03ff Upgrade to Netty 4.1.119.Final
Closes gh-44619
2025-03-06 16:11:26 +01:00
Stéphane Nicoll e47ddaf5ed Upgrade to Maven Install Plugin 3.1.4
Closes gh-44617
2025-03-06 16:11:26 +01:00
Stéphane Nicoll 46ec9ec5c9 Upgrade to Maven Deploy Plugin 3.1.4
Closes gh-44616
2025-03-06 16:11:26 +01:00
Stéphane Nicoll 3ba8dec983 Upgrade to Maven Compiler Plugin 3.14.0
Closes gh-44615
2025-03-06 16:11:26 +01:00
Stéphane Nicoll daa0c3001e Upgrade to Logback 1.5.17
Closes gh-44614
2025-03-06 16:11:26 +01:00
Stéphane Nicoll e25d715ede Upgrade to jOOQ 3.19.20
Closes gh-44612
2025-03-06 16:11:26 +01:00
Stéphane Nicoll bf8f8a4e23 Upgrade to Jetty Reactive HTTPClient 4.0.9
Closes gh-44610
2025-03-06 15:35:14 +01:00
Stéphane Nicoll 9c83f36bef Upgrade to Infinispan 15.1.7.Final
Closes gh-44608
2025-03-06 15:35:14 +01:00
Stéphane Nicoll f33087e3b7 Upgrade to HtmlUnit 4.10.0
Closes gh-44607
2025-03-06 15:35:14 +01:00
Stéphane Nicoll 443edcdcaf Upgrade to Hibernate 6.6.9.Final
Closes gh-44606
2025-03-06 15:35:14 +01:00
Stéphane Nicoll 0ce71e2c06 Upgrade to Groovy 4.0.26
Closes gh-44605
2025-03-06 15:35:14 +01:00
Stéphane Nicoll 92c198e536 Upgrade to Flyway 11.3.4
Closes gh-44604
2025-03-06 15:35:14 +01:00
Stéphane Nicoll 163e03b3c6 Upgrade to Byte Buddy 1.17.2
Closes gh-44603
2025-03-06 15:35:14 +01:00
Stéphane Nicoll 013633cc48 Upgrade to Awaitility 4.3.0
Closes gh-44602
2025-03-06 15:35:13 +01:00
Stéphane Nicoll 0a84ebf9f1 Merge branch '3.4.x'
Closes gh-44626
2025-03-06 15:34:11 +01:00
Stéphane Nicoll e06244d007 Adapt EntityManagerFactoryBuilder to work with multiple data sources
This commit allows EntityManagerFactoryBuilder to provide the JPA
properties to use according to the DataSource used to build the
EntityManagerFactory. Previously the JPA properties were computed only
once based on the primary data source, which was a problem since its
default DDL setting may be different.

EntityManagerFactoryBuilder takes a function that provides the JPA
properties based on a data source, rather than the properties
themselves. Constructors with the previous variant have been deprecated
as a result.

Closes gh-44516
2025-03-06 15:33:53 +01:00
Andy Wilkinson 3fff2c8072 Merge branch '3.4.x' 2025-03-06 13:25:33 +00:00
Andy Wilkinson d097870de5 Update CouchbaseAutoConfigurationsTests to use own resources
See gh-44576
2025-03-06 13:24:39 +00:00
Moritz Halbritter 3fc07644ee Make auto-configured BatchSpanProcessor back off when the user defines their own
Closes gh-44601
2025-03-06 13:34:08 +01:00
Andy Wilkinson 00b2fe7d95 Merge branch '3.4.x' 2025-03-06 11:22:52 +00:00
Andy Wilkinson 272c905510 Merge branch '3.3.x' into 3.4.x 2025-03-06 11:22:39 +00:00
Andy Wilkinson c849cafc1b Further improve independence of core auto-configuration tests
See gh-44513
2025-03-06 11:12:49 +00:00
Stéphane Nicoll 2f407550e3 Adapt to deprecation in Spring Security snapshots
See gh-44598
2025-03-06 10:37:38 +01:00
Stéphane Nicoll 48466968e1 Upgrade to Neo4j Java Driver 5.28.2
Closes gh-44600
2025-03-06 10:05:32 +01:00
Stéphane Nicoll 4270cf562b Start building against Spring WS 4.0.12 snapshots
See gh-44599
2025-03-06 10:05:32 +01:00
Stéphane Nicoll 7cb0ccf89f Start building against Spring Security 6.5.0-M3 snapshots
See gh-44598
2025-03-06 10:05:32 +01:00
Stéphane Nicoll 84a89a3993 Start building against Spring Pulsar 1.2.4 snapshots
See gh-44597
2025-03-06 10:05:32 +01:00
Stéphane Nicoll 0835878f9d Start building against Spring LDAP 3.3.0-M3 snapshots
See gh-44596
2025-03-06 10:05:32 +01:00
Stéphane Nicoll 6301bbdfbb Start building against Spring Kafka 3.3.4 snapshots
See gh-44595
2025-03-06 10:05:32 +01:00
Stéphane Nicoll 1b07abfde7 Start building against Spring Integration 6.5.0-M3 snapshots
See gh-44594
2025-03-06 10:05:32 +01:00
Stéphane Nicoll 59c87e4f3f Start building against Spring GraphQL 1.4.0-M1 snapshots
See gh-44593
2025-03-06 10:05:32 +01:00
Stéphane Nicoll 6652b84a23 Start building against Spring Data Bom 2025.0.0-M2 snapshots
See gh-44592
2025-03-06 10:05:32 +01:00
Stéphane Nicoll 6e4a39ed56 Start building against Spring Batch 5.2.2 snapshots
See gh-44591
2025-03-06 10:05:32 +01:00
Stéphane Nicoll 082814862a Start building against Spring Authorization Server 1.5.0-M2 snapshots
See gh-44590
2025-03-06 10:05:32 +01:00
Stéphane Nicoll 086d6a16b5 Start building against Reactor Bom 2024.0.4 snapshots
See gh-44589
2025-03-06 10:05:32 +01:00
Stéphane Nicoll 72ea4a630a Start building against Micrometer Tracing 1.5.0-M3 snapshots
See gh-44588
2025-03-06 10:05:31 +01:00
Stéphane Nicoll 89612f22f9 Start building against Micrometer 1.15.0-M3 snapshots
See gh-44587
2025-03-06 10:05:31 +01:00
Moritz Halbritter 7fd29cf7c6 Polish "Add support for OpenTelemetry's service.namespace"
See gh-44499
2025-03-06 09:56:09 +01:00
Vanio Begic cf2353bdb3 Add support for OpenTelemetry's service.namespace
See gh-44499

Signed-off-by: Vanio Begic <vanio.begic123@gmail.com>
2025-03-06 09:46:11 +01:00
Moritz Halbritter 4dabf16a06 Polish "Remove default value for OtlpMetricsProperties.url"
See gh-44493
2025-03-06 09:36:33 +01:00