Commit Graph

57508 Commits

Author SHA1 Message Date
Andy Wilkinson 52c55788a2 Add new -test modules to spring-boot-dependencies
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: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:false version:24], 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
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: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
See gh-47322
See gh-46356
2025-09-26 17:57:18 +01:00
Andy Wilkinson 990644919a Make all TypeExcludeFilters package-private
Closes gh-47227
2025-09-26 11:08:53 +01:00
Andy Wilkinson 2756424035 Merge branch '3.5.x'
Closes gh-47331
2025-09-26 10:32:41 +01:00
Andy Wilkinson 9c727be8f2 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
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-47330
2025-09-26 10:31:02 +01:00
Andy Wilkinson e4e3988433 Fix link to Framework's @Bean annotation
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-47329
2025-09-26 10:29:25 +01:00
Andy Wilkinson 0959271061 Move jackson read and write to spring.jackson.json
The spring.jackson.read and spring.jackson.write properties are
JSON-specific. To make this more clear, this commit moves them
beneath spring.jackson.json. This also paves the way for
spring.jackson.cbor and spring.jackson.xml properties for CBOR- and
XML-specific settings should we add auto-configuration for XMLMapper
and/or CBORMapper in the future.

Closes gh-47328
2025-09-26 10:01:59 +01:00
Andy Wilkinson 8c7e0c675f Move Jackson datetime property beneath datatype
Closes gh-47327
2025-09-26 09:04:06 +01:00
Andy Wilkinson 0b601118bd Modularize spring-boot-test
Closes gh-46356
2025-09-25 17:24:12 +01:00
Andy Wilkinson 5348880b69 Modularize spring-boot-test-autoconfigure
This commit modularizes spring-boot-test-autoconfigure. It now
contains only the code that's central to test auto-configuration.
Feature-specific functionality has moved out into -test modules,
some existing and some newly created. For example, `@DataJpaTest` can
now be found in spring-boot-data-jpa-test.

Closes gh-47322
2025-09-25 13:11:35 +01:00
Andy Wilkinson 7979a51f65 Fix Maven Plugin tests on main
See gh-47318
See gh-47319
2025-09-25 08:47:39 +01:00
Phillip Webb 27715dee20 Allow jars to be marked as a development-tool to exclude from uber-jar
Closes gh-47320
2025-09-24 16:38:44 -07:00
Phillip Webb d27aedf92a Switch Maven plugin to exclude optional dependencies by default
Closes gh-47318
2025-09-24 16:34:19 -07:00
Phillip Webb b3c28f1ef3 Merge branch '3.5.x'
Closes gh-47319
2025-09-24 16:32:14 -07:00
Phillip Webb f3b44031a6 Support exclusion of optional dependencies in uber-jars
Update Maven plugin with `<includeOptional>` configuration property that
can be used to toggle if optional dependencies are packages.

For back-compatibility, in 3.5.x the default is `true`.

Fixes gh-25403
2025-09-24 16:27:32 -07:00
Phillip Webb f6da5e7a5c Merge branch '3.5.x' 2025-09-24 16:22:44 -07:00
Phillip Webb 8d63043d9e Merge branch '3.4.x' into 3.5.x 2025-09-24 16:20:42 -07:00
Phillip Webb b43d2f2088 Remove version number from assertions 2025-09-24 14:08:26 -07:00
Andy Wilkinson 0b0b742758 Merge branch '3.5.x'
Closes gh-47312
2025-09-24 15:21:40 +01:00
Andy Wilkinson b61e38bef8 Support launching with a parameterless main method
Fixes gh-47311
2025-09-24 15:16:18 +01:00
Andy Wilkinson 6490b749db Merge branch '3.5.x'
Closes gh-47310
2025-09-24 14:57:27 +01:00
Andy Wilkinson 9a1d9f677b Add support for finding package-private and parameterless main
Fixes gh-47309
2025-09-24 14:54:06 +01:00
Brian Clozel 1cd14c96a5 Configure ProblemDetailJacksonMixin on JsonMapper
Prior to this commit, Spring Boot would use Framework's
`Jackson2ObjectMapperBuilder` to configure the `ObjectMapper` instance.
This builder would configure the `ProblemDetail` mixin automatically.

With the introduction of Jackson 3.x support, Spring Framework removed
its builder in favor of the native Jackson builder. As a result, the
mixin is not registered with the `JsonMapper` aymore.

This commit ensures that the mixin is registered if the `ProblemDetail`
class is present in the classpath.

