Merge pull request #701 from jeffgbutler/update-dependencies

Update dependencies
mybatis · Nov 17, 2023 · 6107e2c · 6107e2c
2 parents 5bc8833 + c27d619
commit 6107e2c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 27 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [11, 17, 21, 22-ea]
+        java: [17, 21, 22-ea]
         distribution: ['temurin']
       fail-fast: false
       max-parallel: 4

diff --git a/pom.xml b/pom.xml
@@ -55,8 +55,10 @@
   </distributionManagement>
 
   <properties>
+    <java.version>17</java.version>
+    <java.release.version>8</java.release.version>
     <junit.jupiter.version>5.10.1</junit.jupiter.version>
-    <spring.batch.version>4.3.9</spring.batch.version>
+    <spring.batch.version>5.0.3</spring.batch.version>
 
     <checkstyle.config>checkstyle-override.xml</checkstyle.config>
 
@@ -89,7 +91,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>5.3.31</version>
+      <version>6.0.14</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
@@ -128,7 +130,7 @@
     <dependency>
       <groupId>org.mybatis</groupId>
       <artifactId>mybatis-spring</artifactId>
-      <version>2.1.1</version>
+      <version>3.0.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -225,11 +227,6 @@
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-maven-plugin</artifactId>
         <version>${kotlin.version}</version>
-        <configuration>
-          <args>
-            <arg>-Xuse-ir</arg>
-          </args>
-        </configuration>
         <executions>
           <execution>
             <id>compile</id>

diff --git a/src/test/java/examples/springbatch/bulkinsert/BulkInsertConfiguration.java b/src/test/java/examples/springbatch/bulkinsert/BulkInsertConfiguration.java
@@ -103,10 +103,8 @@ public MyBatisBatchItemWriter<PersonRecord> writer(SqlSessionFactory sqlSessionF
 
     @Bean
     public Step step1(ItemProcessor<PersonRecord, PersonRecord> processor, ItemWriter<PersonRecord> writer) {
-        return new StepBuilder("step1")
-                .repository(jobRepository) // In Spring Batch 5, move this to the step builder constructor
-                .transactionManager(transactionManager) // In Spring Batch 5, move this to the 'chunk' method
-                .<PersonRecord, PersonRecord>chunk(10)
+        return new StepBuilder("step1", jobRepository)
+                .<PersonRecord, PersonRecord>chunk(10, transactionManager)
                 .reader(new TestRecordGenerator())
                 .processor(processor)
                 .writer(writer)
@@ -115,8 +113,7 @@ public Step step1(ItemProcessor<PersonRecord, PersonRecord> processor, ItemWrite
 
     @Bean
     public Job insertRecords(Step step1) {
-        return new JobBuilder("insertRecords")
-                .repository(jobRepository) // In Spring Batch 5, move this to the job builder constructor
+        return new JobBuilder("insertRecords", jobRepository)
                 .incrementer(new RunIdIncrementer())
                 .flow(step1)
                 .end()

diff --git a/src/test/java/examples/springbatch/cursor/CursorReaderBatchConfiguration.java b/src/test/java/examples/springbatch/cursor/CursorReaderBatchConfiguration.java
@@ -114,10 +114,8 @@ public MyBatisBatchItemWriter<PersonRecord> writer(SqlSessionFactory sqlSessionF
 
     @Bean
     public Step step1(ItemReader<PersonRecord> reader, ItemProcessor<PersonRecord, PersonRecord> processor, ItemWriter<PersonRecord> writer) {
-        return new StepBuilder("step1")
-                .repository(jobRepository) // In Spring Batch 5, move this to the step builder constructor
-                .transactionManager(transactionManager) // In Spring Batch 5, move this to the 'chunk' method
-                .<PersonRecord, PersonRecord>chunk(10)
+        return new StepBuilder("step1", jobRepository)
+                .<PersonRecord, PersonRecord>chunk(10, transactionManager)
                 .reader(reader)
                 .processor(processor)
                 .writer(writer)
@@ -126,8 +124,7 @@ public Step step1(ItemReader<PersonRecord> reader, ItemProcessor<PersonRecord, P
 
     @Bean
     public Job upperCaseLastName(Step step1) {
-        return new JobBuilder("upperCaseLastName") // In Spring Batch 5, move this to the job builder constructor
-                .repository(jobRepository)
+        return new JobBuilder("upperCaseLastName", jobRepository) // In Spring Batch 5, move this to the job builder constructor
                 .incrementer(new RunIdIncrementer())
                 .flow(step1)
                 .end()

diff --git a/src/test/java/examples/springbatch/paging/PagingReaderBatchConfiguration.java b/src/test/java/examples/springbatch/paging/PagingReaderBatchConfiguration.java
@@ -115,10 +115,8 @@ public MyBatisBatchItemWriter<PersonRecord> writer(SqlSessionFactory sqlSessionF
 
     @Bean
     public Step step1(ItemReader<PersonRecord> reader, ItemProcessor<PersonRecord, PersonRecord> processor, ItemWriter<PersonRecord> writer) {
-        return new StepBuilder("step1")
-                .repository(jobRepository) // In Spring Batch 5, move this to the step builder constructor
-                .transactionManager(transactionManager) // In Spring Batch 5, move this to the 'chunk' method
-                .<PersonRecord, PersonRecord>chunk(7)
+        return new StepBuilder("step1", jobRepository)
+                .<PersonRecord, PersonRecord>chunk(7, transactionManager)
                 .reader(reader)
                 .processor(processor)
                 .writer(writer)
@@ -127,8 +125,7 @@ public Step step1(ItemReader<PersonRecord> reader, ItemProcessor<PersonRecord, P
 
     @Bean
     public Job upperCaseLastName(Step step1) {
-        return new JobBuilder("upperCaseLastName")
-                .repository(jobRepository) // In Spring Batch 5, move this to the job builder constructor
+        return new JobBuilder("upperCaseLastName", jobRepository)
                 .incrementer(new RunIdIncrementer())
                 .flow(step1)
                 .end()