Updated project to use Spring Boot 3.0

Resolves issues:
TASK-810
TASK-812
TASK-813

Author: cppwfs

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
@@ -84,31 +84,6 @@
 				<artifactId>spring-cloud-stream</artifactId>
 				<version>${spring-cloud-stream.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-jdbc</artifactId>
-				<version>5.3.15-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.batch</groupId>
-				<artifactId>spring-batch-core</artifactId>
-				<version>${spring-batch.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.batch</groupId>
-				<artifactId>spring-batch-infrastructure</artifactId>
-				<version>${spring-batch.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.batch</groupId>
-				<artifactId>spring-batch-integration</artifactId>
-				<version>${spring-batch.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.batch</groupId>
-				<artifactId>spring-batch-test</artifactId>
-				<version>${spring-batch.version}</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -125,15 +100,15 @@
 	</modules>
 
 	<properties>
-		<spring-batch.version>4.3.5-SNAPSHOT</spring-batch.version>
-		<spring-cloud-stream.version>3.2.1</spring-cloud-stream.version>
+
+		<spring-cloud-stream.version>4.0.0-SNAPSHOT</spring-cloud-stream.version>
 		<spring-cloud-deployer.version>2.7.0</spring-cloud-deployer.version>
 		<spring-cloud-deployer-local.version>2.7.0
 		</spring-cloud-deployer-local.version>
 		<spring-cloud-stream-binder-rabbit.version>${spring-cloud-stream.version}
 		</spring-cloud-stream-binder-rabbit.version>
 		<commons-logging.version>1.1</commons-logging.version>
-		<java-ee-api.version>8.0</java-ee-api.version>
+		<jakarta-ee-api.version>9.1.0</jakarta-ee-api.version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<sonar.jacoco.reportPath>
@@ -144,6 +119,7 @@
 		</maven-checkstyle-plugin.failsOnViolation>
 		<maven-checkstyle-plugin.includeTestSourceDirectory>true
 		</maven-checkstyle-plugin.includeTestSourceDirectory>
+		<java.version>17</java.version>
 	</properties>
 
 	<build>
@@ -170,10 +146,10 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-					<testSource>1.8</testSource>
-					<testTarget>1.8</testTarget>
+					<source>17</source>
+					<target>17</target>
+					<testSource>17</testSource>
+					<testTarget>17</testTarget>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -256,7 +232,7 @@
 						</configuration>
 					</execution>
 				</executions>
-				<version>0.8.6</version>
+				<version>0.8.7</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

spring-cloud-task-batch/pom.xml

@@ -92,5 +92,5 @@
 			<artifactId>junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
-	</dependencies>
+ </dependencies>
 </project>

spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/partition/DeployerPartitionHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -154,22 +154,7 @@ public class DeployerPartitionHandler
 	 * @param jobExplorer used to acquire the status of the job.
 	 * @param resource the url to the app to be launched.
 	 * @param stepName the name of the step.
-	 * @deprecated Use the constructor that accepts {@link TaskRepository} as well as the
-	 * this constructor's set of parameters.
 	 */
-	@Deprecated
-	public DeployerPartitionHandler(TaskLauncher taskLauncher, JobExplorer jobExplorer,
-			Resource resource, String stepName) {
-		Assert.notNull(taskLauncher, "A taskLauncher is required");
-		Assert.notNull(jobExplorer, "A jobExplorer is required");
-		Assert.notNull(resource, "A resource is required");
-		Assert.hasText(stepName, "A step name is required");
-
-		this.taskLauncher = taskLauncher;
-		this.jobExplorer = jobExplorer;
-		this.resource = resource;
-		this.stepName = stepName;
-	}
 
 	public DeployerPartitionHandler(TaskLauncher taskLauncher, JobExplorer jobExplorer,
 			Resource resource, String stepName, TaskRepository taskRepository) {

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunnerCoreTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package org.springframework.cloud.task.batch.handler;
 
+import java.util.List;
+
+import javax.sql.DataSource;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -32,21 +36,28 @@
 import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
 import org.springframework.batch.core.configuration.annotation.StepBuilderFactory;
 import org.springframework.batch.core.explore.JobExplorer;
-import org.springframework.batch.core.explore.support.MapJobExplorerFactoryBean;
+import org.springframework.batch.core.explore.support.JobExplorerFactoryBean;
 import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.batch.core.launch.support.RunIdIncrementer;
 import org.springframework.batch.core.launch.support.SimpleJobLauncher;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.repository.JobRestartException;
-import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean;
+import org.springframework.batch.core.repository.dao.DefaultExecutionContextSerializer;
+import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
 import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.repeat.RepeatStatus;
 import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
 import org.springframework.cloud.task.batch.configuration.TaskBatchProperties;
 import org.springframework.cloud.task.listener.TaskException;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.task.SyncTaskExecutor;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.init.DataSourceInitializer;
+import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -195,16 +206,25 @@ public void retryFailedExecutionWithDifferentNonIdentifyingParametersFromPreviou
 		runFailedJob(new JobParametersBuilder().addLong("run.id", 1L)
 				.addLong("id", 2L, false).addLong("foo", 3L, false).toJobParameters());
 		assertThat(this.jobExplorer.getJobInstances("job", 0, 100)).hasSize(1);
-		JobInstance jobInstance = this.jobExplorer.getJobInstance(0L);
-		assertThat(this.jobExplorer.getJobExecutions(jobInstance)).hasSize(2);
+		JobInstance jobInstance = jobExplorer.getLastJobInstance("job");
+
+		List<JobExecution> executions = this.jobExplorer.getJobExecutions(jobInstance);
+
+		assertThat(executions).hasSize(2);
+
+		JobExecution firstJobExecution  = executions.get(0);
+		JobExecution secondJobExecution = executions.get(1);
+		if ((executions.get(0).getId() > executions.get(1).getId())) {
+			firstJobExecution = executions.get(1);
+			secondJobExecution = executions.get(0);
+		}
+
 		// first execution
-		JobExecution firstJobExecution = this.jobExplorer.getJobExecution(0L);
 		JobParameters parameters = firstJobExecution.getJobParameters();
 		assertThat(parameters.getLong("run.id")).isEqualTo(1L);
-		assertThat(parameters.getLong("id")).isEqualTo(1L);
-		assertThat(parameters.getLong("foo")).isEqualTo(2L);
+		assertThat(parameters.getLong("id")).isEqualTo(2L);
+		assertThat(parameters.getLong("foo")).isEqualTo(3L);
 		// second execution
-		JobExecution secondJobExecution = this.jobExplorer.getJobExecution(1L);
 		parameters = secondJobExecution.getJobParameters();
 		// identifying parameters should be the same as previous execution
 		assertThat(parameters.getLong("run.id")).isEqualTo(1L);
@@ -232,21 +252,34 @@ private void runFailedJob(JobParameters jobParameters) throws Exception {
 
 	@Configuration
 	@EnableBatchProcessing
+	@Import(EmbeddedDataSourceConfiguration.class)
+
 	protected static class BatchConfiguration implements BatchConfigurer {
 
 		private ResourcelessTransactionManager transactionManager = new ResourcelessTransactionManager();
 
 		private JobRepository jobRepository;
 
-		private MapJobRepositoryFactoryBean jobRepositoryFactory = new MapJobRepositoryFactoryBean(
-				this.transactionManager);
+		@Autowired
+		private  DataSource dataSource;
 
 		public BatchConfiguration() throws Exception {
-			this.jobRepository = this.jobRepositoryFactory.getObject();
+		}
+
+		private JobRepository jobRepositoryNew() throws Exception {
+			JobRepositoryFactoryBean jobRepositoryFactoryBean = new JobRepositoryFactoryBean();
+			jobRepositoryFactoryBean.setDataSource(dataSource);
+			jobRepositoryFactoryBean.setTransactionManager(transactionManager);
+			jobRepositoryFactoryBean.setSerializer(new DefaultExecutionContextSerializer());
+			this.jobRepository = jobRepositoryFactoryBean.getObject();
+			return this.jobRepository;
 		}
 
 		@Override
-		public JobRepository getJobRepository() {
+		public JobRepository getJobRepository() throws Exception {
+			if (this.jobRepository == null) {
+				this.jobRepository = jobRepositoryNew();
+			}
 			return this.jobRepository;
 		}
 
@@ -256,18 +289,36 @@ public PlatformTransactionManager getTransactionManager() {
 		}
 
 		@Override
-		public JobLauncher getJobLauncher() {
+		public JobLauncher getJobLauncher() throws Exception {
 			SimpleJobLauncher launcher = new SimpleJobLauncher();
-			launcher.setJobRepository(this.jobRepository);
+
+			launcher.setJobRepository(getJobRepository());
 			launcher.setTaskExecutor(new SyncTaskExecutor());
 			return launcher;
 		}
 
 		@Override
 		public JobExplorer getJobExplorer() throws Exception {
-			return new MapJobExplorerFactoryBean(this.jobRepositoryFactory).getObject();
+			dataSourceInitializer().afterPropertiesSet();
+			JobExplorerFactoryBean factoryBean = new JobExplorerFactoryBean();
+			factoryBean.setDataSource(dataSource);
+			factoryBean.setJdbcOperations(new JdbcTemplate(dataSource));
+			factoryBean.setSerializer(new DefaultExecutionContextSerializer());
+			return factoryBean.getObject();
 		}
 
+		public DataSourceInitializer dataSourceInitializer() {
+			DataSourceInitializer dataSourceInitializer = new DataSourceInitializer();
+			dataSourceInitializer.setDataSource(dataSource);
+			ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator();
+			databasePopulator.addScript(new ClassPathResource("org/springframework/batch/core/schema-h2.sql"));
+			dataSourceInitializer.setDatabasePopulator(databasePopulator);
+			databasePopulator = new ResourceDatabasePopulator();
+			databasePopulator.addScript(new ClassPathResource("org/springframework/batch/core/schema-drop-h2.sql"));
+			dataSourceInitializer.setDatabaseCleaner(databasePopulator);
+			return dataSourceInitializer;
+	}
+
 	}
 
 }

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/partition/DeployerPartitionHandlerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,7 +88,7 @@ public class DeployerPartitionHandlerTests {
 
 	@BeforeEach
 	public void setUp() {
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 		this.environment = new MockEnvironment();
 		TaskExecution taskExecution = new TaskExecution(2, 0, "name", new Date(),
 				new Date(), "", Collections.emptyList(), null, null, null);
@@ -108,7 +108,7 @@ public void testDeprecatedConstructorValidation() {
 				this.resource, null, "A step name is required");
 
 		new DeployerPartitionHandler(this.taskLauncher, this.jobExplorer, this.resource,
-				"step-name");
+				"step-name", this.taskRepository);
 	}
 
 	@Test
@@ -132,7 +132,7 @@ public void testConstructorValidation() {
 	@Test
 	public void testNoPartitions() throws Exception {
 		DeployerPartitionHandler handler = new DeployerPartitionHandler(this.taskLauncher,
-				this.jobExplorer, this.resource, "step1");
+				this.jobExplorer, this.resource, "step1", this.taskRepository);
 		handler.setEnvironment(this.environment);
 
 		StepExecution stepExecution = new StepExecution("step1", new JobExecution(1L));

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/partition/DeployerStepExecutionHandlerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,7 +69,7 @@ public class DeployerStepExecutionHandlerTests {
 
 	@BeforeEach
 	public void setUp() {
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 
 		this.handler = new DeployerStepExecutionHandler(this.beanFactory,
 				this.jobExplorer, this.jobRepository);

spring-cloud-task-core/pom.xml

@@ -78,10 +78,11 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-api</artifactId>
-			<version>${java-ee-api.version}</version>
+			<groupId>jakarta.platform</groupId>
+			<artifactId>jakarta.jakartaee-api</artifactId>
+			<version>${jakarta-ee-api.version}</version>
 			<optional>true</optional>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -128,6 +129,6 @@
 			<version>${jmock-version}</version>
 			<scope>test</scope>
 		</dependency>
-	</dependencies>
+ </dependencies>
 
 </project>

spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/DefaultTaskConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 
 package org.springframework.cloud.task.configuration;
 
-import javax.persistence.EntityManager;
 import javax.sql.DataSource;
 
+import jakarta.persistence.EntityManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;