Upgrade multi-module Gradle project to Spring Boot 4.0.x

.github/workflows/build-and-publish-antora.yml

@@ -54,7 +54,7 @@ jobs:
           path: build/site
 
       - name: Setup Pages
-        uses: actions/configure-pages@v5
+        uses: actions/configure-pages@v6
 
       - name: Upload Pages artifact
         uses: actions/upload-pages-artifact@v4
@@ -63,4 +63,4 @@ jobs:
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5

.github/workflows/copilot-setup-steps.yml

@@ -0,0 +1,30 @@
+name: "Copilot Setup Steps"
+
+on:
+    workflow_dispatch:
+    push:
+        paths:
+            - .github/workflows/copilot-setup-steps.yml
+    pull_request:
+        paths:
+            - .github/workflows/copilot-setup-steps.yml
+
+jobs:
+    copilot-setup-steps:
+        runs-on: ubuntu-latest
+
+        permissions:
+            contents: read
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v6
+
+            - name: Set up JDK 25
+              uses: actions/setup-java@v5
+              with:
+                  java-version: "25"
+                  distribution: "temurin"
+
+            - name: Setup Gradle
+              uses: gradle/actions/setup-gradle@v6

.github/workflows/gradle-build.yml

@@ -66,7 +66,7 @@ jobs:
           java-version: '25'
           distribution: 'temurin'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
           add-job-summary-as-pr-comment: on-failure
           build-scan-publish: true
@@ -98,7 +98,7 @@ jobs:
           distribution: 'temurin'
           java-version: 25
       - name: Generate and submit dependency graph
-        uses: gradle/actions/dependency-submission@v5
+        uses: gradle/actions/dependency-submission@v6
         with:
           build-scan-publish: true
           build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
@@ -119,7 +119,7 @@ jobs:
           java-version: '25'
           distribution: 'temurin'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
           add-job-summary-as-pr-comment: on-failure
           build-scan-publish: true

README.adoc

@@ -9,7 +9,7 @@ Spring Data, Spring Batch, Spring Cloud, Spring Security, Spring GraphQL, and Sp
 with source code in individual submodules and can be found on {url-quickref}[GitHub].
 
 image:https://img.shields.io/badge/Java_-25-blue?style=flat-square[Static Badge]
-image:https://img.shields.io/badge/Spring_Boot-3.5.6-blue?style=flat-square&logo=springboot[Spring Boot version]
+image:https://img.shields.io/badge/Spring_Boot-4.0.5-blue?style=flat-square&logo=springboot[Spring Boot version]
 image:https://img.shields.io/github/actions/workflow/status/rashidi/spring-boot-tutorials/gradle-build.yml?style=flat-square&logo=githubactions&color=blue[Gradle Build]
 image:https://img.shields.io/github/actions/workflow/status/rashidi/spring-boot-tutorials/build-and-publish-antora.yml?style=flat-square&logo=antora&label=Antora&color=blue[Antora Site Status, link={url-docs}]
 image:https://img.shields.io/sonar/coverage/rashidi_spring-boot-tutorials?server=https%3A%2F%2Fsonarcloud.io&style=flat-square&color=blue[Sonar Coverage]
@@ -28,7 +28,7 @@ and always will be, my primary goal.
 
 With the help of https://github.com/dependabot[Dependabot], each tutorial is also kept up-to-date with the latest
 dependencies. Currently, we are using Java https://adoptium.net/en-GB/temurin/releases?version=25[Temurin 25]
-with https://plugins.gradle.org/plugin/org.springframework.boot/3.5.6[Spring Boot 3.5.6].
+with https://plugins.gradle.org/plugin/org.springframework.boot/4.0.5[Spring Boot 4.0.5].
 
 == Documentation
 

batch-rest-repository/README.adoc

