Merge pull request #563 from kazuki43zoo/gh-561_spring-boot2.5

Switch baseline to Spring Boot 2.5

Author: kazuki43zoo

README.md

@@ -12,8 +12,9 @@ MyBatis Spring-Boot-Starter will help you to use MyBatis with Spring Boot
 
 ## Requirements
 
-* master(2.1.x) : MyBatis 3.5+, MyBatis-Spring 2.0+(2.0.4+ recommended), Java 8+ and Spring Boot 2.1+
-* 2.0.x : MyBatis 3.5+, MyBatis-Spring 2.0+, Java 8+ and Spring Boot 2.0/2.1.
+* master(2.2.x) : MyBatis 3.5+, MyBatis-Spring 2.0+(2.0.6+ recommended), Java 8+ and Spring Boot 2.5+
+* 2.1.x : MyBatis 3.5+, MyBatis-Spring 2.0+(2.0.6+ recommended), Java 8+ and Spring Boot 2.1-2.4
+* 2.0.x(EOL) : MyBatis 3.5+, MyBatis-Spring 2.0+, Java 8+ and Spring Boot 2.0/2.1.
 * 1.3.x : MyBatis 3.4+, MyBatis-Spring 1.3+, Java 6+ and Spring Boot 1.5
 
 ## Essentials

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

@@ -16,7 +16,8 @@ The MyBatis-Spring-Boot-Starter requires following versions:
 
 | MyBatis-Spring-Boot-Starter | MyBatis-Spring | Spring Boot | Java |
 | --- | --- | --- | --- |
-| **2.1** | 2.0 (need 2.0.2+ for enable all features) | 2.1 or higher | 8 or higher |
+| **2.2** | 2.0 (need 2.0.6+ for enable all features) | 2.5 or higher | 8 or higher |
+| **2.1** | 2.0 (need 2.0.6+ for enable all features) | 2.1 - 2.4 | 8 or higher |
 | **~~2.0 (EOL)~~** | ~~2.0~~ | ~~2.0 or 2.1~~ | ~~8 or higher~~ |
 | **1.3** | 1.3 | 1.5 | 6 or higher |
 | **~~1.2 (EOL)~~** | ~~1.3~~ | ~~1.4~~ | ~~6 or higher~~ |

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

@@ -6,5 +6,6 @@ org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConf
 org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration,\
 org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration,\
 org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration,\
+org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration,\
 org.mybatis.spring.boot.autoconfigure.MybatisLanguageDriverAutoConfiguration,\
 org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration

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

@@ -15,7 +15,8 @@ The MyBatis-Spring-Boot-Starter-Test requires following versions:
 
 | MyBatis-Spring-Boot-Starter-Test | Spring Boot | Java |
 | --- | --- | --- |
-| **2.1** | 2.1 or higher | 8 or higher |
+| **2.2** | 2.5 or higher | 8 or higher |
+| **2.1** | 2.1 - 2.4 | 8 or higher |
 | **~~2.0 (EOL)~~** | ~~2.0 or 2.1~~ | ~~8 or higher~~ |
 | **1.3** | 1.5 | 6 or higher |
 | **~~1.2 (EOL)~~** | ~~1.4~~ | ~~6 or higher~~ |
@@ -294,6 +295,7 @@ The `@MybatisTest` will import following auto-configuration classes.
 * `org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration`
 * `org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration`
 * `org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration`
+* `org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration`
 * `org.mybatis.spring.boot.autoconfigure.MybatisLanguageDriverAutoConfiguration`
 * `org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration`
 

pom.xml

@@ -72,7 +72,7 @@
     <mybatis-freemarker.version>1.2.2</mybatis-freemarker.version>
     <mybatis-velocity.version>2.1.0</mybatis-velocity.version>
     <mybatis-thymeleaf.version>1.0.2</mybatis-thymeleaf.version>
-    <spring-boot.version>2.4.5</spring-boot.version>
+    <spring-boot.version>2.5.0</spring-boot.version>
   </properties>
 
   <build>