Upgrade to Spring Boot 4.0 #197

spring-batch-excel/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.6</version>
+        <version>4.0.3</version>
         <relativePath/>
     </parent>
 

spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/AbstractExcelItemReader.java

@@ -25,17 +25,17 @@
 import org.springframework.batch.extensions.excel.support.rowset.DefaultRowSetFactory;
 import org.springframework.batch.extensions.excel.support.rowset.RowSet;
 import org.springframework.batch.extensions.excel.support.rowset.RowSetFactory;
-import org.springframework.batch.item.file.ResourceAwareItemReaderItemStream;
-import org.springframework.batch.item.support.AbstractItemCountingItemStreamItemReader;
+import org.springframework.batch.infrastructure.item.file.ResourceAwareItemReaderItemStream;
+import org.springframework.batch.infrastructure.item.support.AbstractItemCountingItemStreamItemReader;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
 /**
- * {@link org.springframework.batch.item.ItemReader} implementation to read an Excel file.
+ * {@link org.springframework.batch.infrastructure.item.ItemReader} implementation to read an Excel file.
  * It will read the file sheet for sheet and row for row. It is loosy based on the
- * {@link org.springframework.batch.item.file.FlatFileItemReader}
+ * {@link org.springframework.batch.infrastructure.item.file.FlatFileItemReader}
  *
  * @param <T> the type
  * @author Marten Deinum
@@ -274,7 +274,7 @@ public void setLinesToSkip(final int linesToSkip) {
 
 	/**
 	 * In strict mode the reader will throw an exception on
-	 * {@link #open(org.springframework.batch.item.ExecutionContext)} if the input
+	 * {@link #open(org.springframework.batch.infrastructure.item.ExecutionContext)} if the input
 	 * resource does not exist.
 	 * @param strict true by default
 	 */

spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/ExcelFileParseException.java

@@ -16,7 +16,7 @@
 
 package org.springframework.batch.extensions.excel;
 
