Commit Graph

29346 Commits

Author SHA1 Message Date
Stéphane Nicoll
4e4dbaf832 Merge branch 'main' into 4.0.x 2025-05-26 16:43:01 +02:00
Julio Gómez Díaz
3eaed90d94 Fix artifactId of prometheus-metrics-exporter-pushgateway in example
See gh-45684

Signed-off-by: Julio Gómez Díaz <juliojgd@gmail.com>
2025-05-26 16:41:54 +02:00
Stéphane Nicoll
a0a39abb49 Introduce a public constant for the WebServerStartStopLifecycle's phase
This commit also moves the constant for the phase of
WebServerGracefulShutdownLifecycle to WebServerApplicationContext.

Closes gh-45572
2025-05-26 16:36:11 +02:00
Stéphane Nicoll
e0d10d7d8c Merge branch 'main' into 4.0.x 2025-05-26 16:18:32 +02:00
Stéphane Nicoll
d05148d4d6 Merge branch '3.4.x'
Closes gh-45683
2025-05-26 16:18:21 +02:00
Stéphane Nicoll
6a82134f94 Merge branch '3.3.x' into 3.4.x
Closes gh-45682
2025-05-26 16:18:12 +02:00
Tran Ngoc Nhan
7448f8c73a Document use of git-commit-id-maven-plugin consistently
See gh-45677

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-05-26 16:11:52 +02:00
Stéphane Nicoll
bdabbfd3aa Merge branch 'main' into 4.0.x 2025-05-26 10:15:18 +02:00
Stéphane Nicoll
2e37b5b883 Upgrade to MongoDB 5.5.0
Closes gh-45660
2025-05-26 10:09:11 +02:00
Stéphane Nicoll
8c1a0cb755 Merge branch 'main' into 4.0.x 2025-05-26 10:05:29 +02:00
Stéphane Nicoll
1d4e68361b Upgrade to Lettuce 6.6.0.RELEASE
Closes gh-45670
2025-05-26 10:05:16 +02:00
Stéphane Nicoll
7b057414ab Merge branch 'main' into 4.0.x 2025-05-26 09:54:36 +02:00
Stéphane Nicoll
e4e3cd483e Upgrade to Jedis 6.6.0
Closes gh-45669
2025-05-26 09:54:13 +02:00
Stéphane Nicoll
08017a449f Merge branch 'main' into 4.0.x 2025-05-25 09:52:54 +02:00
Stéphane Nicoll
e46c0ea7fc Merge branch '3.4.x'
Closes gh-45667
2025-05-25 09:52:41 +02:00
Stéphane Nicoll
7840a330e6 Polish "Harmonize Otlp*Configurations"
See gh-45643
2025-05-25 09:45:27 +02:00
Yanming Zhou
43d2abbcc6 Harmonize Otlp*Configurations
See gh-45643

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-05-25 09:45:07 +02:00
Stéphane Nicoll
dc75f69844 Merge branch 'main' into 4.0.x 2025-05-25 09:37:40 +02:00
Stéphane Nicoll
c0135a0905 Merge branch '3.4.x'
Closes gh-45666
2025-05-25 09:37:21 +02:00
Dmytro Nosan
c07a67706b Add support for SAML2 with @WebMvcTest
See gh-45650

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-05-25 09:34:03 +02:00
Stéphane Nicoll
01a8d750a6 Merge branch 'main' into 4.0.x 2025-05-25 09:22:22 +02:00
Stéphane Nicoll
75f6a798e6 Merge branch '3.4.x'
Closes gh-45665
2025-05-25 09:22:10 +02:00
Stéphane Nicoll
64655a07e3 Merge branch '3.3.x' into 3.4.x
Closes gh-45664
2025-05-25 09:22:02 +02:00
Dmytro Nosan
4c3c7b4543 Add WebMvcTestOAuth2Tests
See gh-45654

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-05-25 09:16:19 +02:00
Andy Wilkinson
f8d09b1dab Merge branch 'main' into 4.0.x 2025-05-23 16:13:36 +01:00
Andy Wilkinson
8d21e4a92e Merge branch '3.4.x'
Closes gh-45659
2025-05-23 16:13:17 +01:00
Andy Wilkinson
21ec76c925 Merge branch '3.3.x' into 3.4.x
Closes gh-45658
2025-05-23 15:56:34 +01:00
Yanming Zhou
0fea1a00e0 Reuse properties from field
See gh-45642

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-05-23 15:46:54 +01:00
Andy Wilkinson
88e4d9f2b4 Merge branch 'main' into 4.0.x 2025-05-23 14:46:25 +01:00
Andy Wilkinson
9910bd8f65 Merge branch '3.4.x'
Closes gh-45656
2025-05-23 14:46:10 +01:00
Andy Wilkinson
8e91d418dc Merge branch '3.3.x' into 3.4.x
Closes gh-45655
2025-05-23 14:45:55 +01:00
Andy Wilkinson
cd6b0fe7c3 Add to javadoc how applications can use Configurer classes
Closes gh-42878
2025-05-23 14:34:55 +01:00
Andy Wilkinson
750bf53484 Merge branch 'main' into 4.0.x 2025-05-23 14:31:56 +01:00
Andy Wilkinson
077d90d2e9 Merge branch '3.4.x'
Closes gh-45653
2025-05-23 14:31:28 +01:00
Andy Wilkinson
86cd7ecaca Merge branch '3.3.x' into 3.4.x
Closes gh-45651
2025-05-23 14:19:15 +01:00
Tran Ngoc Nhan
c9bf87be7d Make all @ConfigurationPropertiesBinding @Bean methods static
See gh-45640

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-05-23 14:17:51 +01:00
Andy Wilkinson
d98ca77235 Merge branch '3.3.x' into 3.4.x
Closes gh-45649
2025-05-23 12:31:08 +01:00
Andy Wilkinson
9a2d8c589e Clarify how to use Pushgateway auto-configuration
Closes gh-44392
2025-05-23 12:30:08 +01:00
Andy Wilkinson
e65d1a3ac1 Merge branch 'main' into 4.0.x 2025-05-23 09:46:08 +01:00
Andy Wilkinson
a9cc83dc8f Merge branch '3.4.x'
Closes gh-45646
2025-05-23 09:32:09 +01:00
Andy Wilkinson
492a4abd70 Merge branch '3.3.x' into 3.4.x
Closes gh-45645
2025-05-23 09:29:23 +01:00
Andy Wilkinson
7628ae8503 Check Kotlin code using Detekt
Closes gh-45583
2025-05-23 09:22:08 +01:00
Phillip Webb
0b638f3d26 Merge branch 'main' into 4.0.x 2025-05-22 10:08:52 -07:00
Phillip Webb
5695192850 Ensure descendants are always recalculated on cache refresh
Fix `SpringIterableConfigurationPropertySource` to ensure that cached
descendants are always updated on a refresh.