@@ -115,7 +115,7 @@ class UserBatchJobTests {
     private final static MongoDBContainer MONGO_DB_CONTAINER = new MongoDBContainer("mongo:latest");
 
     @Autowired
-    private JobLauncherTestUtils launcher;
+    private JobOperatorTestUtils operator;
 
     @Autowired
     private MongoOperations mongoOperations;
@@ -125,7 +125,7 @@ class UserBatchJobTests {
     void launch() {
 
         await().atMost(ofSeconds(30)).untilAsserted(() -> {
-            var execution = launcher.launchJob();
+            var execution = operator.startJob();
 
             assertThat(execution.getExitStatus()).isEqualTo(COMPLETED);
         });

batch-rest-repository/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     java
-    id("org.springframework.boot") version "3.5.7"
+    id("org.springframework.boot") version "4.0.5"
     id("io.spring.dependency-management") version "1.1.7"
 }
 
@@ -20,14 +20,15 @@ repositories {
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter-batch")
     implementation("org.springframework.boot:spring-boot-starter-data-mongodb")
-    implementation("com.fasterxml.jackson.core:jackson-databind")
+    implementation("tools.jackson.core:jackson-databind")
     runtimeOnly("com.mysql:mysql-connector-j")
     testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-jdbc")
     testImplementation("org.springframework.boot:spring-boot-testcontainers")
     testImplementation("org.springframework.batch:spring-batch-test")
-    testImplementation("org.testcontainers:junit-jupiter")
-    testImplementation("org.testcontainers:mongodb")
-    testImplementation("org.testcontainers:mysql")
+    testImplementation("org.testcontainers:testcontainers-junit-jupiter")
+    testImplementation("org.testcontainers:testcontainers-mongodb")
+    testImplementation("org.testcontainers:testcontainers-mysql")
 }
 
 tasks.named<Test>("test") {

batch-rest-repository/src/main/java/zin/rashidi/boot/batch/rest/user/UserJobConfiguration.java

@@ -1,41 +1,46 @@
 package zin.rashidi.boot.batch.rest.user;
 
 import java.net.MalformedURLException;
-
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
+import tools.jackson.databind.DeserializationFeature;
+import tools.jackson.databind.json.JsonMapper;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.builder.JobBuilder;
 import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.step.builder.StepBuilder;
-import org.springframework.batch.item.data.MongoItemWriter;
-import org.springframework.batch.item.data.builder.MongoItemWriterBuilder;
-import org.springframework.batch.item.json.JacksonJsonObjectReader;
-import org.springframework.batch.item.json.JsonItemReader;
-import org.springframework.batch.item.json.builder.JsonItemReaderBuilder;
+import org.springframework.batch.infrastructure.item.data.MongoItemWriter;
+import org.springframework.batch.infrastructure.item.data.builder.MongoItemWriterBuilder;
+import org.springframework.batch.infrastructure.item.json.JacksonJsonObjectReader;
+import org.springframework.batch.infrastructure.item.json.JsonItemReader;
+import org.springframework.batch.infrastructure.item.json.builder.JsonItemReaderBuilder;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.UrlResource;
+import org.springframework.core.io.Resource;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.transaction.PlatformTransactionManager;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
  * @author Rashidi Zin
  */
 @Configuration
 class UserJobConfiguration {
 
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+    private static final JsonMapper OBJECT_MAPPER = JsonMapper.builder()
+            .disable(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)
+            .build();
 
     private final JobRepository jobRepository;
     private final PlatformTransactionManager transactionManager;
     private final MongoOperations mongo;
+    private final Resource usersResource;
 
-    UserJobConfiguration(JobRepository jobRepository, PlatformTransactionManager transactionManager, MongoOperations mongo) {
+    UserJobConfiguration(JobRepository jobRepository, PlatformTransactionManager transactionManager, MongoOperations mongo,
+                         @Value("${batch.users.resource:https://jsonplaceholder.typicode.com/users}") Resource usersResource) {
         this.jobRepository = jobRepository;
         this.transactionManager = transactionManager;
         this.mongo = mongo;
+        this.usersResource = usersResource;
     }
 
     @Bean
@@ -43,23 +48,24 @@
         return new JobBuilder("userJob", jobRepository).start(step()).build();
     }
 
     private Step step() throws MalformedURLException {
         return new StepBuilder("userStep", jobRepository)
-                .<User, User>chunk(10, transactionManager)
+                .<User, User>chunk(10)
+                .transactionManager(transactionManager)
                 .reader(reader())
                 .writer(writer())
                 .build();
     }
 
-    private JsonItemReader<User> reader() throws MalformedURLException {
+    private JsonItemReader<User> reader() {
         JacksonJsonObjectReader<User> jsonObjectReader = new JacksonJsonObjectReader<>(User.class);
 
         jsonObjectReader.setMapper(OBJECT_MAPPER);
 
         return new JsonItemReaderBuilder<User>()
                 .name("userReader")
                 .jsonObjectReader(jsonObjectReader)
-                .resource(new UrlResource("https://jsonplaceholder.typicode.com/users"))
+                .resource(usersResource)
                 .build();
     }
 

batch-rest-repository/src/test/java/zin/rashidi/boot/batch/rest/user/UserBatchJobTests.java

@@ -4,8 +4,9 @@
 import com.mongodb.MongoClientSettings;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.springframework.batch.core.configuration.support.DefaultBatchConfiguration;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.configuration.support.JdbcDefaultBatchConfiguration;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.test.JobOperatorTestUtils;
 import org.springframework.batch.test.context.SpringBatchTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.jdbc.DataSourceBuilder;
@@ -17,18 +18,18 @@
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.jdbc.support.JdbcTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
-import org.testcontainers.containers.MongoDBContainer;
-import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.mongodb.MongoDBContainer;
+import org.testcontainers.mysql.MySQLContainer;
 
 import javax.sql.DataSource;
 
 import static java.time.Duration.ofSeconds;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.batch.core.ExitStatus.COMPLETED;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
-import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
 import static zin.rashidi.boot.batch.rest.user.UserBatchJobTests.BatchTestConfiguration;
 import static zin.rashidi.boot.batch.rest.user.UserBatchJobTests.MongoTestConfiguration;
 
@@ -37,20 +38,21 @@
  */
 @Testcontainers
 @SpringBatchTest
-@SpringBootTest(classes = { BatchTestConfiguration.class, MongoTestConfiguration.class, UserJobConfiguration.class }, webEnvironment = NONE)
+@SpringBootTest(classes = { BatchTestConfiguration.class, MongoTestConfiguration.class, UserJobConfiguration.class }, webEnvironment = NONE,
+        properties = "batch.users.resource=classpath:users.json")
 class UserBatchJobTests {
 
     @Container
     @ServiceConnection
-    private final static MySQLContainer<?> MYSQL_CONTAINER = new MySQLContainer<>("mysql:lts")
+    private final static MySQLContainer MYSQL_CONTAINER = new MySQLContainer("mysql:lts")
             .withInitScript("org/springframework/batch/core/schema-mysql.sql");
 
     @Container
     @ServiceConnection
     private final static MongoDBContainer MONGO_DB_CONTAINER = new MongoDBContainer("mongo:latest");
 
     @Autowired
-    private JobLauncherTestUtils launcher;
+    private JobOperatorTestUtils operator;
 
     @Autowired
     private MongoOperations mongoOperations;
@@ -60,7 +62,7 @@
     void launch() {
 
         await().atMost(ofSeconds(30)).untilAsserted(() -> {
-            var execution = launcher.launchJob();
+            var execution = operator.startJob();
 
             assertThat(execution.getExitStatus()).isEqualTo(COMPLETED);
         });
@@ -71,7 +73,7 @@
     }
 
     @TestConfiguration
-    static class BatchTestConfiguration extends DefaultBatchConfiguration {
+    static class BatchTestConfiguration extends JdbcDefaultBatchConfiguration {
 
         @Override
         protected DataSource getDataSource() {

batch-rest-repository/src/test/resources/users.json

@@ -0,0 +1,12 @@
+[
+  {"id": 1, "username": "Bret"},
+  {"id": 2, "username": "Antonette"},
+  {"id": 3, "username": "Samantha"},
+  {"id": 4, "username": "Karianne"},
+  {"id": 5, "username": "Kamren"},
+  {"id": 6, "username": "Leopoldo_Corkery"},
+  {"id": 7, "username": "Elwyn.Skiles"},
+  {"id": 8, "username": "Maxime_Nienow"},
+  {"id": 9, "username": "Delphine"},
+  {"id": 10, "username": "Moriah.Stiedemann"}
+]

batch-skip-step/README.adoc

@@ -125,7 +125,7 @@ class UserBatchJobTests {
     private final static MySQLContainer<?> MYSQL_CONTAINER = new MySQLContainer<>("mysql:lts");
 
     @Autowired
-    private JobLauncherTestUtils launcher;
+    private JobOperatorTestUtils operator;
 
     @Autowired
     private JdbcTemplate jdbc;
@@ -135,7 +135,7 @@ class UserBatchJobTests {
     void findAll() {
 
         await().atMost(10, SECONDS).untilAsserted(() -> {
-            var execution = launcher.launchJob();
+            var execution = operator.startJob();
             assertThat(execution.getExitStatus()).isEqualTo(COMPLETED);
         });
 

batch-skip-step/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     java
-    id("org.springframework.boot") version "3.5.7"
+    id("org.springframework.boot") version "4.0.5"
     id("io.spring.dependency-management") version "1.1.7"
 }
 
@@ -20,13 +20,13 @@ repositories {
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter-batch")
     implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
-    implementation("com.fasterxml.jackson.core:jackson-databind")
+    implementation("tools.jackson.core:jackson-databind")
     runtimeOnly("com.mysql:mysql-connector-j")
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.springframework.boot:spring-boot-testcontainers")
     testImplementation("org.springframework.batch:spring-batch-test")
-    testImplementation("org.testcontainers:junit-jupiter")
-    testImplementation("org.testcontainers:mysql")
+    testImplementation("org.testcontainers:testcontainers-junit-jupiter")
+    testImplementation("org.testcontainers:testcontainers-mysql")
 }
 
 tasks.named<Test>("test") {