-import org.springframework.batch.item.ParseException;
+import org.springframework.batch.infrastructure.item.ParseException;
 
 /**
  * Exception thrown when parsing excel files. The name of the sheet, the row number on

spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/mapping/BeanWrapperRowMapper.java

@@ -26,7 +26,7 @@
 
 import org.springframework.batch.extensions.excel.RowMapper;
 import org.springframework.batch.extensions.excel.support.rowset.RowSet;
-import org.springframework.batch.support.DefaultPropertyEditorRegistrar;
+import org.springframework.batch.infrastructure.support.DefaultPropertyEditorRegistrar;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.MutablePropertyValues;
@@ -149,16 +149,16 @@ public void afterPropertiesSet() {
 	}
 
 	/**
-	 * Map the {@link org.springframework.batch.item.file.transform.FieldSet} to an object
+	 * Map the {@link org.springframework.batch.infrastructure.item.file.transform.FieldSet} to an object
 	 * retrieved from the enclosing Spring context, or to a new instance of the required
 	 * type if no prototype is available.
 	 * @throws org.springframework.validation.BindException if there is a type conversion
 	 * or other error (if the {@link org.springframework.validation.DataBinder} from
 	 * {@link #createBinder(Object)} has errors after binding).
 	 * @throws org.springframework.beans.NotWritablePropertyException if the
-	 * {@link org.springframework.batch.item.file.transform.FieldSet} contains a field
+	 * {@link org.springframework.batch.infrastructure.item.file.transform.FieldSet} contains a field
 	 * that cannot be mapped to a bean property.
-	 * @see org.springframework.batch.item.file.mapping.FieldSetMapper#mapFieldSet(org.springframework.batch.item.file.transform.FieldSet)
+	 * @see org.springframework.batch.infrastructure.item.file.mapping.FieldSetMapper#mapFieldSet(org.springframework.batch.infrastructure.item.file.transform.FieldSet)
 	 */
 	@Override
 	public T mapRow(RowSet rs) throws BindException {

spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/poi/PoiItemReader.java

@@ -28,9 +28,9 @@
 import org.springframework.core.io.Resource;
 
 /**
- * {@link org.springframework.batch.item.ItemReader} implementation which uses apache POI
+ * {@link org.springframework.batch.infrastructure.item.ItemReader} implementation which uses apache POI
  * to read an Excel file. It will read the file sheet for sheet and row for row. It is
- * based on the {@link org.springframework.batch.item.file.FlatFileItemReader}
+ * based on the {@link org.springframework.batch.infrastructure.item.file.FlatFileItemReader}
  *
  * This class is <b>not</b> thread-safe.
  *

spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/support/rowset/RowSet.java

@@ -19,7 +19,7 @@
 import java.util.Properties;
 
 /**
- * Used by the {@code org.springframework.batch.item.excel.AbstractExcelItemReader} to
+ * Used by the {@code org.springframework.batch.infrastructure.item.excel.AbstractExcelItemReader} to
  * abstract away the complexities of the underlying Excel API implementations.
  *
  * @author Marten Deinum

spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/AbstractExcelItemReaderTests.java

@@ -32,7 +32,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import org.springframework.batch.extensions.excel.mapping.PassThroughRowMapper;
-import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.infrastructure.item.ExecutionContext;
 import org.springframework.core.io.DefaultResourceLoader;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/BeanPropertyItemReaderTests.java

@@ -24,7 +24,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.batch.extensions.excel.mapping.BeanWrapperRowMapper;
-import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.infrastructure.item.ExecutionContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/BeanPropertyWithStaticHeaderItemReaderTests.java

@@ -26,7 +26,7 @@
 import org.springframework.batch.extensions.excel.mapping.BeanWrapperRowMapper;
 import org.springframework.batch.extensions.excel.support.rowset.DefaultRowSetFactory;
 import org.springframework.batch.extensions.excel.support.rowset.StaticColumnNameExtractor;
-import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.infrastructure.item.ExecutionContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderWithBlankRowSheetTests.java

@@ -25,7 +25,7 @@
 
 import org.springframework.batch.extensions.excel.ReflectionTestUtils;
 import org.springframework.batch.extensions.excel.mapping.PassThroughRowMapper;
-import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.infrastructure.item.ExecutionContext;
 import org.springframework.core.io.ClassPathResource;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderWithErrorsTests.java

@@ -26,7 +26,7 @@
 
 import org.springframework.batch.extensions.excel.ReflectionTestUtils;
 import org.springframework.batch.extensions.excel.mapping.PassThroughRowMapper;
-import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.infrastructure.item.ExecutionContext;
 import org.springframework.core.io.ClassPathResource;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderXlsTypesTests.java

@@ -21,7 +21,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.batch.extensions.excel.mapping.PassThroughRowMapper;
-import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.infrastructure.item.ExecutionContext;
 import org.springframework.core.io.ClassPathResource;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderXlsxTypesTests.java

@@ -21,7 +21,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.batch.extensions.excel.mapping.PassThroughRowMapper;
-import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.infrastructure.item.ExecutionContext;
 import org.springframework.core.io.ClassPathResource;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/streaming/StreamingXlsxMappingTests.java

@@ -25,7 +25,7 @@
 import org.springframework.batch.extensions.excel.mapping.BeanWrapperRowMapper;
 import org.springframework.batch.extensions.excel.support.rowset.DefaultRowSetFactory;
 import org.springframework.batch.extensions.excel.support.rowset.StaticColumnNameExtractor;
-import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.infrastructure.item.ExecutionContext;
 import org.springframework.core.io.ClassPathResource;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/streaming/StreamingXlsxTypesTests.java

@@ -21,7 +21,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.batch.extensions.excel.mapping.PassThroughRowMapper;
-import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.infrastructure.item.ExecutionContext;
 import org.springframework.core.io.ClassPathResource;
 
 import static org.assertj.core.api.Assertions.assertThat;