Commit Graph

58713 Commits

Author SHA1 Message Date
Andy Wilkinson aecdff1bbd Merge pull request #48172 from dependabot[bot]
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
* gh-48172:
  Bump js-yaml from 4.1.0 to 4.1.1 in /antora

Closes gh-48172
2025-11-18 16:40:23 +00:00
dependabot[bot] 7bc2fa0eab Bump js-yaml from 4.1.0 to 4.1.1 in /antora
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 4.1.0 to 4.1.1.
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/4.1.0...4.1.1)

---
updated-dependencies:
- dependency-name: js-yaml
  dependency-version: 4.1.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

See gh-48172
2025-11-18 16:40:01 +00:00
Stéphane Nicoll e67f2fb96b Merge pull request #48170 from vpavic
* pr/48170:
  Polish contribution
  Mention support for detecting AWS ECS in "Deploying to the Cloud"

Closes gh-48170
2025-11-18 16:23:04 +01:00
Stéphane Nicoll 15bf80d3ff Polish contribution
See gh-48170
2025-11-18 16:22:11 +01:00
Vedran Pavic 802dacb007 Mention support for detecting AWS ECS in "Deploying to the Cloud"
See gh-48170

Signed-off-by: Vedran Pavic <vedran@vedranpavic.com>
2025-11-18 16:08:03 +01:00
Stéphane Nicoll 44e29b654d Merge branch '3.5.x'
Closes gh-48171
2025-11-18 16:07:34 +01:00
Stéphane Nicoll bb247e82aa Merge pull request #48153 from TerryTaoYY
* pr/48153:
  Hande SSL metrics for dynamically registered bundles

Closes gh-48153
2025-11-18 16:07:26 +01:00
TerryTaoYY 8214f3c22b Hande SSL metrics for dynamically registered bundles
See gh-48153

Signed-off-by: TerryTaoYY <yueyang.tao@gmail.com>
2025-11-18 15:25:35 +01:00
Andy Wilkinson 3d8c439091 Upgrade to Gradle 9.2.1
Closes gh-48167
2025-11-18 12:29:23 +00:00
Stéphane Nicoll 82653185fd Merge branch '3.5.x' 2025-11-18 13:27:12 +01:00
Stéphane Nicoll 7a235ca89c Merge branch '3.4.x' into 3.5.x 2025-11-18 13:27:00 +01:00
Stéphane Nicoll 4848bc1a16 Start building against Spring Framework 7.0.1 snapshots
See gh-48168
2025-11-18 13:26:42 +01:00
Stéphane Nicoll 65df86566b Start building against Spring Framework 6.2.14 snapshots
See gh-48166
2025-11-18 13:25:46 +01:00
Stéphane Nicoll 2d9d48d472 Start building against Spring Framework 6.2.14 snapshots
See gh-48165
2025-11-18 13:23:12 +01:00
Stéphane Nicoll 7e9f5ebd96 Merge branch '3.5.x'
Closes gh-48163
2025-11-18 11:06:06 +01:00
Stéphane Nicoll 12d23a3abf Merge pull request #48156 from vpavic
* pr/48156:
  Polish contribution
  Revise AWS section of "Deploying to the Cloud" in reference manual

Closes gh-48156
2025-11-18 11:05:58 +01:00
Stéphane Nicoll 1d4551e460 Polish contribution
See gh-48156
2025-11-18 11:05:26 +01:00
Vedran Pavic 165942f8ab Revise AWS section of "Deploying to the Cloud" in reference manual
See gh-48156

Signed-off-by: Vedran Pavic <vedran@vedranpavic.com>
2025-11-18 11:04:00 +01:00
Moritz Halbritter 4af532b8ee Add starters for Micrometer Metrics
This commit adds spring-boot-starter-micrometer-metrics and
spring-boot-starter-micrometer-metrics-test.

It also uses the new starters in smoke tests and in other starters,
which depended on spring-boot-micrometer-metrics.

