root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
56,230 Commits 24 Branches 369 Tags 279 MiB
Commit Graph

2795 Commits

Author SHA1 Message Date
Moritz Halbritter 0addec6b68 Fix bug in SslMeterBinder when binding without registered bundles 
Before this commit the meter registries were derived from the created
gauges. If the SslMeterBinder has been bound to a MeterRegistry without
any bundles, then no gauges are created. If a SslBundle is then
dynamically added, onBundleChange is called with the new bundle, but the
list of meter registries is empty (because we have no gauges). The
effect is that the newly registered bundle has no metrics.

Closes gh-48180
 2025-11-19 15:06:09 +01:00
Moritz Halbritter 0b92b8177c Polish SslMeterBinderTests 2025-11-19 14:28:47 +01:00
Phillip Webb 4a016ec04d 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 
Closes gh-48176
 2025-11-18 16:10:05 -08:00
Phillip Webb 3040dc14cd Apply system environment prefix to management context
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 
Update `ManagementContextFactory` so that any system environment prefix
set on the parent environment is applied to the child.

Closes gh-45858
 2025-11-18 15:44:49 -08: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
Scott Frederick 78ea236e13 Add since to deprecations in config metadata JSON files 
Add the `since` field to all deprecated properties in all
additional-spring-configuration-metadata.json files in the project.

Add to the CheckAdditionalSpringConfigurationMetadata build task to
ensure that all deprecated properties have a non-empty `since` field.

See gh-47980

Signed-off-by: Scott Frederick <scottyfred@gmail.com>
 2025-11-13 14:28:27 +01:00
Andy Wilkinson eed7f75f9e Merge branch '3.4.x' into 3.5.x 
Closes gh-48107
 2025-11-13 10:17:47 +00:00
Andy Wilkinson b09b0296c3 Check aggregated property metadata 
Closes gh-47972
 2025-11-13 10:16:38 +00:00
Stéphane Nicoll 1ce1b7ee35 Merge branch '3.4.x' into 3.5.x 
Closes gh-48105
 2025-11-13 10:27:51 +01:00
Stéphane Nicoll 9e656c1554 Remove unnecessary field initialization 
Closes gh-45168

Co-authored-by: CatiaCorreia catia.correia97@gmail.com
 2025-11-13 10:21:05 +01:00
Andy Wilkinson 049c6d50d5 Merge branch '3.4.x' into 3.5.x 
Closes gh-48056
 2025-11-11 15:22:52 +00:00
Andy Wilkinson d08ac5ce4a Allow cache removals to be registered as a function counter 
Fixes gh-46212
 2025-11-11 15:21:40 +00:00
Phillip Webb 61fadeb897 Merge branch '3.4.x' into 3.5.x 
Closes gh-47923
 2025-11-03 20:22:30 -08:00
Phillip Webb 631711f2e6 Prevent unlimited growth of AutoConfiguredCompositeMeterRegistry 
Update `OnlyOnceLoggingDenyMeterFilter` to directly implement the
maximum number of allowable tag values. With this change in place
we can remove calls to `MeterFilter.maximumAllowableTags`. This also
allows `MeterRegistryPostProcessor` to have a stronger signal about
the filters that it should also apply to the
`AutoConfiguredCompositeMeterRegistry` since it can now do a standard
`instanceof` check.

Fixes gh-47285
 2025-11-03 20:14:01 -08:00
Phillip Webb 22781fc6a0 Polish `DEFAULT_SERVICE_NAME` javadoc
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 
See gh-44494
 2025-10-31 09:30:19 -07:00
Phillip Webb 55f00cf24c Fix merge issue causing checkArchitectureMain failure
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 
See gh-47750
 2025-10-21 15:37:26 -07:00
Phillip Webb acaa938050 Merge branch '3.4.x' into 3.5.x 
Closes gh-47750
 2025-10-21 12:34:01 -07:00
Dmytro Nosan ba88ec7ed1 Stop using @ConditionalOnClass on @Bean methods 
See gh-47429

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
 2025-10-21 11:32:42 -07:00
Andy Wilkinson ed96ed6e8c Merge branch '3.4.x' into 3.5.x 
See gh-47037
 2025-09-04 16:01:56 +01:00
Andy Wilkinson 055b0993da Revert "Remove stale metadata for management.health.influxdb.enabled" 
This reverts commit 987635972d.

See gh-45747
 2025-09-04 16:01:32 +01:00
Andy Wilkinson 19a7331c3e Merge branch '3.4.x' into 3.5.x 
Closes gh-47037
 2025-09-04 11:03:09 +01:00
Andy Wilkinson 987635972d Remove stale metadata for management.health.influxdb.enabled 
The property was deprecated in 3.2 and support removed in 3.4. This
commit updates the metadata to reflect that removal.

Closes gh-45747
 2025-09-04 10:58:40 +01:00
Andy Wilkinson 2fa20f3def Merge branch '3.4.x' into 3.5.x 
Closes gh-46942
 2025-08-22 11:41:50 +01:00