Closes gh-47298
2025-09-24 14:29:09 +02:00
Andy Wilkinson 51b606e941 Polish 2025-09-24 12:47:09 +01:00
Stéphane Nicoll c5e28c9133 Upgrade to Log4j2 2.25.2
Closes gh-46334
2025-09-24 12:52:00 +02:00
Stéphane Nicoll c4cace3f74 Upgrade to Log4j2 2.25.2
See gh-46334
2025-09-24 12:14:32 +02:00
Stéphane Nicoll b7695200a9 Re-apply the upgrade to Log4j2 2.25.1
See gh-46372
See gh-46334
2025-09-24 12:13:54 +02:00
Stéphane Nicoll 5cec09dd02 Merge pull request #47297 from rstoyanchev
* pr/47297:
  Polish
  Fix renamed link to HTTP Service Clients docs

Closes gh-47297
2025-09-24 11:56:05 +02:00
Stéphane Nicoll cae5a811ad Polish
See gh-47297
2025-09-24 11:48:26 +02:00
rstoyanchev 0afd40fa40 Fix renamed link to HTTP Service Clients docs
See gh-47297
2025-09-24 11:44:47 +02:00
Stéphane Nicoll 3265a2672d Merge branch '3.5.x'
Closes gh-47307
2025-09-24 11:43:34 +02:00
Stéphane Nicoll b6a1c29763 Merge branch '3.4.x' into 3.5.x
Closes gh-47306
2025-09-24 11:43:21 +02:00
Stéphane Nicoll 9a3a3b1b5e Merge pull request #47304 from scottfrederick
* pr/47304:
  Update managed dependency version override examples in documentation

Closes gh-47304
2025-09-24 11:43:10 +02:00
Scott Frederick 6354d802c0 Update managed dependency version override examples in documentation
The examples for overriding a managed dependency version with Maven
were using an outdated version property. This commit updates the
example to use a valid property.

The version override warning from the Gradle plugin docs was also
copied to the Maven docs.

See gh-47304

Signed-off-by: Scott Frederick <scottyfred@gmail.com>
2025-09-24 11:39:49 +02:00
Phillip Webb bc46bb2a24 Drop spring-boot-loader-classic support
Closes gh-45714
2025-09-23 15:31:51 -07:00
Phillip Webb 3b2c8abf50 Restructure buildpack docker package
Closes gh-45284
2025-09-23 13:59:27 -07:00
Phillip Webb dc341edfdd Add config prop to enabled/disable Elasticsearch sniffer
Closes gh-47301

Co-Authored-By: Andy Wilkinson <andy.wilkinson@broadcom.com>
2025-09-23 08:28:51 +01:00
Phillip Webb 3a9ab15696 Reintroduce previous EnvironmentPostProcessor in deprecated form
Restore previous `EnvironmentPostProcessor` in deprecated form to help
lessen upgrade pain.

Closes gh-47272
2025-09-22 11:25:23 -07:00
Andy Wilkinson 8d87586395 Merge branch '3.5.x'
Closes gh-47296
2025-09-22 11:05:13 +01:00
Andy Wilkinson d3bab5f82d Test against Gradle 9.1.0
Closes gh-47295
2025-09-22 11:02:55 +01:00
Phillip Webb 862db41134 Fix typo 2025-09-19 15:09:40 -07:00
Stéphane Nicoll 42cc7775f4 Merge branch '3.5.x'
Closes gh-47283
2025-09-19 17:57:10 +02:00
Stéphane Nicoll 5c95ee798c Use Java 25 GA on CI
Closes gh-47246
2025-09-19 17:56:49 +02:00
Stéphane Nicoll 14703cbafd Revert "Remove mentions of JUnit 4"
This reverts commit 3b98af30f5.

See gh-47228
2025-09-19 17:05:00 +02:00
Stéphane Nicoll 3b98af30f5 Remove mentions of JUnit 4
This commit removes all mentions of JUnit 4 from the Javadoc and
reference documentation. It also harmonizes to simply refers to JUnit.

Closes gh-47228
2025-09-19 15:29:11 +02:00
Moritz Halbritter 8d000e008f Merge branch '3.5.x' 2025-09-19 11:24:32 +02:00
Moritz Halbritter 335a0b76b5 Merge branch '3.4.x' into 3.5.x
Closes gh-47275
2025-09-19 10:38:39 +02:00
Moritz Halbritter 4a1de8534f Add detection for Bitnami Legacy images
This commit also adjusts the tests to use bitnamilegacy images because we have no way to test against the original bitnami images.

Closes gh-46983
2025-09-19 10:18:59 +02:00
Moritz Halbritter 630bb335ea Revert "Disable tests which use Bitnami images"
This reverts commit 24a23c4f72.

See gh-46983
2025-09-19 09:01:01 +02:00
Phillip Webb c1d51f8687 Remove Bitnami support
Closes gh-47267
2025-09-18 14:41:16 -07:00
Phillip Webb 255ea92a57 Add `HttpClientTransport` factory support
Update `JettyClientHttpRequestFactoryBuilder` and
`JettyClientHttpConnectorBuilder` with support for create the
`HttpClientTransport` from a factory function.

Closes gh-47251
2025-09-18 14:02:18 -07:00