Closes gh-48161
2025-11-18 09:28:53 +01:00
Stéphane Nicoll cdc7a34b6d Merge branch '3.5.x' 2025-11-18 09:14:47 +01:00
Stéphane Nicoll 9f39b5e231 Merge branch '3.4.x' into 3.5.x 2025-11-18 09:14:37 +01:00
Stéphane Nicoll 7bfc93f3c4 Upgrade to Spring Session 4.0.0
Closes gh-48000
2025-11-18 09:13:21 +01:00
Stéphane Nicoll 7f58805c39 Upgrade to Spring Security 7.0.0
Closes gh-47832
2025-11-18 09:13:20 +01:00
Stéphane Nicoll 8340a62c6f Upgrade to Spring Kafka 4.0.0
Closes gh-47829
2025-11-18 09:13:20 +01:00
Stéphane Nicoll 5edeb2efcd Upgrade to Spring AMQP 4.0.0
Closes gh-47823
2025-11-18 09:13:20 +01:00
Stéphane Nicoll 448f688e0c Upgrade to Spring Security 6.5.7
Closes gh-48043
2025-11-18 09:12:59 +01:00
Stéphane Nicoll 69d23862b1 Upgrade to Spring Kafka 3.3.11
Closes gh-48041
2025-11-18 09:12:59 +01:00
Stéphane Nicoll e56f3add09 Upgrade to Spring Security 6.4.13
Closes gh-48029
2025-11-18 09:12:50 +01:00
Stéphane Nicoll 8f91773cbe Upgrade to Spring Kafka 3.3.11
Closes gh-48027
2025-11-18 09:12:50 +01:00
Phillip Webb 2e54aa6760 Merge branch '3.5.x'
Closes gh-48160
2025-11-17 21:00:09 -08:00
Phillip Webb c3c983f1d8 Merge branch '3.4.x' into 3.5.x
Closes gh-48159
2025-11-17 20:59:53 -08:00
Phillip Webb 7837583484 Add credentials to ivy settings to support commercial builds
Closes gh-46824
2025-11-17 20:54:34 -08:00
Phillip Webb 2bb967de14 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:25], 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:25], 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:true 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-11-17 18:12:48 -08:00
Phillip Webb 80ed778179 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:25], 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:25], 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-11-17 18:11:41 -08:00
Phillip Webb 0d0493e45e Fix SpringRepositoriesExtensionTests
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
See gh-46823
2025-11-17 18:11:32 -08:00
Phillip Webb 7a8bc93fef Merge branch '3.5.x'
Closes gh-48158
2025-11-17 13:00:26 -08:00
Phillip Webb fec4a92c8c Merge branch '3.4.x' into 3.5.x
Closes gh-48157
2025-11-17 12:59:17 -08:00
Phillip Webb 018fc57d64 Use spring.mavenRepositories in buildSrc for all build types
Refine `buildSrc` so that `spring.mavenRepositories()` are considered
for all build types (not just milestones and snapshots). We now pass
"springFrameworkVersion" to `SpringRepositorySupport.groovy` so that
repo.spring.io doesn't get added for OSS builds using release artifacts.

Closes gh-46823
2025-11-17 12:54:31 -08:00
Phillip Webb 2a9e6a2b93 Merge branch '3.5.x'
Fixes gh-48059
2025-11-17 11:39:19 -08:00
Phillip Webb 5954918c60 Merge branch '3.4.x' into 3.5.x
Fixes gh-48058
2025-11-17 11:37:46 -08:00
Andy Wilkinson 7f6c00d52a Stop throwing PortInUseException for unassignable address
Fixes gh-47618
2025-11-17 11:33:34 -08:00
Moritz Halbritter 4730dcfef7 Merge pull request #46818 from BenchmarkingBuffalo
* pr/46818:
  Polish "Fail fast with explicit error message for incompatible JDK version"
  Fail fast with explicit error message for incompatible JDK version

Closes gh-46818
2025-11-17 14:50:36 +01:00
Moritz Halbritter afc24aed1c Polish "Fail fast with explicit error message for incompatible JDK version"
See gh-46818
2025-11-17 14:50:13 +01:00
BenchmarkingBuffalo 2998e84616 Fail fast with explicit error message for incompatible JDK version
See gh-46818

Signed-off-by: BenchmarkingBuffalo <46448799+BenchmarkingBuffalo@users.noreply.github.com>
2025-11-17 14:48:22 +01:00
Stéphane Nicoll 024bb7278e Merge pull request #48145 from stevearmstrong-dev
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:25], 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:25], 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:true version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
* pr/48145:
  Polish "Add missing HttpClientSettingsPropertyMapper tests"
  Add missing HttpClientSettingsPropertyMapper tests

Closes gh-48145
2025-11-17 09:54:11 +01:00
Stéphane Nicoll 971bd500d4 Polish "Add missing HttpClientSettingsPropertyMapper tests"
See gh-48145
2025-11-17 09:53:41 +01:00
Steve Armstrong 82fe577596 Add missing HttpClientSettingsPropertyMapper tests
See gh-48145

Signed-off-by: Steve Armstrong <stevearmstrong-dev@users.noreply.github.com>
2025-11-17 09:44:12 +01:00
Stéphane Nicoll 2e4566bd3d Polish 2025-11-17 09:42:06 +01:00
Stéphane Nicoll 992c905153 Merge branch '3.5.x' 2025-11-17 08:38:13 +01:00
Stéphane Nicoll 845a0aa82a 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:25], 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:25], 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-11-17 08:38:03 +01:00