Commit Graph

28 Commits

Author SHA1 Message Date
Andy Wilkinson 16718f676d Upgrade to Detekt 2.0.0-alpha.0
We need to upgrade for better compatibility with Java 25.

See gh-47413
2025-10-06 19:41:08 +01:00
Phillip Webb 6f909114e7 Move `WebTestClientBuilderCustomizer` to `spring-boot-test`
Relocate `WebTestClientBuilderCustomizer` to `spring-boot-test`
and break the direct link to web-server and http-codec by making
use of `spring.factories` and the new `BaseUrlProviders` class.

A new `spring-boot-test-integration-test` module has also been
added to ensure hold the previous tests.

See gh-46356
2025-10-01 21:50:13 -07:00
Phillip Webb 36732bd74a Polish 2025-10-01 17:21:00 -07: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
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
Phillip Webb 862db41134 Fix typo 2025-09-19 15:09:40 -07:00
Phillip Webb fc68b001d8 Remove `isImmutable` and `getPrefix` from `OriginLookup`
Drop `isImmutable` and `getPrefix` from `OriginLookup` since
they're not really Origin concerns. Now that `env` is a
foundational layer we can add a dedicated `PropertySourceInfo`
interface and add that to the `o.s.b.env` package without
creating a package tangle.

Closes gh-45547
2025-09-17 14:57:33 -07:00
Phillip Webb 24c25aeae4 Tighten Checkstyle import-control rules for foundation layers
Update rules to ensure foundational layers don't depend on the
`org.springframework.boot` package.

Closes gh-47232
2025-09-17 14:57:32 -07:00
Phillip Webb 6c84674c33 Relocate `EnvironmentPostProcessor` and implementations out of `env`
Move the `EnvironmentPostProcessor` from `org.springframework.boot.env`
to `org.springframework.boot` so that we can make the `env` package
foundational.

Most `EnvironmentPostProcessor` implementation has also been relocated
to a new `org.springframework.boot.support` package.

See gh-47232
2025-09-17 14:57:10 -07:00
Phillip Webb 4ebf09ad12 Restructure bootstrap classes to a foundational layer
Move bootstrap code from `org.springframework.boot` to
`org.springframework.boot.bootstrap` and make them a foundational
layer.

This move helps reduce `org.springframework.boot.context.config`
dependencies to `org.springframework.boot`.

See gh-47232
2025-09-17 14:57:10 -07:00
Phillip Webb eeac38b70b Make 'org.springframework.boot.ssl` a foundational package
Closes gh-47219
2025-09-15 20:44:30 -07:00
Phillip Webb b9be1179a2 Update checkstyle import-control.xml following restructure
Closes gh-47218
2025-09-15 20:18:25 -07:00
Stéphane Nicoll ed1ee79aef Share JSON library consistently
This commit shades the use of 'com.vaadin.external.google:android-json'
in the three modules that use it. The configuration processor already
did that and this commit does the same for configuration-metadata and
the CLI.

As a result of this commit, 'android-json' is not used nor managed
internally.

Closes gh-45504
2025-09-15 16:17:21 +02:00
Moritz Halbritter 2907fec181 Improve null-safety of module/spring-boot-actuator
See gh-46926
2025-08-26 14:22:54 +02: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 8cf0d17fbc Upgrade to Log4j2 2.25.1
Closes gh-46334
2025-08-21 16:54:01 +02:00
Stéphane Nicoll e6879423fc Merge branch '3.5.x'
Closes gh-46931
2025-08-21 07:41:34 +02:00
Andy Wilkinson c98ffebc63 Merge branch '3.5.x'
Closes gh-46922
2025-08-20 08:45:02 +01:00
Moritz Halbritter 2449769573 Add nullability annotations to buildpack/spring-boot-buildpack-platform
See gh-46587
2025-08-08 09:20:13 +02:00
Moritz Halbritter ac8db5d4e5 Add nullability annotations to module/spring-boot-jpa
See gh-46587
2025-08-01 09:16:11 +02:00
Stéphane Nicoll 6aa295048f Merge branch '3.5.x'
Closes gh-46613
2025-07-31 08:20:03 +02:00
Moritz Halbritter b6e4533296 Add nullability annotations to core/spring-boot-autoconfigure
See gh-46587
2025-07-29 14:33:21 +02:00
Moritz Halbritter 1b3e9e679f Add nullability annotations to core/spring-boot
See gh-46587
2025-07-29 12:38:55 +02:00
Moritz Halbritter 967e0482ee Allow org.springframework.lang.Contract import
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
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-46587
2025-07-29 10:45:28 +02:00
Stéphane Nicoll f36e40c6b6 Merge branch '3.5.x'
Closes gh-46562
2025-07-28 12:53:40 +02:00
Stéphane Nicoll 8827e29aec 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: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
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-46544
2025-07-25 16:32:18 +02:00
Phillip Webb 4c72ce69da Merge branch '3.5.x'
Closes gh-46481
2025-07-22 10:54:52 +01:00
Phillip Webb decc32dde3 Restructure project directories to better fit Gradle
Closes gh-46358
2025-07-10 17:54:08 -07:00