Merge branch 'master' into 3.x

Author: kazuki43zoo

README.md

@@ -6,13 +6,14 @@
 [![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/https/oss.sonatype.org/org.mybatis.spring.boot/mybatis-spring-boot.svg)](https://oss.sonatype.org/content/repositories/snapshots/org/mybatis/spring/boot/mybatis-spring-boot/)
 [![License](https://img.shields.io/:license-apache-brightgreen.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 
-![mybatis-spring](http://mybatis.github.io/images/mybatis-logo.png)
+![mybatis-spring](https://mybatis.org/images/mybatis-logo.png)
 
 MyBatis Spring-Boot-Starter will help you to use MyBatis with Spring Boot
 
 ## Requirements
 
-* master(2.3.x) : MyBatis 3.5+, MyBatis-Spring 2.1, Java 8+ and Spring Boot 2.5+ (First version for supporting Spring Boot 3), **not release yet**
+* 3.x : MyBatis 3.5+, MyBatis-Spring 3.0, Java 17+ and Spring Boot 3.0 **not release yet**
+* master(2.3.x) : MyBatis 3.5+, MyBatis-Spring 2.1, Java 8+ and Spring Boot 2.5-2.7 **not release yet**
 * 2.2.x : MyBatis 3.5+, MyBatis-Spring 2.0+(2.0.6+ recommended), Java 8+ and Spring Boot 2.5-2.7
 * 2.1.x : MyBatis 3.5+, MyBatis-Spring 2.0+(2.0.6+ recommended), Java 8+ and Spring Boot ~~2.1-2.4~~ 2.4
 * ~~2.0.x : (EOL) MyBatis 3.5+, MyBatis-Spring 2.0+, Java 8+ and Spring Boot 2.0/2.1.~~

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

@@ -23,11 +23,12 @@ By using this module you will achieve:
 
 The MyBatis-Spring-Boot-Starter requires following versions:
 
-| MyBatis-Spring-Boot-Starter | MyBatis-Spring                            | Spring Boot    | Java |
-|-----------------------------|-------------------------------------------|----------------| --- |
-| **2.3**                     | 2.1                                       | 2.5 or higher  | 8 or higher |
-| **2.2**                     | 2.0 (need 2.0.6+ for enable all features) | 2.5 - 2.7      | 8 or higher |
-| **2.1**                     | 2.0 (need 2.0.6+ for enable all features) | 2.1 - 2.4      | 8 or higher |
+| MyBatis-Spring-Boot-Starter | MyBatis-Spring                            | Spring Boot    | Java            |
+|-----------------------------|-------------------------------------------|----------------|-----------------|
+| **3.0**                     | 3.0                                       | 3.0            | 17 or higher    |
+| **2.3**                     | 2.1                                       | 2.5 - 2.7      | 8 or higher     |
+| **2.2**                     | 2.0 (need 2.0.6+ for enable all features) | 2.5 - 2.7      | 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 (EOL)~~**           | ~~1.3~~                                   | ~~1.5~~        | ~~6 or higher~~ |
 | **~~1.2 (EOL)~~**           | ~~1.3~~                                   | ~~1.4~~        | ~~6 or higher~~ |

mybatis-spring-boot-autoconfigure/src/site/resources/css/site.css

@@ -16,7 +16,7 @@
 /*
  * when new flags are needed, take them from
  *
- * http://www.printableworldflags.com/flag-icon
+ * https://www.printableworldflags.com/flag-icon
  *
  * that are free for any kind of usage
  */

mybatis-spring-boot-autoconfigure/src/site/resources/es/css/site.css

@@ -16,7 +16,7 @@
 /*
  * when new flags are needed, take them from
  *
- * http://www.printableworldflags.com/flag-icon
+ * https://www.printableworldflags.com/flag-icon
  *
  * that are free for any kind of usage
  */

mybatis-spring-boot-autoconfigure/src/site/resources/ja/css/site.css

@@ -16,7 +16,7 @@
 /*
  * when new flags are needed, take them from
  *
- * http://www.printableworldflags.com/flag-icon
+ * https://www.printableworldflags.com/flag-icon
  *
  * that are free for any kind of usage
  */

mybatis-spring-boot-autoconfigure/src/site/resources/ko/css/site.css

@@ -16,7 +16,7 @@
 /*
  * when new flags are needed, take them from
  *
- * http://www.printableworldflags.com/flag-icon
+ * https://www.printableworldflags.com/flag-icon
  *
  * that are free for any kind of usage
  */

mybatis-spring-boot-autoconfigure/src/site/resources/zh/css/site.css

@@ -16,7 +16,7 @@
 /*
  * when new flags are needed, take them from
  *
- * http://www.printableworldflags.com/flag-icon
+ * https://www.printableworldflags.com/flag-icon
  *
  * that are free for any kind of usage
  */

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

@@ -24,8 +24,9 @@ MyBatis-Spring-Boot-Starter 可以帮助你更快地在 [Spring Boot](https://sp
 MyBatis-Spring-Boot-Starter 要求以下版本:
 
 | MyBatis-Spring-Boot-Starter | MyBatis-Spring       | Spring Boot   | Java      |
-| --------------------------- | -------------------- | ------------- | --------- |
-| **2.3**                     | 2.1                  | 2.5 或更高       | 8 或更高     |
+|-----------------------------|----------------------|---------------|-----------|
+| **3.0**                     | 3.0                  | 3.0           | 17 或更高    |
+| **2.3**                     | 2.1                  | 2.5 - 2.7     | 8 或更高     |
 | **2.2**                     | 2.0（2.0.6 以上可开启所有特性） | 2.5 - 2.7     | 8 或更高     |
 | **2.1**                     | 2.0（2.0.6 以上可开启所有特性） | 2.1 - 2.4     | 8 或更高     |
 | **~~2.0 (EOL)~~**           | ~~2.0~~              | ~~2.0 或 2.1~~ | ~~8 或更高~~ |

mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/pom.xml

@@ -37,7 +37,6 @@
     <dependency>
       <groupId>org.mybatis.scripting</groupId>
       <artifactId>mybatis-freemarker</artifactId>
-      <version>1.2.3</version>
     </dependency>
     <dependency>
       <groupId>com.h2database</groupId>

mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/pom.xml

@@ -88,7 +88,7 @@
         <plugin>
           <groupId>org.codehaus.cargo</groupId>
           <artifactId>cargo-maven3-plugin</artifactId>
-          <version>1.10.1</version>
+          <version>1.10.2</version>
         </plugin>
       </plugins>
     </pluginManagement>