The cache implementation assumes that it is safe to reuse previous
`mappings` and `reverseMappings` data since it doesn't matter if
superfluous values are included. For `descendants` however, we always
want to recalculate values so that we don't get false positives.

Unfortunately, prior to this commit, we only updated the descendants
if a reverseMapping was added. The meant that on a cache refresh,
existing descendants were removed.

Fixes gh-45639
2025-05-22 10:03:52 -07:00
Andy Wilkinson
69a9162ab6 Merge branch 'main' into 4.0.x 2025-05-21 08:41:22 +01:00
Andy Wilkinson
b142798bdb Merge branch '3.4.x'
Closes gh-45626
2025-05-21 08:41:04 +01:00
Andy Wilkinson
ea8c64262d Merge branch '3.3.x' into 3.4.x
Closes gh-45625
2025-05-21 08:40:37 +01:00
Andy Wilkinson
bdf0ef19a4 Correct docs for use of static with @ConfigurationPropertiesBinding
Closes gh-45621
2025-05-21 08:39:10 +01:00
Stéphane Nicoll
ad522fb37a Upgrade to Spring WS 4.1.0
Closes gh-45445
2025-05-21 09:05:24 +02:00
Stéphane Nicoll
3abf2a12e6 Upgrade to Spring Session 3.5.0
Closes gh-45560
2025-05-21 09:05:24 +02:00