Merge branch 'master' into 3.x

Author: kazuki43zoo

README.md

@@ -14,7 +14,8 @@ MyBatis-Spring adapter is an easy-to-use Spring bridge for MyBatis sql mapping f
 Supported Versions
 ------------------
 
-- master (2.1.x) - Support Spring 6(keep backward compatibility for Spring 5)
+- 3.x - Support for Spring 6 and Spring Batch 5 (**not release yet**)
+- master (2.1.x) - Enhance and maintenance for Spring 5 and Spring Batch 4 (**not release yet**)
 - 2.0.x - Support for Java 8, Spring 5, and Junit 5 plus other java 8 requirements
 - 1.3.x - Continued support for Java 6 and 7
 

pom.xml

@@ -105,14 +105,15 @@
     <osgi.import>org.springframework.batch.*;resolution:=optional,*</osgi.import>
     <osgi.dynamicImport>*</osgi.dynamicImport>
 
-    <mybatis.version>3.5.10</mybatis.version>
+    <mybatis.version>3.5.11</mybatis.version>
     <spring.version>6.0.0-SNAPSHOT</spring.version>
     <spring-batch.version>5.0.0-SNAPSHOT</spring-batch.version>
     <module.name>org.mybatis.spring</module.name>
 
-    <junit.version>5.9.0</junit.version>
-    <project.build.outputTimestamp>1645112687</project.build.outputTimestamp>
+    <junit.version>5.9.1</junit.version>
 
+    <!-- Reproducible Builds -->
+    <project.build.outputTimestamp>1757561022</project.build.outputTimestamp>
   </properties>
 
   <dependencies>
@@ -218,7 +219,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.2</version>
       <scope>test</scope>
     </dependency>
 

src/site/es/markdown/index.md

@@ -22,7 +22,8 @@ MyBatis-Spring requires following versions:
 
 | MyBatis-Spring | MyBatis | Spring Framework | Spring Batch | Java |
 |----------------| --- |------------------|--------------| --- |
-| **2.1**        | 3.5+ | 5.0+             | 4.0+         | Java 8+ |
+| **3.0**        | 3.5+ | 6.0+             | 5.0+         | Java 17+ |
+| **2.1**        | 3.5+ | 5.x              | 4.x          | Java 8+  |
 | **2.0**        | 3.5+ | 5.x              | 4.x          | Java 8+ |
 | **1.3**        | 3.4+ | 3.2.2+           | 2.1+         | Java 6+ |
 

src/site/ja/markdown/index.md

@@ -17,7 +17,8 @@ MyBatis-Spring は以下のバージョンを必要とします。
 
 | MyBatis-Spring | MyBatis | Spring Framework | Spring Batch | Java |
 |----------------| --- |------------------|--------------| --- |
-| **2.1**        | 3.5+ | 5.0+             | 4.0+         | Java 8+ |
+| **3.0**        | 3.5+ | 6.0+             | 5.0+         | Java 17+ |
+| **2.1**        | 3.5+ | 5.x              | 4.x          | Java 8+  |
 | **2.0**        | 3.5+ | 5.x              | 4.x          | Java 8+ |
 | **1.3**        | 3.4+ | 3.2.2+           | 2.1+         | Java 6+ |
 

src/site/ko/markdown/index.md

@@ -20,7 +20,8 @@ MyBatis-Spring requires following versions:
 
 | MyBatis-Spring | MyBatis | Spring Framework | Spring Batch | Java |
 |----------------| --- |------------------|--------------| --- |
-| **2.1**        | 3.5+ | 5.0+             | 4.0+         | Java 8+ |
+| **3.0**        | 3.5+ | 6.0+             | 5.0+         | Java 17+ |
+| **2.1**        | 3.5+ | 5.x              | 4.x          | Java 8+  |
 | **2.0**        | 3.5+ | 5.x              | 4.x          | Java 8+ |
 | **1.3**        | 3.4+ | 3.2.2+           | 2.1+         | Java 6+ |
 

src/site/markdown/index.md

@@ -19,11 +19,12 @@ This document does not attempt to provide background information or basic setup
 
 MyBatis-Spring requires following versions:
 
-| MyBatis-Spring | MyBatis | Spring Framework | Spring Batch | Java |
-|----------------| --- |------------------|--------------| --- |
-| **2.1**        | 3.5+ | 5.0+             | 4.0+         | Java 8+ |
-| **2.0**        | 3.5+ | 5.x              | 4.x          | Java 8+ |
-| **1.3**        | 3.4+ | 3.2.2+           | 2.1+         | Java 6+ |
+| MyBatis-Spring | MyBatis | Spring Framework | Spring Batch | Java     |
+|----------------| --- |------------------|--------------|----------|
+| **3.0**        | 3.5+ | 6.0+             | 5.0+         | Java 17+ |
+| **2.1**        | 3.5+ | 5.x              | 4.x          | Java 8+  |
+| **2.0**        | 3.5+ | 5.x              | 4.x          | Java 8+  |
+| **1.3**        | 3.4+ | 3.2.2+           | 2.1+         | Java 6+  |
 
 ## Acknowledgements
 

src/site/zh/markdown/index.md

@@ -19,7 +19,8 @@ MyBatis-Spring 需要以下版本：
 
 | MyBatis-Spring | MyBatis | Spring Framework | Spring Batch | Java |
 |----------------| --- |------------------|--------------| --- |
-| **2.1**        | 3.5+ | 5.0+             | 4.0+         | Java 8+ |
+| **3.0**        | 3.5+ | 6.0+             | 5.0+         | Java 17+ |
+| **2.1**        | 3.5+ | 5.x              | 4.x          | Java 8+  |
 | **2.0**        | 3.5+ | 5.x              | 4.x          | Java 8+ |
 | **1.3**        | 3.4+ | 3.2.2+           | 2.1+         | Java 6+ |