Phillip Webb 16f25ec823 Merge branch '3.4.x' into 3.5.x 
Closes gh-46844
 2025-08-14 14:46:07 -07:00
Tommy Ludwig 5d7e06e9c3 Avoid Stream API in performance critical tracing code 
Update composite tracing support to remove Stream API calls from
injection and extraction methods which happen on each request.

See gh-46838
 2025-08-14 14:41:38 -07:00
Stéphane Nicoll 78aac2fd33 Merge branch '3.4.x' into 3.5.x 
Closes gh-46800
 2025-08-12 11:22:23 +02:00
Johnny Lim edb38f9bf8 Polish 
See gh-46785

Signed-off-by: Johnny Lim <izeye@naver.com>
 2025-08-12 11:16:32 +02:00
Stéphane Nicoll dfaf98f7fc Merge branch '3.4.x' into 3.5.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details 
Closes gh-46580
 2025-07-28 16:33:30 +02:00
Fatima Zohra Filali c0b2855488 Document that management.health.influxdb.enabled is no longer supported 
See gh-46574

Signed-off-by: Fatima Filali <filalifz7@gmail.com>
 2025-07-28 16:32:02 +02:00
Andy Wilkinson c9fa96d832 Merge branch '3.4.x' into 3.5.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
Run CodeQL Analysis / run-analysis (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Has been cancelled Details
Build and Deploy Snapshot / Trigger Docs Build (push) Has been cancelled Details
Build and Deploy Snapshot / Verify (push) Has been cancelled Details 
Closes gh-46315
 2025-07-07 12:48:04 +01:00
Yanming Zhou af8558a84a Polish usage of `@ConditionalOnWebApplication` for consistency 
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

See gh-45880
 2025-07-07 11:29:58 +01:00
Stéphane Nicoll 596dd95108 Merge branch '3.4.x' into 3.5.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details 
Closes gh-46236
 2025-07-01 11:17:29 +02:00
Yanming Zhou 520f7abb9f Replace fully qualified class to import 
See gh-46234

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-07-01 11:10:51 +02:00
Phillip Webb 61c2d0766b Merge branch '3.4.x' into 3.5.x 
See gh-46066
 2025-06-20 17:21:58 -07:00
Phillip Webb 3aeb18d618 Add license header to gradle files 
See gh-46065
 2025-06-20 17:20:50 -07:00
Phillip Webb a37c84b7c5 Merge branch '3.4.x' into 3.5.x 
See gh-46066
 2025-06-20 17:14:59 -07:00
Phillip Webb d66b28fcba Update end copyright year to 'present' 
See gh-46065
 2025-06-20 17:12:38 -07:00
Moritz Halbritter 86f736b677 Merge branch '3.4.x' 
Closes gh-46002
 2025-06-18 09:58:01 +02:00
Johnny Lim c6ba46c120 Polish gh-45721 
See gh-46001

Signed-off-by: Johnny Lim <izeye@naver.com>
 2025-06-18 09:55:45 +02:00
Phillip Webb ad0f08f8a2 Polish 'Improve binding performance of 'local.management.port' property source' 
See gh-45968
 2025-06-17 12:32:13 -07:00
tanruian d5464a44f0 Improve binding performance of 'local.management.port' property source 
Update `ManagementContextAutoConfiguration` to use an immutable
`EnumerablePropertySource` to provide better property binding
performance.

See gh-45968

Signed-off-by: tanruian <tanruiantra@qq.com>
 2025-06-17 12:32:12 -07:00
Andy Wilkinson 2e423a75a6 Merge branch '3.4.x' 
Closes gh-45997
 2025-06-17 19:19:22 +01:00
Andy Wilkinson d7e20968d1 Merge branch '3.3.x' into 3.4.x 
Closes gh-45996
 2025-06-17 19:19:02 +01:00
Andy Wilkinson a6ac444aba Use fixed timestamp so included snippets match accompanying text 
Closes gh-45995
 2025-06-17 19:06:41 +01:00
Stéphane Nicoll 28c095c3be Merge branch '3.4.x' 
Closes gh-45990
 2025-06-17 14:26:18 +02:00
Stéphane Nicoll 543ac3617b Update copyright year of changed file 
See gh-45967
 2025-06-17 14:23:44 +02:00
wonyongg 3bf0f3d6e2 Unify use of org.apache.logging.log4j.core.LoggerContext 
See gh-45967

Signed-off-by: wonyongg <111210881+wonyongg@users.noreply.github.com>
 2025-06-17 14:22:51 +02:00
Moritz Halbritter 1cf4acfd1b Merge branch '3.4.x' 
Closes gh-45921
 2025-06-12 12:15:45 +02:00
Shekhar Aggarwal dcd3a23d02 Add SSL response structure to actuator info endpoint documentation 
See gh-45792

Signed-off-by: Shekhar Aggarwal <aggarwalshekhar99@gmail.com>
 2025-06-12 12:03:24 +02:00
Andy Wilkinson 3e3be2b407 Polish
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
2025-06-10 11:07:38 +01:00