Update Spring Boot to version 4.0.0-RC2

Author: fmbenhassine

complete/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.5.3'
+	id 'org.springframework.boot' version '4.0.0-RC2'
 	id 'java'
 }
 

complete/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.3</version>
+		<version>4.0.0-RC2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
@@ -19,7 +19,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-batch</artifactId>
+			<artifactId>spring-boot-starter-batch-jdbc</artifactId>
 		</dependency>
 
 		<dependency>

complete/src/main/java/com/example/batchprocessing/BatchConfiguration.java

@@ -2,15 +2,15 @@
 
 import javax.sql.DataSource;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.job.builder.JobBuilder;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.step.builder.StepBuilder;
-import org.springframework.batch.item.database.JdbcBatchItemWriter;
-import org.springframework.batch.item.database.builder.JdbcBatchItemWriterBuilder;
-import org.springframework.batch.item.file.FlatFileItemReader;
-import org.springframework.batch.item.file.builder.FlatFileItemReaderBuilder;
+import org.springframework.batch.infrastructure.item.database.JdbcBatchItemWriter;
+import org.springframework.batch.infrastructure.item.database.builder.JdbcBatchItemWriterBuilder;
+import org.springframework.batch.infrastructure.item.file.FlatFileItemReader;
+import org.springframework.batch.infrastructure.item.file.builder.FlatFileItemReaderBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
@@ -49,7 +49,7 @@ public JdbcBatchItemWriter<Person> writer(DataSource dataSource) {
 	// tag::jobstep[]
 	@Bean
 	public Job importUserJob(JobRepository jobRepository, Step step1, JobCompletionNotificationListener listener) {
-		return new JobBuilder("importUserJob", jobRepository)
+		return new JobBuilder(jobRepository)
 			.listener(listener)
 			.start(step1)
 			.build();
@@ -58,8 +58,9 @@ public Job importUserJob(JobRepository jobRepository, Step step1, JobCompletionN
 	@Bean
 	public Step step1(JobRepository jobRepository, DataSourceTransactionManager transactionManager,
 					  FlatFileItemReader<Person> reader, PersonItemProcessor processor, JdbcBatchItemWriter<Person> writer) {
-		return new StepBuilder("step1", jobRepository)
-			.<Person, Person>chunk(3, transactionManager)
+		return new StepBuilder(jobRepository)
+			.<Person, Person>chunk(3)
+            .transactionManager(transactionManager)
 			.reader(reader)
 			.processor(processor)
 			.writer(writer)

complete/src/main/java/com/example/batchprocessing/JobCompletionNotificationListener.java

@@ -4,8 +4,8 @@
 import org.slf4j.LoggerFactory;
 
 import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionListener;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.listener.JobExecutionListener;
 import org.springframework.jdbc.core.DataClassRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;

complete/src/main/java/com/example/batchprocessing/PersonItemProcessor.java

@@ -3,7 +3,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.springframework.batch.item.ItemProcessor;
+import org.springframework.batch.infrastructure.item.ItemProcessor;
 
 public class PersonItemProcessor implements ItemProcessor<Person, Person> {
 

complete/src/test/java/com/example/batchprocessing/BatchConfigurationTest.java

@@ -5,9 +5,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.test.JobOperatorTestUtils;
 import org.springframework.batch.test.JobRepositoryTestUtils;
 import org.springframework.batch.test.context.SpringBatchTest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,15 +28,15 @@
 class BatchConfigurationTest {
 
     @Autowired
-    private JobLauncherTestUtils jobLauncherTestUtils;
+    private JobOperatorTestUtils jobOperatorTestUtils;
     @Autowired
     private JobRepositoryTestUtils jobRepositoryTestUtils;
     @Autowired
     private Job importUserJob;
 
     @BeforeEach
     void setUp() {
-        jobLauncherTestUtils.setJob(importUserJob);
+        jobOperatorTestUtils.setJob(importUserJob);
     }
 
     @AfterEach
@@ -46,7 +46,7 @@ void tearDown() {
 
     @Test
     void importUserJob_WhenJobEnds_ThenStatusCompleted() throws Exception {
-        JobExecution jobExecution = jobLauncherTestUtils.launchJob();
+        JobExecution jobExecution = jobOperatorTestUtils.startJob();
         Assertions.assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
     }
 }

initial/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.5.3'
+	id 'org.springframework.boot' version '4.0.0-RC2'
 	id 'java'
 }
 

initial/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.3</version>
+		<version>4.0.0-RC2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>