(camel) 03/28: API changes for spring-batch upgrade to 6.0.0

[tc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tcunning pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 90b0db5edca442e42428c9b4ff74ecb727c94f1f
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Fri Nov 21 14:57:43 2025 -0500

    API changes for spring-batch upgrade to 6.0.0
---
 .../apache/camel/component/spring/batch/SpringBatchEndpoint.java  | 2 +-
 .../apache/camel/component/spring/batch/SpringBatchProducer.java  | 8 ++++----
 .../camel/component/spring/batch/support/CamelItemProcessor.java  | 2 +-
 .../camel/component/spring/batch/support/CamelItemReader.java     | 2 +-
 .../camel/component/spring/batch/support/CamelItemWriter.java     | 4 ++--
 .../component/spring/batch/support/CamelJobExecutionListener.java | 4 ++--
 .../component/spring/batch/SpringBatchEndpointDynamicTest.java    | 2 +-
 .../camel/component/spring/batch/SpringBatchEndpointTest.java     | 6 +++---
 .../camel/component/spring/batch/support/CamelItemWriterTest.java | 2 +-
 .../spring/batch/support/CamelJobExecutionListenerTest.java       | 2 +-
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
index 34f54554fc4c..cd1cf68ed73e 100644
--- a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
+++ b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
@@ -27,8 +27,8 @@ import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
 import org.apache.camel.support.CamelContextHelper;
 import org.apache.camel.support.DefaultEndpoint;
-import org.springframework.batch.core.Job;
 import org.springframework.batch.core.configuration.JobRegistry;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.launch.JobLauncher;
 
 /**
diff --git a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchProducer.java b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchProducer.java
index 1598269accd5..b7a98a73924e 100644
--- a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchProducer.java
+++ b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchProducer.java
@@ -25,11 +25,11 @@ import org.apache.camel.support.CamelContextHelper;
 import org.apache.camel.support.DefaultProducer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
 import org.springframework.batch.core.configuration.JobRegistry;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
 import org.springframework.batch.core.launch.JobLauncher;
 
 /**
diff --git a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java
index 994f8ff07c3e..59f9ec0a9477 100644
--- a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java
+++ b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemProcessor.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.spring.batch.support;
 import org.apache.camel.ProducerTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.batch.item.ItemProcessor;
+import org.springframework.batch.infrastructure.item.ItemProcessor;
 
 /**
  * Spring Batch {@link ItemProcessor} sending synchronous request to the given Camel endpoint. The actual processing of
diff --git a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
index 85bfb7cb892a..2ea431bc1a67 100644
--- a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
+++ b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemReader.java
@@ -22,7 +22,7 @@ import org.apache.camel.support.service.ServiceSupport;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.infrastructure.item.ItemReader;
 import org.springframework.beans.factory.InitializingBean;
 
 public class CamelItemReader<I> extends ServiceSupport implements ItemReader<I>, InitializingBean {
diff --git a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemWriter.java b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemWriter.java
index 13e675b5268f..bd1b4c69c44f 100644
--- a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemWriter.java
+++ b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelItemWriter.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.spring.batch.support;
 import org.apache.camel.ProducerTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.batch.item.Chunk;
-import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.infrastructure.item.Chunk;
+import org.springframework.batch.infrastructure.item.ItemWriter;
 
 public class CamelItemWriter<I> implements ItemWriter<I> {
 
diff --git a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListener.java b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListener.java
index a0440819c16b..f33b89283b93 100644
--- a/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListener.java
+++ b/components/camel-spring-parent/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListener.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.spring.batch.support;
 import org.apache.camel.ProducerTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-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;
 
 public class CamelJobExecutionListener implements JobExecutionListener {
 
diff --git a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointDynamicTest.java b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointDynamicTest.java
index 6088ebc90bfb..fb643ac28b89 100644
--- a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointDynamicTest.java
+++ b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointDynamicTest.java
@@ -30,8 +30,8 @@ import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
-import org.springframework.batch.core.Job;
 import org.springframework.batch.core.configuration.JobRegistry;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.launch.JobLauncher;
 
 import static org.apache.camel.test.junit6.TestSupport.header;
diff --git a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
index e2c4dbea5ab7..4a3f40538f82 100644
--- a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
+++ b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
@@ -33,10 +33,10 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.configuration.JobRegistry;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
 import org.springframework.batch.core.launch.JobLauncher;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java
index 9311f72eb018..720e148fd5c1 100644
--- a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java
+++ b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.spring.batch.support;
 
 import org.apache.camel.test.junit6.CamelTestSupport;
 import org.junit.jupiter.api.Test;
-import org.springframework.batch.item.Chunk;
+import org.springframework.batch.infrastructure.item.Chunk;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java
index fc28ddc560b6..c9fd13872a20 100644
--- a/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java
+++ b/components/camel-spring-parent/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;