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

58713 Commits

Author SHA1 Message Date
Andy Wilkinson 885f90da0c Introduce spring-boot-webclient-test 
See gh-46356
See gh-47322
 2025-10-10 12:11:43 +01:00
Andy Wilkinson 1706a7cff6 Include Micrometer test modules in OpenTelemetry test starter 
See gh-46356
See gh-47322
 2025-10-10 10:18:34 +01:00
Andy Wilkinson 2a2d3a88d2 Correct imports for AutoConfigureJson 
See gh-47322
 2025-10-10 09:55:20 +01:00
Andy Wilkinson f549467666 Rename SharedObjectMapper to SharedJsonMapper
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 
Closes gh-47471
 2025-10-10 09:33:34 +01:00
Andy Wilkinson 6e4b88d850 Add property to configure Jackson 3 with Boot's Jackson 2 defaults 
Closes gh-
 2025-10-10 09:21:41 +01:00
Andy Wilkinson 630797fa9b Merge branch '3.5.x' 
Closes gh-47475
 2025-10-10 08:42:21 +01:00
Andy Wilkinson bb0fd0c778 Update javadoc of TestRestTemplate after change to redirect behavior
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-47474
 2025-10-10 08:41:43 +01:00
Phillip Webb e01b36216a Revert Support pluggable types for EndpointJsonMapper 
Closes gh-46534
 2025-10-09 22:48:45 -07:00
Phillip Webb 02b2d03acf Rationalize HTTP client configuration properties 
Simplify HTTP client configuration properties by sharing common
settings for both blocking and reactive clients.

The `ClientHttpRequestFactorySettings` and `ClientHttpConnectorSettings`
have been merged to a single `HttpClientSettings` class. Properties
to configure common settings are available under:

	`spring.http.clients`

Blocking and reactive settings have been moved to
`spring.http.clients.blocking` and `spring.http.clients.reactive`. With
currently only the factory/connector being configurable.

HTTP Service Client properties have also been rationalized under a
`spring.http.serviceclient.<group-name>`. Support for properties that
apply to all service clients and all Rest/Web Clients have been removed.

Support for `ApiVerionInserter` beans has also been removed in favor of
configuring the service group or builders directly.

Closes gh-47398
 2025-10-09 22:18:53 -07:00
Phillip Webb f4e8cacbcd Polish 2025-10-09 22:17:24 -07:00
Andy Wilkinson 9eb05ebb10 Create spring-boot-resttestclient and spring-boot-webtestclient modules 
Create `spring-boot-resttestclient` and `spring-boot-webtestclient`
modules to hold test client auto-configuration and `TestRestTemplate`
code.

Previous these classes were contained in `spring-boot-resetclient-test`
and `spring-boot-webclient-test` which was incorrect since the `-test`
modules should hold code need to test the given modules, not supporting
test classes.

See gh-46356

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
 2025-10-09 22:12:39 -07:00
Andy Wilkinson 16d8878cd8 Support embedded web environment with @AutoConfigureWebTestClient 
Simplify `WebTestClient` testing support by removing the direct
context customizer in favor of using `@AutoConfigureWebTestClient`.

See gh-46356
 2025-10-09 22:11:44 -07:00
Andy Wilkinson 3bf53f8bf5 Introduce @AutoConfigureTestRestTemplate 
Add `@AutoConfigureTestRestTemplate` which can be used to
auto-configure a `TestRestTemplate`.

See gh-46356
 2025-10-09 22:09:36 -07:00
Andy Wilkinson 062bda3229 Polish test starters 
Polish test starter to:

- Align dependencies of starters and their -test companions
- Pull in regular starters from test starters

See gh-46356

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
 2025-10-09 22:07:26 -07:00
Andy Wilkinson 873a771bc2 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-10-09 14:14:28 +01:00
Andy Wilkinson 2776021356 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 
See gh-47275
 2025-10-09 14:13:47 +01:00
Andy Wilkinson bee968e0db Fix Bitnami variant of Neo4j Docker Compose test
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-46983
 2025-10-09 14:13:01 +01:00
Stéphane Nicoll f2176791ea Merge branch '3.5.x' 2025-10-09 14:48:04 +02:00
Stéphane Nicoll ca8e8c89ab Merge branch '3.4.x' into 3.5.x 2025-10-09 14:47:50 +02:00
Stéphane Nicoll a3b1ad2ac6 Start building against Spring WS 4.1.2 snapshots 
See gh-47467
 2025-10-09 14:34:27 +02:00
Stéphane Nicoll 5128d71ce6 Start building against Spring Session 3.5.3 snapshots 
See gh-47466
 2025-10-09 14:34:23 +02:00
Stéphane Nicoll 4e2407364d Start building against Spring Security 6.5.6 snapshots 
See gh-47465
 2025-10-09 14:34:19 +02:00
