Skip to content

Bump Spring Boot to 4.1#390

Merged
D-D-H merged 2 commits into
eclipse-jifa:mainfrom
D-D-H:spring_boot_4_1
Jun 25, 2026
Merged

Bump Spring Boot to 4.1#390
D-D-H merged 2 commits into
eclipse-jifa:mainfrom
D-D-H:spring_boot_4_1

Conversation

@D-D-H

@D-D-H D-D-H commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

Upgrade Spring Boot from 3.3.11 to 4.1.0.

  • Update Gradle wrapper to 8.14.3 (required by the Spring Boot 4 plugin)
  • Pin spring-retry to 2.0.12 and add spring-boot-starter-webmvc-test, which are no longer provided transitively by the Spring Boot 4 BOM
  • Align JUnit (6.0.3) and Mockito (5.23.0) with the Spring Boot 4.1 BOM
  • Migrate imports for the split spring-boot-autoconfigure modules (OAuth2ClientProperties, TomcatServletWebServerFactory, MultipartProperties, EntityScan, SecurityAutoConfiguration, WebMvcTest)
  • Replace @MockBean with @MockitoBean
  • Insert GsonHttpMessageConverter after ByteArrayHttpMessageConverter so @RequestBody byte[] is still read as raw bytes under Spring Framework 7

Upgrade Spring Boot from 3.3.11 to 4.1.0.

- Update Gradle wrapper to 8.14.3 (required by the Spring Boot 4 plugin)
- Pin spring-retry to 2.0.12 and add spring-boot-starter-webmvc-test,
  which are no longer provided transitively by the Spring Boot 4 BOM
- Align JUnit (6.0.3) and Mockito (5.23.0) with the Spring Boot 4.1 BOM
- Migrate imports for the split spring-boot-autoconfigure modules
  (OAuth2ClientProperties, TomcatServletWebServerFactory,
  MultipartProperties, EntityScan, SecurityAutoConfiguration, WebMvcTest)
- Replace @MockBean with @MockitoBean
- Insert GsonHttpMessageConverter after ByteArrayHttpMessageConverter so
  @RequestBody byte[] is still read as raw bytes under Spring Framework 7

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Upgrades the server build and test suite to Spring Boot 4.1.0 / Spring Framework 7 expectations, including dependency and import migrations required by split autoconfigure/test modules and updated Mockito integration.

Changes:

  • Bump Spring Boot Gradle plugin to 4.1.0 and Gradle wrapper to 8.14.3.
  • Align dependency set with the Spring Boot 4.1 BOM (pin spring-retry, add spring-boot-starter-webmvc-test, update JUnit/Mockito).
  • Migrate code/test imports for moved Boot modules and switch @MockBean to @MockitoBean; adjust MVC message-converter ordering for byte[] request bodies.

Reviewed changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
server/src/test/java/org/eclipse/jifa/server/domain/dto/TestFileTransferRequest.java Update WebMvc test imports for Spring Boot 4 module split.
server/src/test/java/org/eclipse/jifa/server/controller/TestHealthCheckController.java Update WebMvc test + Security auto-config imports for Boot 4.
server/src/test/java/org/eclipse/jifa/server/controller/TestHandshakeController.java Replace @MockBean with @MockitoBean and update Boot 4 imports.
server/src/test/java/org/eclipse/jifa/server/controller/TestFileController.java Replace @MockBean with @MockitoBean and update Boot 4 imports.
server/src/test/java/org/eclipse/jifa/server/controller/TestElasticWorkerController.java Replace @MockBean with @MockitoBean and update Boot 4 imports.
server/src/test/java/org/eclipse/jifa/server/controller/TestAnalysisApiStompController.java Replace @MockBean with @MockitoBean for Boot 4 / Spring Test.
server/src/test/java/org/eclipse/jifa/server/controller/TestAnalysisApiHttpController.java Replace @MockBean with @MockitoBean and update Boot 4 imports.
server/src/main/java/org/eclipse/jifa/server/controller/HandshakeController.java Update moved Boot configuration property imports (OAuth2/multipart).
server/src/main/java/org/eclipse/jifa/server/controller/GlobalExceptionHandler.java Update moved multipart configuration import.
server/src/main/java/org/eclipse/jifa/server/configurer/SecurityFilterConfigurer.java Update moved OAuth2 client properties import.
server/src/main/java/org/eclipse/jifa/server/configurer/HttpConfigurer.java Update moved Tomcat factory import and adjust Gson converter insertion logic.
server/src/main/java/org/eclipse/jifa/server/configurer/EntityConfigurer.java Update moved @EntityScan import.
server/server.gradle Bump Boot plugin, pin spring-retry, add WebMVC test starter.
jifa.gradle Bump Boot plugin and adjust Jacoco report aggregation configuration.
gradle/wrapper/gradle-wrapper.properties Update Gradle wrapper distribution to 8.14.3.
gradle/java.gradle Align test dependencies (JUnit/Mockito) with the new BOM and launcher requirements.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@jasonk000

Copy link
Copy Markdown
Contributor

Please proceed - I won't have time to look at this now, maybe in a few weeks - Thanks!

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Denghui Dong <denghui.ddh@alibaba-inc.com>
@D-D-H D-D-H merged commit 20b1a25 into eclipse-jifa:main Jun 25, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants