spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity
60,553 Commits 24 Branches 394 Tags
5cecd3922fce651f13d16a85d8a29efaa7f44cfd
Commit Graph
60553 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stéphane Nicoll 5cecd3922f Merge branch '4.0.x' 
Closes gh-49834
 2026-03-28 18:07:21 +01:00
Stéphane Nicoll 6b7d577717 Merge pull request #49826 from bachhs 
* docs/replace-deprecated-kafka-json-serializers:
  Adapt to Jackson 3 Kafka support

Closes gh-49826
 2026-03-28 18:07:13 +01:00
bachhs 67ad1fa2b4 Adapt to Jackson 3 Kafka support 
See gh-49826

Signed-off-by: bachhs <bachhs21@gmail.com>
 2026-03-28 18:01:17 +01:00
Stéphane Nicoll a20a93abdc Merge branch '4.0.x' 
Closes gh-49824
 2026-03-27 17:46:57 +01:00
Stéphane Nicoll 5c75d33a85 Merge branch '3.5.x' into 4.0.x 
Closes gh-49823
 2026-03-27 17:46:50 +01:00
Stéphane Nicoll 8d1148c0f3 Merge pull request #49822 from dependabot[bot] 
* dependabot/npm_and_yarn/antora/multi-57404e07ab:
  Bump brace-expansion in /antora

Closes gh-49822
 2026-03-27 17:46:41 +01:00
dependabot[bot] 7e414ec0c7 Bump brace-expansion in /antora 
Bumps  and [brace-expansion](https://github.com/juliangruber/brace-expansion). These dependencies needed to be updated together.

Updates `brace-expansion` from 1.1.12 to 1.1.13
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/v1.1.12...v1.1.13)

Updates `brace-expansion` from 2.0.2 to 2.0.3
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/v1.1.12...v1.1.13)

---
updated-dependencies:
- dependency-name: brace-expansion
  dependency-version: 1.1.13
  dependency-type: indirect
- dependency-name: brace-expansion
  dependency-version: 2.0.3
  dependency-type: indirect
...

See gh-49822

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-27 17:45:20 +01:00
Stéphane Nicoll 3972d42a8f Add support for loading layers configuration from the plugin classpath 
This commit introduces an alternative to load layers configuration from
the classpath. This lets user package their custom layers XML at
META-INF/spring/layers/<name>.xml in a plugin dependency rather than
referencing a file path directly.

The name of the layers configuration can then be referenced using the
new `configurationName` property.

Closes gh-32466
 2026-03-27 17:39:18 +01:00
Stéphane Nicoll b089e2148d Adapt Javadoc reference 2026-03-27 17:25:55 +01:00
Stéphane Nicoll 67bb931f22 Merge branch '4.0.x' 
Closes gh-49819
 2026-03-27 11:45:05 +01:00
Stéphane Nicoll 57a3521c45 Merge branch '3.5.x' into 4.0.x 
Closes gh-49818
 2026-03-27 11:44:54 +01:00
Stéphane Nicoll 72cd3b5579 Merge pull request #49816 from quaff 
* patch-209:
  Do not use String#replaceAll() with a non-regex pattern

Closes gh-49816
 2026-03-27 11:44:23 +01:00
Yanming Zhou 9520eb9622 Do not use String#replaceAll() with a non-regex pattern 
See gh-49816

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2026-03-27 11:40:28 +01:00
Stéphane Nicoll e1039574b4 Merge branch '4.0.x' 2026-03-27 11:32:35 +01:00
Stéphane Nicoll 54d923f392 Merge branch '3.5.x' into 4.0.x 2026-03-27 11:32:29 +01:00
Stéphane Nicoll 9a74fd55d3 Adapt to code style changes in IntelliJ IDEA 2026.1 2026-03-27 11:31:51 +01:00
Stéphane Nicoll 29b03edf6f Do not configure a ReactiveJmtDecoder without spring-webflux 
This commit guards the creation of a ReactiveJwtDecoder with the
presence of Spring WebFlux. WebClient is used behind the scenes and
the sole presences of the authorization server and reactive types were
not precise enough.

Closes gh-49807
 2026-03-27 11:11:22 +01:00
Stéphane Nicoll eea4e2c72f Merge branch '4.0.x' 
Closes gh-49814
 2026-03-27 08:05:08 +01:00
Stéphane Nicoll e2e4a1c37a Merge branch '3.5.x' into 4.0.x 
Closes gh-49813
 2026-03-27 08:04:58 +01:00
Stéphane Nicoll 5dd6f2d75a Merge pull request #49809 from dependabot[bot] 
* dependabot/npm_and_yarn/antora/convict-6.2.5:
  Bump convict from 6.2.4 to 6.2.5 in /antora

Closes gh-49809
 2026-03-27 08:04:42 +01:00
