Andy Wilkinson
b42a060d0a
Merge branch '3.5.x'
...
Closes gh-46943
2025-08-22 11:59:17 +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
Andy Wilkinson
b7282c00ae
Merge pull request #46938 from doljae
...
* gh-46938:
Polish "Clarify Javadoc of Customizer interfaces about overriding behavior"
Clarify Javadoc of Customizer interfaces about overriding behavior
Closes gh-46938
2025-08-22 11:40:41 +01:00
Andy Wilkinson
e595327610
Polish "Clarify Javadoc of Customizer interfaces about overriding behavior"
...
See gh-46938
2025-08-22 11:39:15 +01:00
Seokjae Lee
6e82427ffe
Clarify Javadoc of Customizer interfaces about overriding behavior
...
The previous wording suggested that customizations always retain
default auto-configuration. Rephrased to indicate that configuration
can be fine-tuned, which more accurately reflects that some builder
methods may override or replace defaults.
See gh-46938
Signed-off-by: Seokjae Lee <seok9211@naver.com >
2025-08-22 11:38:34 +01:00
Andy Wilkinson
72befafe67
Merge branch '3.5.x'
...
Closes gh-46940
2025-08-22 11:00:35 +01:00
Andy Wilkinson
f655db371f
Merge branch '3.4.x' into 3.5.x
...
Closes gh-46939
2025-08-22 11:00:01 +01:00
Andy Wilkinson
4679579800
Merge pull request #46936 from dependabot[bot]
...
* gh-46936:
Bump sha.js from 2.4.11 to 2.4.12 in /antora
Closes gh-46936
2025-08-22 10:59:42 +01:00
dependabot[bot]
d4b37a70ed
Bump sha.js from 2.4.11 to 2.4.12 in /antora
...
Bumps [sha.js](https://github.com/crypto-browserify/sha.js ) from 2.4.11 to 2.4.12.
- [Changelog](https://github.com/browserify/sha.js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/crypto-browserify/sha.js/compare/v2.4.11...v2.4.12 )
---
updated-dependencies:
- dependency-name: sha.js
dependency-version: 2.4.12
dependency-type: indirect
...
See gh-46936
Signed-off-by: dependabot[bot] <support@github.com >
2025-08-22 10:59:17 +01:00
Andy Wilkinson
50e5421467
Roll back to Log4j 2.24
...
This reverts:
- 7a5e77fe67
- 1590e4d2b3
- 8cf0d17fbc
See gh-46334, gh-46372
2025-08-21 18:23:35 +01:00
Stéphane Nicoll
1590e4d2b3
Fix broken assertions on Windows
...
See gh-46334
2025-08-21 17:52:43 +02:00
Stéphane Nicoll
7a5e77fe67
Merge pull request #46372 from vy
...
* pr/46372:
Polish "Avoid using deprecated Log4J constructors"
Avoid using deprecated Log4J constructors
Closes gh-46372
2025-08-21 17:12:03 +02:00
Stéphane Nicoll
9c1e0e624e
Polish "Avoid using deprecated Log4J constructors"
...
See gh-46372
2025-08-21 16:58:34 +02:00
Volkan Yazıcı
f7f049da1c
Avoid using deprecated Log4J constructors
...
See gh-46372
Signed-off-by: Volkan Yazıcı <volkan@yazi.ci >
2025-08-21 16:58:34 +02:00
Stéphane Nicoll
8cf0d17fbc
Upgrade to Log4j2 2.25.1
...
Closes gh-46334
2025-08-21 16:54:01 +02:00
Moritz Halbritter
376ad32759
Merge branch '3.5.x'
2025-08-21 16:16:21 +02:00
Moritz Halbritter
994e525409
Next development version (v3.5.6-SNAPSHOT)
2025-08-21 16:15:57 +02:00
Moritz Halbritter
114c0ec68c
Merge branch '3.5.x'
2025-08-21 10:30:38 +02:00
Moritz Halbritter
a22e28e9e0
Merge branch '3.4.x' into 3.5.x
2025-08-21 10:30:20 +02:00
Moritz Halbritter
4cb8c8a1b9
Next development version (v3.4.10-SNAPSHOT)
2025-08-21 10:29:42 +02:00
Andy Wilkinson
480977fb32
Upgrade to Spring Batch 6.0.0-M2
...
Closes gh-46618
2025-08-21 08:12:47 +01:00
Stéphane Nicoll
e6879423fc
Merge branch '3.5.x'
...
Closes gh-46931
2025-08-21 07:41:34 +02:00
Stéphane Nicoll
9d205e21c4
Merge branch '3.4.x' into 3.5.x
...
Closes gh-46930
2025-08-21 07:34:22 +02:00
Stéphane Nicoll
47b06322d3
Merge pull request #46927 from izeye
...
* pr/46927:
Adapt checkstyle rules for 3.4.x
Remove redundant suppressions from Checkstyle configuration
Closes gh-46927
2025-08-21 07:32:01 +02:00
Stéphane Nicoll
8b71458025
Adapt checkstyle rules for 3.4.x
...
See gh-46927
2025-08-21 07:31:40 +02:00
Johnny Lim
fb99badf16
Remove redundant suppressions from Checkstyle configuration
...
See gh-46927
Signed-off-by: Johnny Lim <izeye@naver.com >
2025-08-21 07:31:23 +02:00
Phillip Webb
ac2e6972d7
Provide configuration property to disable console logging
...
Add `logging.console.enabled` which when set will cause the
`logging.threshold.console` property to be set to `OFF`.
Closes gh-46592
2025-08-20 19:17:30 -07:00
Phillip Webb
7140be8751
Rename metrics, observation, and tracing modules
...
Rename modules to include 'micrometer'.
Closes gh-46925
2025-08-20 16:05:11 -07:00
Moritz Halbritter
bd1df38ce0
Back off if spring-boot-opentelemetry is missing
...
Closes gh-46303
2025-08-20 13:52:38 +02:00
Andy Wilkinson
aff6ed3830
Upgrade to Spring RESTDocs 4.0.0-M2
...
Closes gh-46623
2025-08-20 12:35:15 +01:00
Andy Wilkinson
f29fc4def1
Merge branch '3.5.x'
2025-08-20 12:34:38 +01:00
Andy Wilkinson
8af836a428
Upgrade to Spring RESTDocs 3.0.5
...
Closes gh-46920
2025-08-20 12:34:27 +01:00
Andy Wilkinson
ae6c6a5ed4
Merge branch '3.4.x' into 3.5.x
2025-08-20 12:34:09 +01:00
Andy Wilkinson
b6bae9f59b
Upgrade to Spring RESTDocs 3.0.5
...
Closes gh-46919
2025-08-20 12:34:00 +01:00
Andy Wilkinson
27c96d9109
Fix null safety of Gradle Kotlin scripts with Gradle 9
...
See gh-46923
2025-08-20 12:32:10 +01:00
Moritz Halbritter
d9b05c7108
Add dependencies to spring-boot-starter-opentelemetry to produce OTLP
...
This commit adds all necessary dependencies to
spring-boot-starter-opentelemetry to produce OTLP metrics and tracing
out of the box.
Closes gh-46842
2025-08-20 13:10:19 +02:00
Andy Wilkinson
37342aff69
Merge branch '3.5.x'
...
Closes gh-46923
2025-08-20 11:32:02 +01:00
Andy Wilkinson
8cb001d4cf
Add CI for Java 25
...
Closes gh-46907
2025-08-20 10:37:35 +01:00
Andy Wilkinson
c98ffebc63
Merge branch '3.5.x'
...
Closes gh-46922
2025-08-20 08:45:02 +01:00
Andy Wilkinson
21d4c9b69b
Merge branch '3.4.x' into 3.5.x
...
Closes gh-46921
2025-08-20 08:44:34 +01:00
Andy Wilkinson
ec09196137
Merge pull request #46914 from nicolasgarea
...
* gh-46914:
Remove redundant suppressions
Remove duplicate suppression in Checkstyle configuration
Closes gh-46914
2025-08-20 08:44:20 +01:00
Andy Wilkinson
25c29b52b8
Remove redundant suppressions
...
See gh-46914
2025-08-20 08:44:13 +01:00
Nicolas Garea
4c76392255
Remove duplicate suppression in Checkstyle configuration
...
See gh-46914
Signed-off-by: Nicolas Garea <nicogareacidre@gmail.com >
2025-08-20 08:44:04 +01:00
Andy Wilkinson
b5d2b66e7a
Update Servlet container system requirements
...
Closes gh-46918
2025-08-20 08:35:35 +01:00
Brian Clozel
8c0051a02e
Drop Undertow support
...
Spring Framework 7.0 requires a Servlet 6.1 baseline for Servlet containers.
Partial Servlet 6.1 support is available on the `main` Undertow branch,
but there isn't any milestone version available for the undertow 2.4
generation. At this stage of our 4.0 schedule, we think it's safer to drop
Undertow support now.
Closes: gh-46917
2025-08-20 09:30:40 +02:00
Andy Wilkinson
f79c7d90b2
Merge branch '3.5.x'
2025-08-20 07:45:21 +01:00
Andy Wilkinson
8ae2e8b83c
Start building against Spring RESTDocs 3.0.5 snapshots
...
See gh-46920
2025-08-20 07:44:58 +01:00
Andy Wilkinson
82949eeee5
Merge branch '3.4.x' into 3.5.x
2025-08-20 07:44:12 +01:00
Andy Wilkinson
6381582e3c
Start building against Spring RESTDocs 3.0.5 snapshots
...
See gh-46919
2025-08-20 07:44:01 +01:00
Phillip Webb
dbd8ab897b
Merge pull request #46404 from smartandhandsome
...
* pr/46404:
Polish 'Support virtual threading with JDK HTTP clients'
Support virtual threading with JDK HTTP clients
Closes gh-46404
2025-08-19 22:27:02 -07:00