Skip to content

Commit 638856a

Browse files
authored
Merge pull request #1161 from kazuki43zoo/update-doc-for-4.0
Update document for support 4.0
2 parents 4515a81 + a05b9b2 commit 638856a

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ MyBatis-Spring adapter is an easy-to-use [Spring Framework](https://github.com/s
1414
Supported Versions
1515
------------------
1616

17-
- master - Support for Spring 6 and Spring Batch 5
17+
- master - Support for Spring 7 and Spring Batch 6
18+
- 3.0.x - Support for Spring 6 and Spring Batch 5
1819
- 2.1.x - Maintenance for Spring 5 and Spring Batch 4
1920

2021
Essentials

src/site/es/markdown/index.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ MyBatis-Spring requires following versions:
2222

2323
| MyBatis-Spring | MyBatis | Spring Framework | Spring Batch | Java |
2424
|----------------| --- |------------------|--------------| --- |
25-
| **3.0** | 3.5+ | 6.0+ | 5.0+ | Java 17+ |
26-
| **2.1** | 3.5+ | 5.x | 4.x | Java 8+ |
25+
| **4.0** | 3.5+ | 7.0+ | 6.0+ | Java 17+ |
26+
| **3.0** | 3.5+ | 6.x | 5.x | Java 17+ |
27+
| **2.1** | 3.5+ | 5.x | 4.x | Java 8+ |
2728
| ~~**2.0**~~ | ~~3.5+~~ | ~~5.x~~ | ~~4.x~~ | ~~Java 8+~~ |
2829
| ~~**1.3**~~ | ~~3.4+~~ | ~~3.2.2+~~ | ~~2.1+~~ | ~~Java 6+~~ |
2930

src/site/ja/markdown/index.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ MyBatis-Spring は以下のバージョンを必要とします。
1717

1818
| MyBatis-Spring | MyBatis | Spring Framework | Spring Batch | Java |
1919
|----------------| --- |------------------|--------------| --- |
20-
| **3.0** | 3.5+ | 6.0+ | 5.0+ | Java 17+ |
21-
| **2.1** | 3.5+ | 5.x | 4.x | Java 8+ |
20+
| **4.0** | 3.5+ | 7.0+ | 6.0+ | Java 17+ |
21+
| **3.0** | 3.5+ | 6.x | 5.x | Java 17+ |
22+
| **2.1** | 3.5+ | 5.x | 4.x | Java 8+ |
2223
| ~~**2.0**~~ | ~~3.5+~~ | ~~5.x~~ | ~~4.x~~ | ~~Java 8+~~ |
2324
| ~~**1.3**~~ | ~~3.4+~~ | ~~3.2.2+~~ | ~~2.1+~~ | ~~Java 6+~~ |
2425

src/site/ko/markdown/index.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ MyBatis-Spring requires following versions:
2020

2121
| MyBatis-Spring | MyBatis | Spring Framework | Spring Batch | Java |
2222
|----------------| --- |------------------|--------------| --- |
23-
| **3.0** | 3.5+ | 6.0+ | 5.0+ | Java 17+ |
24-
| **2.1** | 3.5+ | 5.x | 4.x | Java 8+ |
23+
| **4.0** | 3.5+ | 7.0+ | 6.0+ | Java 17+ |
24+
| **3.0** | 3.5+ | 6.x | 5.x | Java 17+ |
25+
| **2.1** | 3.5+ | 5.x | 4.x | Java 8+ |
2526
| ~~**2.0**~~ | ~~3.5+~~ | ~~5.x~~ | ~~4.x~~ | ~~Java 8+~~ |
2627
| ~~**1.3**~~ | ~~3.4+~~ | ~~3.2.2+~~ | ~~2.1+~~ | ~~Java 6+~~ |
2728

src/site/markdown/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ MyBatis-Spring requires following versions:
2121

2222
| MyBatis-Spring | MyBatis | Spring Framework | Spring Batch | Java |
2323
|----------------| --- |------------------|--------------|-------------|
24-
| **3.0** | 3.5+ | 6.0+ | 5.0+ | Java 17+ |
24+
| **4.0** | 3.5+ | 7.0+ | 6.0+ | Java 17+ |
25+
| **3.0** | 3.5+ | 6.x | 5.x | Java 17+ |
2526
| **2.1** | 3.5+ | 5.x | 4.x | Java 8+ |
2627
| ~~**2.0**~~ | ~~3.5+~~ | ~~5.x~~ | ~~4.x~~ | ~~Java 8+~~ |
2728
| ~~**1.3**~~ | ~~3.4+~~ | ~~3.2.2+~~ | ~~2.1+~~ | ~~Java 6+~~ |

src/site/zh_CN/markdown/index.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ MyBatis-Spring 需要以下版本:
1919

2020
| MyBatis-Spring | MyBatis | Spring Framework | Spring Batch | Java |
2121
|----------------| --- |------------------|--------------| --- |
22-
| **3.0** | 3.5+ | 6.0+ | 5.0+ | Java 17+ |
23-
| **2.1** | 3.5+ | 5.x | 4.x | Java 8+ |
22+
| **4.0** | 3.5+ | 7.0+ | 6.0+ | Java 17+ |
23+
| **3.0** | 3.5+ | 6.x | 5.x | Java 17+ |
24+
| **2.1** | 3.5+ | 5.x | 4.x | Java 8+ |
2425
| ~~**2.0**~~ | ~~3.5+~~ | ~~5.x~~ | ~~4.x~~ | ~~Java 8+~~ |
2526
| ~~**1.3**~~ | ~~3.4+~~ | ~~3.2.2+~~ | ~~2.1+~~ | ~~Java 6+~~ |
2627

0 commit comments

Comments
 (0)