Stéphane Nicoll 3abb15dfba Start building against Spring Pulsar 1.2.11 snapshots 
See gh-47464
 2025-10-09 14:34:14 +02:00
Stéphane Nicoll be17f2c8af Start building against Spring LDAP 3.3.4 snapshots 
See gh-47463
 2025-10-09 14:34:10 +02:00
Stéphane Nicoll 15236f457d Start building against Spring Framework 6.2.12 snapshots 
See gh-47462
 2025-10-09 14:34:06 +02:00
Stéphane Nicoll f96deda009 Start building against Spring Data Bom 2025.0.5 snapshots 
See gh-47461
 2025-10-09 14:34:01 +02:00
Stéphane Nicoll e39b52450c Start building against Spring Authorization Server 1.5.3 snapshots 
See gh-47460
 2025-10-09 14:33:56 +02:00
Stéphane Nicoll 40988c959b Start building against Reactor Bom 2024.0.11 snapshots 
See gh-47459
 2025-10-09 14:33:52 +02:00
Stéphane Nicoll a4b644055f Start building against Micrometer Tracing 1.5.5 snapshots 
See gh-47458
 2025-10-09 14:33:48 +02:00
Stéphane Nicoll ce953a19a7 Start building against Micrometer 1.15.5 snapshots 
See gh-47457
 2025-10-09 14:33:44 +02:00
Stéphane Nicoll 3038fb89ec Start building against Spring WS 4.0.16 snapshots 
See gh-47456
 2025-10-09 14:30:33 +02:00
Stéphane Nicoll 13a5a336b6 Start building against Spring Session 3.4.6 snapshots 
See gh-47455
 2025-10-09 14:30:29 +02:00
Stéphane Nicoll 3abcba2bcc Start building against Spring Security 6.4.12 snapshots 
See gh-47454
 2025-10-09 14:30:25 +02:00
Stéphane Nicoll 58831a7fe2 Start building against Spring Pulsar 1.2.11 snapshots 
See gh-47453
 2025-10-09 14:30:21 +02:00
Stéphane Nicoll b9f5f27372 Start building against Spring LDAP 3.2.15 snapshots 
See gh-47452
 2025-10-09 14:30:17 +02:00
Stéphane Nicoll 4a71a718f2 Start building against Spring Framework 6.2.12 snapshots 
See gh-47451
 2025-10-09 14:30:13 +02:00
Stéphane Nicoll 2e7b21afbe Start building against Spring Data Bom 2024.1.11 snapshots 
See gh-47450
 2025-10-09 14:30:09 +02:00
Stéphane Nicoll c21066b1ba Start building against Spring Authorization Server 1.4.6 snapshots 
See gh-47449
 2025-10-09 14:30:06 +02:00
Stéphane Nicoll 7b9041a527 Start building against Reactor Bom 2024.0.11 snapshots 
See gh-47448
 2025-10-09 14:30:01 +02:00
Stéphane Nicoll 15ddadc615 Start building against Micrometer Tracing 1.4.11 snapshots 
See gh-47447
 2025-10-09 14:29:57 +02:00
Stéphane Nicoll df89349424 Start building against Micrometer 1.14.12 snapshots 
See gh-47446
 2025-10-09 14:29:53 +02:00
Andy Wilkinson da74dd92c9 Merge branch '3.5.x' 
Closes gh-47439
 2025-10-09 10:59:17 +01:00
Andy Wilkinson c6311feb82 Merge branch '3.4.x' into 3.5.x 
Closes gh-47438
 2025-10-09 10:57:40 +01:00
Andy Wilkinson 9e621d65c4 Merge branch '3.4.x' into 3.5.x 
Closes gh-47438
 2025-10-09 10:55:21 +01:00
Stéphane Nicoll 1754e2e909 Merge branch '3.5.x' 
Closes gh-47440
 2025-10-09 11:41:00 +02:00
Stéphane Nicoll f3f17be250 Merge pull request #47436 from JinhyeokFang 
* pr/47436:
  Fix typo

Closes gh-47436
 2025-10-09 11:40:45 +02:00
방진혁 e465b5a276 Fix typo 
See gh-47436

Signed-off-by: 방진혁 <jinhyeokfang@gmail.com>
 2025-10-09 11:37:03 +02:00
Stéphane Nicoll 65236603fc Polish 
See gh-46307
 2025-10-09 11:29:25 +02:00
Andy Wilkinson 3ba61c3fa7 Improve handling of annotation properties in architecture checks 
Closes gh-47437
 2025-10-09 09:55:25 +01:00
Phillip Webb 2196f6da73 Revert "Ignore failing Spring Data JDBC tests"
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 
This reverts commit c21293bb24.

Closes gh-47435
 2025-10-08 18:20:16 -07:00