dependabot[bot] 2d744b20c4 Bump convict from 6.2.4 to 6.2.5 in /antora 
Bumps [convict](https://github.com/mozilla/node-convict) from 6.2.4 to 6.2.5.
- [Changelog](https://github.com/mozilla/node-convict/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mozilla/node-convict/commits)

---
updated-dependencies:
- dependency-name: convict
  dependency-version: 6.2.5
  dependency-type: indirect
...

See gh-49809

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-27 08:04:04 +01:00
Stéphane Nicoll 02f3dba12b Merge branch '4.0.x' 2026-03-26 16:08:01 +01:00
Stéphane Nicoll 9105b64025 Merge branch '3.5.x' into 4.0.x 2026-03-26 16:07:44 +01:00
Stéphane Nicoll 4527245ebc Polish javadoc 2026-03-26 16:06:01 +01:00
Andy Wilkinson 045f9a344c Merge branch '4.0.x' 
Closes gh-49805
 2026-03-26 14:59:37 +00:00
Andy Wilkinson 941f006f37 Merge branch '3.5.x' into 4.0.x 
Closes gh-49804
 2026-03-26 14:58:17 +00:00
Andy Wilkinson 1b6e68ecf1 Upgrade to GitHub Changelog Generator 0.0.14 
Closes gh-49803
 2026-03-26 14:56:34 +00:00
Stéphane Nicoll bafdae6bee Merge pull request #49791 from husseinvr97 
* gh-49623-default-html-escape-property:
  Polish "Add configuration for HTML escaping configuration with WebFlux"
  Add configuration for HTML escaping configuration with WebFlux

Closes gh-49791
 2026-03-26 15:20:37 +01:00
Stéphane Nicoll c747c9c53d Polish "Add configuration for HTML escaping configuration with WebFlux" 
See gh-49791
 2026-03-26 15:11:36 +01:00
husseinvr97 59f8dca1a4 Add configuration for HTML escaping configuration with WebFlux 
See gh-49791

Signed-off-by: husseinvr97 <husseinmustafabas05@gmail.com>
 2026-03-26 15:11:19 +01:00
Stéphane Nicoll 6c66555a6e Merge branch '4.0.x' 
Closes gh-49802
 2026-03-26 14:47:45 +01:00
Stéphane Nicoll f2860e2798 Merge branch '3.5.x' into 4.0.x 
Closes gh-49801
 2026-03-26 14:47:37 +01:00
Stéphane Nicoll 2602327a76 Merge pull request #49790 from dependabot[bot] 
* dependabot/npm_and_yarn/antora/multi-bf05dc1ecf:
  Bump picomatch in /antora

Closes gh-49790
 2026-03-26 14:47:27 +01:00
dependabot[bot] 14aa3aa491 Bump picomatch in /antora 
Bumps  and [picomatch](https://github.com/micromatch/picomatch). These dependencies needed to be updated together.

Updates `picomatch` from 2.3.1 to 2.3.2
- [Release notes](https://github.com/micromatch/picomatch/releases)
- [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/picomatch/compare/2.3.1...2.3.2)

Updates `picomatch` from 4.0.3 to 4.0.4
- [Release notes](https://github.com/micromatch/picomatch/releases)
- [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/picomatch/compare/2.3.1...2.3.2)

---
updated-dependencies:
- dependency-name: picomatch
  dependency-version: 2.3.2
  dependency-type: indirect
- dependency-name: picomatch
  dependency-version: 4.0.4
  dependency-type: indirect
...

See gh-49790

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-26 14:45:08 +01:00
Stéphane Nicoll 5e6b4045a6 Merge branch '4.0.x' 
Closes gh-49799
 2026-03-26 11:26:08 +01:00
Stéphane Nicoll 30a3fac242 Merge branch '3.5.x' into 4.0.x 
Closes gh-49798
 2026-03-26 11:25:57 +01:00
Stéphane Nicoll 29674df3ee Remove duplicated default in manual Jackson metadata 
Closes gh-49797
 2026-03-26 11:19:26 +01:00
Stéphane Nicoll 4d074fcb64 Polish 2026-03-26 10:51:27 +01:00
Andy Wilkinson 4c143270ea Merge branch '4.0.x' 2026-03-26 07:56:57 +00:00
Andy Wilkinson 1d8997f604 Next development version (v4.0.6-SNAPSHOT) 2026-03-26 07:56:29 +00:00
Andy Wilkinson e1d6e5a709 Merge branch '3.5.x' into 4.0.x 2026-03-26 07:55:34 +00:00
Andy Wilkinson 6c9e52a174 Next development version (v3.5.14-SNAPSHOT) 2026-03-26 07:55:02 +00:00
Stéphane Nicoll 910340c934 Merge pull request #49730 from therepanic 
* polish-GrpcClientObservationAutoConfiguration:
  Harmonize ObservationConvention parameters in gRPC support
  Rename GrpcClientObservationConvention parameter to convention

Closes gh-49730
 2026-03-26 08:41:59 +01:00
Stéphane Nicoll d7a4561da8 Harmonize ObservationConvention parameters in gRPC support 
Such parameters are usually named "customConvention" so this commit
aligns to that naming.

See gh-49730
 2026-03-26 08:38:42 +01:00
Andrey Litvitski f368ac4805 Rename GrpcClientObservationConvention parameter to convention 
See gh-49787

Signed-off-by: Andrey Litvitski <andrey1010102008@gmail.com>
 2026-03-26 08:33:28 +01:00
Andy Wilkinson 6b6550d10d Upgrade to Netty 4.2.12.Final 
Closes gh-49795
 2026-03-26 07:16:45 +00:00
Andy Wilkinson 72fbd2242f Merge branch '4.0.x' 2026-03-26 07:16:11 +00:00
Andy Wilkinson a413e9545f Upgrade to Netty 4.2.12.Final 
Closes gh-49794
 2026-03-26 07:15:58 +00:00
Phillip Webb d28cec064e Replace PropertyBasedRequiredBackgroundBootstrapping with exception 
Replace `PropertyBasedRequiredBackgroundBootstrapping` with a simpler
`BootstrapExecutorRequiredException` and use a regular failure analyzer
to provide help.

See gh-49733
See gh-49688
 2026-03-25 19:19:48 -07:00
Andy Wilkinson 5b6d346c60 Prohibit upgrades to ActiveMQ 6.2.2 
Closes gh-49768
 2026-03-25 15:55:43 +00:00