Update Jackson serialization classes and dependencies

  Replace deprecated Jackson2JsonMessageConverter with JacksonJsonMessageConverter
  in AMQP configurations. Update Jackson dependencies from com.fasterxml.jackson
  to tools.jackson namespace. Fix KafkaItemWriterAutoConfiguration to use proper
  import and remove misplaced file from resources directory.

Author: cppwfs

spring-cloud-starter-single-step-batch-job/pom.xml

@@ -77,12 +77,12 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
+			<groupId>tools.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
+			<groupId>tools.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
@@ -126,4 +126,5 @@
 		</dependency>
 	</dependencies>
 
+
 </project>

spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterAutoConfiguration.java

@@ -35,7 +35,7 @@
 import org.springframework.kafka.core.DefaultKafkaProducerFactory;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.core.ProducerFactory;
-import org.springframework.kafka.support.serializer.JsonSerializer;
+import org.springframework.kafka.support.serializer.JacksonJsonSerializer;
 import org.springframework.util.Assert;
 
 /**
@@ -87,7 +87,7 @@ public Object convert(Map<String, Object> source) {
 	ProducerFactory<Object, Map<String, Object>> producerFactory() {
 		Map<String, Object> configs = new HashMap<>();
 		configs.putAll(this.kafkaProperties.getProducer().buildProperties());
-		return new DefaultKafkaProducerFactory<>(configs, null, new JsonSerializer<>());
+		return new DefaultKafkaProducerFactory<>(configs, null, new JacksonJsonSerializer());
 	}
 
 	private void validateProperties(KafkaItemWriterProperties kafkaItemWriterProperties) {

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

@@ -19,7 +19,7 @@
 import java.util.Map;
 
 import org.springframework.amqp.core.AmqpTemplate;
-import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.amqp.support.converter.JacksonJsonMessageConverter;
 import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.batch.item.amqp.AmqpItemReader;
 import org.springframework.batch.item.amqp.builder.AmqpItemReaderBuilder;
@@ -68,7 +68,7 @@ public AmqpItemReader<Map<String, Object>> amqpItemReader(AmqpTemplate amqpTempl
 			matchIfMissing = true)
 	@Bean
 	public MessageConverter messageConverter() {
-		return new Jackson2JsonMessageConverter();
+		return new JacksonJsonMessageConverter();
 	}
 
 }

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

@@ -16,7 +16,7 @@
 
 package org.springframework.cloud.task.batch.autoconfigure.rabbit;
 
-import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.amqp.support.converter.JacksonJsonMessageConverter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -34,7 +34,7 @@ public class AmqpItemReaderProperties {
 	private boolean enabled;
 
 	/**
-	 * Establishes whether the {@link Jackson2JsonMessageConverter} is to be used as a
+	 * Establishes whether the {@link JacksonJsonMessageConverter} is to be used as a
 	 * message converter. Defaults to {@code true}.
 	 */
 	private boolean jsonConverterEnabled = true;
@@ -56,7 +56,7 @@ public void setEnabled(boolean enabled) {
 	}
 
 	/**
-	 * States whether the {@link Jackson2JsonMessageConverter} is used as a message
+	 * States whether the {@link JacksonJsonMessageConverter} is used as a message
 	 * converter.
 	 * @return true if enabled else false.
 	 */
@@ -65,7 +65,7 @@ public boolean isJsonConverterEnabled() {
 	}
 
 	/**
-	 * Establishes whether the {@link Jackson2JsonMessageConverter} is to be used as a
+	 * Establishes whether the {@link JacksonJsonMessageConverter} is to be used as a
 	 * message converter.
 	 * @param jsonConverterEnabled true if it is to be enabled else false. Defaults to
 	 * true.

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

@@ -19,7 +19,7 @@
 import java.util.Map;
 
 import org.springframework.amqp.core.AmqpTemplate;
-import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.amqp.support.converter.JacksonJsonMessageConverter;
 import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.batch.item.amqp.AmqpItemWriter;
 import org.springframework.batch.item.amqp.builder.AmqpItemWriterBuilder;
@@ -57,7 +57,7 @@ public AmqpItemWriterProperties amqpItemWriterProperties() {
 			matchIfMissing = true)
 	@Bean
 	public MessageConverter messageConverter() {
-		return new Jackson2JsonMessageConverter();
+		return new JacksonJsonMessageConverter();
 	}
 
 }

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

@@ -16,7 +16,7 @@
 
 package org.springframework.cloud.task.batch.autoconfigure.rabbit;
 
-import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.amqp.support.converter.JacksonJsonMessageConverter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -32,7 +32,7 @@ public class AmqpItemWriterProperties {
 	private boolean enabled;
 
 	/**
-	 * Establishes whether the {@link Jackson2JsonMessageConverter} is to be used as a
+	 * Establishes whether the {@link JacksonJsonMessageConverter} is to be used as a
 	 * message converter. Defaults to {@code true}.
 	 */
 	private boolean jsonConverterEnabled = true;
@@ -55,7 +55,7 @@ public void setEnabled(boolean enabled) {
 	}
 
 	/**
-	 * States whether the {@link Jackson2JsonMessageConverter} is used as a message
+	 * States whether the {@link JacksonJsonMessageConverter} is used as a message
 	 * converter.
 	 * @return true if enabled else false.
 	 */
@@ -64,7 +64,7 @@ public boolean isJsonConverterEnabled() {
 	}
 
 	/**
-	 * Establishes whether the {@link Jackson2JsonMessageConverter} is to be used as a
+	 * Establishes whether the {@link JacksonJsonMessageConverter} is to be used as a
 	 * message converter.
 	 * @param jsonConverterEnabled true if it is to be enabled else false. Defaults to
 	 * true.

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

@@ -35,7 +35,7 @@
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.amqp.support.converter.JacksonJsonMessageConverter;
 import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.job.parameters.JobParameters;
@@ -80,7 +80,7 @@ public class AmqpItemReaderAutoConfigurationTests {
 	void setupTest() {
 		this.connectionFactory = new CachingConnectionFactory(host, amqpPort);
 		this.template = new RabbitTemplate(this.connectionFactory);
-		this.template.setMessageConverter(new Jackson2JsonMessageConverter());
+		this.template.setMessageConverter(new JacksonJsonMessageConverter());
 		AmqpAdmin admin = new RabbitAdmin(this.connectionFactory);
 		admin.declareQueue(new Queue("foo"));
 

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

@@ -38,7 +38,7 @@
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.amqp.support.converter.JacksonJsonMessageConverter;
 import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.job.parameters.JobParameters;
@@ -105,7 +105,7 @@ private static void addNameToReaderList(List<Map<String, Object>> itemReaderList
 	void setupTest() {
 		this.connectionFactory = new CachingConnectionFactory(host, amqpPort);
 		this.template = new RabbitTemplate(this.connectionFactory);
-		this.template.setMessageConverter(new Jackson2JsonMessageConverter());
+		this.template.setMessageConverter(new JacksonJsonMessageConverter());
 		AmqpAdmin admin = new RabbitAdmin(this.connectionFactory);
 		admin.declareQueue(new Queue(QUEUE_NAME));
 		admin.declareExchange(new TopicExchange(EXCHANGE_NAME));

spring-cloud-task-samples/single-step-batch-job/pom.xml

@@ -53,16 +53,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>