Replace deprecated API calls

Change `JdbcLockRegistry` instantiation in `SingleInstanceTaskListener`
to use the new constructor that accepts a `Duration` parameter instead
of setting TTL on the lock repository. This aligns with Spring
Integration's updated API where lock duration is specified at registry
creation time rather than on the repository.

The lock TTL value from `taskProperties.getSingleInstanceLockTtl()` is
now converted to a Duration and passed directly to the `JdbcLockRegistry`
constructor, maintaining the same functional behavior while using the
updated API pattern.

Fix JavaDoc reference in `JobInstanceEvent` to point to the correct
`org.springframework.batch.core.job.JobInstance` class path after the
Spring Batch 7.x package reorganization.

Update test configurations to align with updated Spring Integration and
Spring Batch APIs.

Author: cppwfs

spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfigurationTests.java

@@ -26,7 +26,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.RabbitMQContainer;
+import org.testcontainers.rabbitmq.RabbitMQContainer;
 
 import org.springframework.amqp.core.AmqpAdmin;
 import org.springframework.amqp.core.AmqpTemplate;

spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemWriterAutoConfigurationTests.java

@@ -27,7 +27,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.RabbitMQContainer;
+import org.testcontainers.rabbitmq.RabbitMQContainer;
 
 import org.springframework.amqp.core.AmqpAdmin;
 import org.springframework.amqp.core.AmqpTemplate;

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

@@ -16,6 +16,8 @@
 
 package org.springframework.cloud.task.configuration;
 
+import java.time.Duration;
+
 import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
@@ -151,12 +153,11 @@ else if (applicationEvent instanceof OnFailedToAcquireMutexEvent) {
 	private LockRegistry getDefaultLockRegistry(long executionId) {
 		DefaultLockRepository lockRepository = new DefaultLockRepository(this.dataSource, String.valueOf(executionId));
 		lockRepository.setPrefix(this.taskProperties.getTablePrefix());
-		lockRepository.setTimeToLive(this.taskProperties.getSingleInstanceLockTtl());
 		lockRepository.setApplicationContext(this.applicationContext);
 		lockRepository.afterPropertiesSet();
 		lockRepository.setTransactionManager(this.platformTransactionManager);
 		lockRepository.afterSingletonsInstantiated();
-		return new JdbcLockRegistry(lockRepository);
+		return new JdbcLockRegistry(lockRepository, Duration.ofSeconds(this.taskProperties.getSingleInstanceLockTtl()));
 	}
 
 }

spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/MariaDbTaskRepositoryIntegrationTests.java

@@ -21,9 +21,9 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.mariadb.jdbc.MariaDbDataSource;
-import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.mariadb.MariaDBContainer;
 import org.testcontainers.utility.DockerImageName;
 
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -48,7 +48,7 @@ public class MariaDbTaskRepositoryIntegrationTests {
 	 * Provide a mariadb test container for tests.
 	 */
 	@Container
-	public static MariaDBContainer<?> mariaDBContainer = new MariaDBContainer<>(MARIADB_IMAGE);
+	public static MariaDBContainer mariaDBContainer = new MariaDBContainer(MARIADB_IMAGE);
 
 	@Test
 	public void testTaskExplorer() {

spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDaoMariaDBIntegrationTests.java

@@ -29,9 +29,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mariadb.jdbc.MariaDbDataSource;
-import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.mariadb.MariaDBContainer;
 import org.testcontainers.utility.DockerImageName;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,7 +77,7 @@ public class JdbcTaskExecutionDaoMariaDBIntegrationTests extends BaseTaskExecuti
 	 * Provide mariadb test container for tests.
 	 */
 	@Container
-	public static MariaDBContainer<?> mariaDBContainer = new MariaDBContainer<>(MARIADB_IMAGE);
+	public static MariaDBContainer mariaDBContainer = new MariaDBContainer(MARIADB_IMAGE);
 
 	@Autowired
 	TaskRepository repository;

spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/executionid/TaskStartTests.java

@@ -31,9 +31,9 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.mariadb.MariaDBContainer;
 import org.testcontainers.utility.DockerImageName;
 
 import org.springframework.boot.SpringApplication;
@@ -76,7 +76,7 @@ public class TaskStartTests {
 	 * Provide mariadb test container for tests.
 	 */
 	@Container
-	public static MariaDBContainer<?> mariaDBContainer = new MariaDBContainer<>(MARIADB_IMAGE);
+	public static MariaDBContainer mariaDBContainer = new MariaDBContainer(MARIADB_IMAGE);
 
 	private DataSource dataSource;
 

spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/initializer/TaskInitializerTests.java

@@ -27,9 +27,9 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.mariadb.MariaDBContainer;
 import org.testcontainers.utility.DockerImageName;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,7 +72,7 @@ public class TaskInitializerTests {
 	 * Provide mariadb test container for tests.
 	 */
 	@Container
-	public static MariaDBContainer<?> mariaDBContainer = new MariaDBContainer<>(MARIADB_IMAGE);
+	public static MariaDBContainer mariaDBContainer = new MariaDBContainer(MARIADB_IMAGE);
 
 	@AfterEach
 	public void tearDown() {

spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobTestConfiguration.java

@@ -16,18 +16,19 @@
 
 package io.spring;
 
+import org.testcontainers.postgresql.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
+
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.utility.DockerImageName;
 
 @TestConfiguration(proxyBeanMethods = false)
 class BatchJobTestConfiguration {
 
 	@Bean
 	@ServiceConnection
-	public PostgreSQLContainer<?> postgresSQLContainer() {
+	public PostgreSQLContainer postgresSQLContainer() {
 		return new PostgreSQLContainer(DockerImageName.parse("postgres:15.1"));
 	}
 

spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/support/JobInstanceEvent.java

@@ -21,8 +21,8 @@
 
 /**
  * This is a JobInstance DTO created so that a
- * {@link org.springframework.batch.core.JobInstance} can be serialized into Json without
- * having to add mixins to an ObjectMapper.
+ * {@link org.springframework.batch.core.job.JobInstance} can be serialized into Json
+ * without having to add mixins to an ObjectMapper.
  *
  * @author Glenn Renfro
  */