Skip to content

Commit 73b700c

Browse files
committed
Switch baseline to Spring Boot 2.5
Fixes gh-561
1 parent 52b58f3 commit 73b700c

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ MyBatis Spring-Boot-Starter will help you to use MyBatis with Spring Boot
1212

1313
## Requirements
1414

15-
* master(2.1.x) : MyBatis 3.5+, MyBatis-Spring 2.0+(2.0.4+ recommended), Java 8+ and Spring Boot 2.1+
16-
* 2.0.x : MyBatis 3.5+, MyBatis-Spring 2.0+, Java 8+ and Spring Boot 2.0/2.1.
15+
* master(2.2.x) : MyBatis 3.5+, MyBatis-Spring 2.0+(2.0.6+ recommended), Java 8+ and Spring Boot 2.5+
16+
* 2.1.x : MyBatis 3.5+, MyBatis-Spring 2.0+(2.0.6+ recommended), Java 8+ and Spring Boot 2.1-2.4
17+
* 2.0.x(EOL) : MyBatis 3.5+, MyBatis-Spring 2.0+, Java 8+ and Spring Boot 2.0/2.1.
1718
* 1.3.x : MyBatis 3.4+, MyBatis-Spring 1.3+, Java 6+ and Spring Boot 1.5
1819

1920
## Essentials

mybatis-spring-boot-autoconfigure/src/site/markdown/index.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ The MyBatis-Spring-Boot-Starter requires following versions:
1616

1717
| MyBatis-Spring-Boot-Starter | MyBatis-Spring | Spring Boot | Java |
1818
| --- | --- | --- | --- |
19-
| **2.1** | 2.0 (need 2.0.2+ for enable all features) | 2.1 or higher | 8 or higher |
19+
| **2.2** | 2.0 (need 2.0.6+ for enable all features) | 2.5 or higher | 8 or higher |
20+
| **2.1** | 2.0 (need 2.0.6+ for enable all features) | 2.1 - 2.4 | 8 or higher |
2021
| **~~2.0 (EOL)~~** | ~~2.0~~ | ~~2.0 or 2.1~~ | ~~8 or higher~~ |
2122
| **1.3** | 1.3 | 1.5 | 6 or higher |
2223
| **~~1.2 (EOL)~~** | ~~1.3~~ | ~~1.4~~ | ~~6 or higher~~ |

mybatis-spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories

+1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConf
66
org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration,\
77
org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration,\
88
org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration,\
9+
org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration,\
910
org.mybatis.spring.boot.autoconfigure.MybatisLanguageDriverAutoConfiguration,\
1011
org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration

mybatis-spring-boot-test-autoconfigure/src/site/markdown/index.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ The MyBatis-Spring-Boot-Starter-Test requires following versions:
1515

1616
| MyBatis-Spring-Boot-Starter-Test | Spring Boot | Java |
1717
| --- | --- | --- |
18-
| **2.1** | 2.1 or higher | 8 or higher |
18+
| **2.2** | 2.5 or higher | 8 or higher |
19+
| **2.1** | 2.1 - 2.4 | 8 or higher |
1920
| **~~2.0 (EOL)~~** | ~~2.0 or 2.1~~ | ~~8 or higher~~ |
2021
| **1.3** | 1.5 | 6 or higher |
2122
| **~~1.2 (EOL)~~** | ~~1.4~~ | ~~6 or higher~~ |
@@ -294,6 +295,7 @@ The `@MybatisTest` will import following auto-configuration classes.
294295
* `org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration`
295296
* `org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration`
296297
* `org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration`
298+
* `org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration`
297299
* `org.mybatis.spring.boot.autoconfigure.MybatisLanguageDriverAutoConfiguration`
298300
* `org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration`
299301

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<mybatis-freemarker.version>1.2.2</mybatis-freemarker.version>
7373
<mybatis-velocity.version>2.1.0</mybatis-velocity.version>
7474
<mybatis-thymeleaf.version>1.0.2</mybatis-thymeleaf.version>
75-
<spring-boot.version>2.4.5</spring-boot.version>
75+
<spring-boot.version>2.5.0</spring-boot.version>
7676
</properties>
7777

7878
<build>

0 commit comments

Comments
 (0)