diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5177dca7..a86797bc 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2022 the original author or authors.
+#    Copyright 2015-2023 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -24,14 +24,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        java: [11, 17, 19, 20-ea]
+        java: [11, 17, 21]
         distribution: ['zulu']
       fail-fast: false
       max-parallel: 5
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
index e58eac82..cb667f63 100644
--- a/.github/workflows/coveralls.yaml
+++ b/.github/workflows/coveralls.yaml
@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2020 the original author or authors.
+#    Copyright 2015-2023 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ jobs:
     if: github.repository_owner == 'mybatis'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
index b0dab7eb..e9f21976 100644
--- a/.github/workflows/sonar.yaml
+++ b/.github/workflows/sonar.yaml
@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2020 the original author or authors.
+#    Copyright 2015-2023 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -19,14 +19,14 @@ name: SonarCloud
 on:
   push:
     branches:
-      - master
+      - 2.3.x
 
 jobs:
   build:
     if: github.repository_owner == 'mybatis'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # Disabling shallow clone is recommended for improving relevancy of reporting
           fetch-depth: 0
diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
index fa4a4a7f..c29fc997 100644
--- a/.github/workflows/sonatype.yaml
+++ b/.github/workflows/sonatype.yaml
@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2020 the original author or authors.
+#    Copyright 2015-2023 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -19,14 +19,14 @@ name: Sonatype
 on:
   push:
     branches:
-      - master
+      - 2.3.x
 
 jobs:
   build:
     if: github.repository_owner == 'mybatis' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
diff --git a/.github/workflows/support.yaml b/.github/workflows/support.yaml
index 48284d9e..a871342e 100644
--- a/.github/workflows/support.yaml
+++ b/.github/workflows/support.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2022 the original author or authors.
+# Copyright 2015-2023 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,15 +23,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macOS-latest]
-        java: [11, 17, 19, 20-ea]
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+        java: [11, 17, 21]
         distribution: ['zulu']
       fail-fast: false
       max-parallel: 5
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
diff --git a/README.md b/README.md
index 3805e4d4..636485f7 100644
--- a/README.md
+++ b/README.md
@@ -12,16 +12,12 @@ MyBatis Spring-Boot-Starter will help you to use MyBatis with Spring Boot
 
 ## Requirements
 
-* 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.~~
-* ~~1.3.x : (EOL) MyBatis 3.4+, MyBatis-Spring 1.3+, Java 6+ and Spring Boot 1.5~~
+* 3.x : MyBatis 3.5+, MyBatis-Spring 3.0, Java 17+ and Spring Boot 3.0-3.1(Not release yet)
+* master(2.3.x) : MyBatis 3.5+, MyBatis-Spring 2.1, Java 8+ and Spring Boot 2.5-2.7
 
 ## Compatibility Check
 
-* Compatibility with Spring Boot 2.4 - 3.0 [here](https://github.com/kazuki43zoo/mybatis-spring-boot-dev-compatibility-checker)
+* Compatibility with Spring Boot 2.5 - 3.1 [here](https://github.com/kazuki43zoo/mybatis-spring-boot-dev-compatibility-checker)
 
 ## Essentials
 
@@ -32,13 +28,13 @@ MyBatis Spring-Boot-Starter will help you to use MyBatis with Spring Boot
 
 ### Snapshot documentations
 
-* [See the docs](https://github.com/mybatis/spring-boot-starter/blob/master/mybatis-spring-boot-autoconfigure/src/site/markdown/index.md)
-* [See the docs for testing](https://github.com/mybatis/spring-boot-starter/blob/master/mybatis-spring-boot-test-autoconfigure/src/site/markdown/index.md)
+* [See the docs](https://github.com/mybatis/spring-boot-starter/blob/2.3.x/mybatis-spring-boot-autoconfigure/src/site/markdown/index.md)
+* [See the docs for testing](https://github.com/mybatis/spring-boot-starter/blob/2.3.x/mybatis-spring-boot-test-autoconfigure/src/site/markdown/index.md)
 
 Translations:
 
-* [See the docs(简体中文)](https://github.com/mybatis/spring-boot-starter/blob/master/mybatis-spring-boot-autoconfigure/src/site/zh/markdown/index.md)
-* [See the docs for testing(简体中文)](https://github.com/mybatis/spring-boot-starter/blob/master/mybatis-spring-boot-test-autoconfigure/src/site/zh/markdown/index.md)
+* [See the docs(简体中文)](https://github.com/mybatis/spring-boot-starter/blob/2.3.x/mybatis-spring-boot-autoconfigure/src/site/zh/markdown/index.md)
+* [See the docs for testing(简体中文)](https://github.com/mybatis/spring-boot-starter/blob/2.3.x/mybatis-spring-boot-test-autoconfigure/src/site/zh/markdown/index.md)
 
 
 ## Quick Start
diff --git a/mybatis-spring-boot-autoconfigure/pom.xml b/mybatis-spring-boot-autoconfigure/pom.xml
index f10f4170..76fafbfe 100644
--- a/mybatis-spring-boot-autoconfigure/pom.xml
+++ b/mybatis-spring-boot-autoconfigure/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mybatis.spring.boot</groupId>
     <artifactId>mybatis-spring-boot</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-autoconfigure</artifactId>
   <name>mybatis-spring-boot-autoconfigure</name>
diff --git a/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/SpringBootVFS.java b/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/SpringBootVFS.java
index 9d8e0bde..38639e53 100644
--- a/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/SpringBootVFS.java
+++ b/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/SpringBootVFS.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2015-2022 the original author or authors.
+ *    Copyright 2015-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import java.net.URLDecoder;
 import java.nio.charset.Charset;
 import java.util.List;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -28,6 +29,7 @@
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.util.ClassUtils;
 
 /**
  * @author Hans Westerbeek
@@ -37,14 +39,16 @@
 public class SpringBootVFS extends VFS {
 
   private static Charset urlDecodingCharset;
+  private static Supplier<ClassLoader> classLoaderSupplier;
   private final ResourcePatternResolver resourceResolver;
 
   static {
     setUrlDecodingCharset(Charset.defaultCharset());
+    setClassLoaderSupplier(ClassUtils::getDefaultClassLoader);
   }
 
   public SpringBootVFS() {
-    this.resourceResolver = new PathMatchingResourcePatternResolver(getClass().getClassLoader());
+    this.resourceResolver = new PathMatchingResourcePatternResolver(classLoaderSupplier.get());
   }
 
   @Override
@@ -76,6 +80,21 @@ public static void setUrlDecodingCharset(Charset charset) {
     urlDecodingCharset = charset;
   }
 
+  /**
+   * Set the supplier for providing {@link ClassLoader} to used.
+   * <p>
+   * Default is a returned instance from {@link ClassUtils#getDefaultClassLoader()}.
+   * </p>
+   *
+   * @param supplier
+   *          the supplier for providing {@link ClassLoader} to used
+   *
+   * @since 2.3.1
+   */
+  public static void setClassLoaderSupplier(Supplier<ClassLoader> supplier) {
+    classLoaderSupplier = supplier;
+  }
+
   private static String preserveSubpackageName(final String baseUrlString, final Resource resource,
       final String rootPath) {
     try {
diff --git a/mybatis-spring-boot-autoconfigure/src/site/markdown/index.md b/mybatis-spring-boot-autoconfigure/src/site/markdown/index.md
index e3e00ea3..d2985319 100644
--- a/mybatis-spring-boot-autoconfigure/src/site/markdown/index.md
+++ b/mybatis-spring-boot-autoconfigure/src/site/markdown/index.md
@@ -25,10 +25,10 @@ The MyBatis-Spring-Boot-Starter requires following versions:
 
 | MyBatis-Spring-Boot-Starter | MyBatis-Spring                            | Spring Boot    | Java            |
 |-----------------------------|-------------------------------------------|----------------|-----------------|
-| **3.0**                     | 3.0                                       | 3.0            | 17 or higher    |
+| **3.0**                     | 3.0                                       | 3.0 - 3.1      | 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.2 (EOL)~~**           | ~~2.0 (need 2.0.6+ for enable all features)~~ | ~~2.5 - 2.7~~      | ~~8 or higher~~     |
+| **~~2.1 (EOL)~~**           | ~~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~~ |
diff --git a/mybatis-spring-boot-autoconfigure/src/site/zh/markdown/index.md b/mybatis-spring-boot-autoconfigure/src/site/zh/markdown/index.md
index 280ac91d..0928a0a4 100644
--- a/mybatis-spring-boot-autoconfigure/src/site/zh/markdown/index.md
+++ b/mybatis-spring-boot-autoconfigure/src/site/zh/markdown/index.md
@@ -25,10 +25,10 @@ MyBatis-Spring-Boot-Starter 要求以下版本:
 
 | MyBatis-Spring-Boot-Starter | MyBatis-Spring       | Spring Boot   | Java      |
 |-----------------------------|----------------------|---------------|-----------|
-| **3.0**                     | 3.0                  | 3.0           | 17 或更高    |
+| **3.0**                     | 3.0                  | 3.0 - 3.1     | 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.2 (EOL)~~**           | ~~2.0（2.0.6 以上可开启所有特性）~~ | ~~2.5 - 2.7~~ | ~~8 或更高~~     |
+| **~~2.1 (EOL)~~**           | ~~2.0（2.0.6 以上可开启所有特性）~~ | ~~2.1 - 2.4~~ | ~~8 或更高~~     |
 | **~~2.0 (EOL)~~**           | ~~2.0~~              | ~~2.0 或 2.1~~ | ~~8 或更高~~ |
 | **~~1.3 (EOL)~~**           | ~~1.3~~              | ~~1.5~~       | ~~6 或更高~~ |
 | **~~1.2 (EOL)~~**           | ~~1.3~~              | ~~1.4~~       | ~~6 或更高~~ |
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/pom.xml
index 97a06fbc..7dffd44f 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/pom.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mybatis.spring.boot</groupId>
     <artifactId>mybatis-spring-boot-samples</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-sample-annotation</artifactId>
   <packaging>jar</packaging>
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/pom.xml
index 6bb7d20d..5ee05f7f 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/pom.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mybatis.spring.boot</groupId>
     <artifactId>mybatis-spring-boot-samples</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-sample-freemarker-legacy</artifactId>
   <packaging>jar</packaging>
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/pom.xml
index 7ca03825..ea2c033d 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/pom.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mybatis.spring.boot</groupId>
     <artifactId>mybatis-spring-boot-samples</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-sample-freemarker</artifactId>
   <packaging>jar</packaging>
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/pom.xml
index ea9e019b..e94bd4a9 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/pom.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mybatis.spring.boot</groupId>
     <artifactId>mybatis-spring-boot-samples</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-sample-groovy</artifactId>
   <packaging>jar</packaging>
@@ -29,7 +29,7 @@
   <properties>
     <java.version>1.8</java.version>
     <module.name>org.mybatis.spring.boot.sample.groovy</module.name>
-    <groovy.version>4.0.6</groovy.version>
+    <groovy.version>4.0.12</groovy.version>
     <maven.site.skip>true</maven.site.skip> <!-- Workaround for build error -->
   </properties>
   <dependencies>
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/pom.xml
index 232df203..6026dec2 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/pom.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,14 +21,14 @@
   <parent>
     <groupId>org.mybatis.spring.boot</groupId>
     <artifactId>mybatis-spring-boot-samples</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-sample-kotlin</artifactId>
   <packaging>jar</packaging>
   <name>mybatis-spring-boot-sample-kotlin</name>
   <properties>
     <module.name>org.mybatis.spring.boot.sample.kotlin</module.name>
-    <kotlin.version>1.7.21</kotlin.version>
+    <kotlin.version>1.8.21</kotlin.version>
     <java.version>1.8</java.version>
   </properties>
   <dependencies>
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/pom.xml
index 4511678e..0b1faaea 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/pom.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mybatis.spring.boot</groupId>
     <artifactId>mybatis-spring-boot-samples</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-sample-thymeleaf</artifactId>
   <packaging>jar</packaging>
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/pom.xml
index 0a2d91e9..55806b3c 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/pom.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mybatis.spring.boot</groupId>
     <artifactId>mybatis-spring-boot-samples</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-sample-velocity-legacy</artifactId>
   <packaging>jar</packaging>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.mybatis.scripting</groupId>
       <artifactId>mybatis-velocity</artifactId>
-      <version>2.1.1</version>
+      <version>2.1.2</version>
     </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/pom.xml
index c76af8b6..efa0be0f 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/pom.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mybatis.spring.boot</groupId>
     <artifactId>mybatis-spring-boot-samples</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-sample-velocity</artifactId>
   <packaging>jar</packaging>
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/pom.xml
index 3f94aaa2..12c93417 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/pom.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mybatis.spring.boot</groupId>
     <artifactId>mybatis-spring-boot-samples</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-sample-war</artifactId>
   <packaging>war</packaging>
@@ -88,7 +88,7 @@
         <plugin>
           <groupId>org.codehaus.cargo</groupId>
           <artifactId>cargo-maven3-plugin</artifactId>
-          <version>1.10.3</version>
+          <version>1.10.4</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/pom.xml
index c321280c..1e9e0ea9 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/pom.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mybatis.spring.boot</groupId>
     <artifactId>mybatis-spring-boot-samples</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-sample-web</artifactId>
   <packaging>jar</packaging>
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/SampleMybatisWithMockBeanApplicationTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/SampleMybatisWithMockBeanApplicationTest.java
new file mode 100644
index 00000000..ebc11694
--- /dev/null
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/SampleMybatisWithMockBeanApplicationTest.java
@@ -0,0 +1,62 @@
+/*
+ *    Copyright 2015-2023 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package sample.mybatis.web;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Map;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+
+import sample.mybatis.web.domain.City;
+import sample.mybatis.web.mapper.CityMapper;
+
+/**
+ * @author Kazuki Shimizu
+ */
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+class SampleMybatisWithMockBeanApplicationTest {
+
+  @Autowired
+  private TestRestTemplate restTemplate;
+
+  @MockBean
+  CityMapper cityMapper;
+
+  @BeforeEach
+  void setup() {
+    City city = new City();
+    city.setId(10L);
+    city.setCountry("US");
+    city.setState("NV");
+    city.setName("Las Vegas");
+    Mockito.when(cityMapper.findByState("NV")).thenReturn(city);
+  }
+
+  @Test
+  void test() {
+    @SuppressWarnings("unchecked")
+    Map<String, Object> body = this.restTemplate.getForObject("/cities/{state}", Map.class, "NV");
+    assertThat(body).hasSize(4).containsEntry("id", 10).containsEntry("name", "Las Vegas").containsEntry("state", "NV")
+        .containsEntry("country", "US");
+  }
+}
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/pom.xml
index 54f30a9c..5ce47cdb 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/pom.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mybatis.spring.boot</groupId>
     <artifactId>mybatis-spring-boot-samples</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-sample-xml</artifactId>
   <packaging>jar</packaging>
diff --git a/mybatis-spring-boot-samples/pom.xml b/mybatis-spring-boot-samples/pom.xml
index 90a24ce8..4cbcb6f8 100644
--- a/mybatis-spring-boot-samples/pom.xml
+++ b/mybatis-spring-boot-samples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mybatis.spring.boot</groupId>
     <artifactId>mybatis-spring-boot</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-samples</artifactId>
   <packaging>pom</packaging>
diff --git a/mybatis-spring-boot-starter-test/pom.xml b/mybatis-spring-boot-starter-test/pom.xml
index e06d484c..615e7d8a 100644
--- a/mybatis-spring-boot-starter-test/pom.xml
+++ b/mybatis-spring-boot-starter-test/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>mybatis-spring-boot</artifactId>
     <groupId>org.mybatis.spring.boot</groupId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-starter-test</artifactId>
   <name>mybatis-spring-boot-starter-test</name>
diff --git a/mybatis-spring-boot-starter/pom.xml b/mybatis-spring-boot-starter/pom.xml
index 78572166..0c75dcbd 100644
--- a/mybatis-spring-boot-starter/pom.xml
+++ b/mybatis-spring-boot-starter/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mybatis.spring.boot</groupId>
     <artifactId>mybatis-spring-boot</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-starter</artifactId>
   <name>mybatis-spring-boot-starter</name>
diff --git a/mybatis-spring-boot-test-autoconfigure/pom.xml b/mybatis-spring-boot-test-autoconfigure/pom.xml
index f4811e22..84b6acea 100644
--- a/mybatis-spring-boot-test-autoconfigure/pom.xml
+++ b/mybatis-spring-boot-test-autoconfigure/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>mybatis-spring-boot</artifactId>
     <groupId>org.mybatis.spring.boot</groupId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-test-autoconfigure</artifactId>
   <name>mybatis-spring-boot-test-autoconfigure</name>
diff --git a/mybatis-spring-boot-test-autoconfigure/src/site/markdown/index.md b/mybatis-spring-boot-test-autoconfigure/src/site/markdown/index.md
index 093ce1d1..81963f04 100644
--- a/mybatis-spring-boot-test-autoconfigure/src/site/markdown/index.md
+++ b/mybatis-spring-boot-test-autoconfigure/src/site/markdown/index.md
@@ -24,10 +24,10 @@ The MyBatis-Spring-Boot-Starter-Test requires following versions:
 
 | MyBatis-Spring-Boot-Starter-Test | Spring Boot    | Java            |
 |----------------------------------|----------------|-----------------|
-| **3.0**                          | 3.0            | 17 or higher    |
+| **3.0**                          | 3.0 - 3.1      | 17 or higher    |
 | **2.3**                          | 2.5 - 2.7      | 8 or higher     |
-| **2.2**                          | 2.5 - 2.7      | 8 or higher     |
-| **2.1**                          | 2.1 - 2.4      | 8 or higher     |
+| **~~2.2 (EOL)~~**                | ~~2.5 - 2.7~~  | ~~8 or higher~~ |
+| **~~2.1 (EOL)~~**                | ~~2.1 - 2.4~~  | ~~8 or higher~~ |
 | **~~2.0 (EOL)~~**                | ~~2.0 or 2.1~~ | ~~8 or higher~~ |
 | **~~1.3 (EOL)~~**                | ~~1.5~~        | ~~6 or higher~~ |
 | **~~1.2 (EOL)~~**                | ~~1.4~~        | ~~6 or higher~~ |
diff --git a/mybatis-spring-boot-test-autoconfigure/src/site/zh/markdown/index.md b/mybatis-spring-boot-test-autoconfigure/src/site/zh/markdown/index.md
index 8ab5f5a0..117e94e5 100644
--- a/mybatis-spring-boot-test-autoconfigure/src/site/zh/markdown/index.md
+++ b/mybatis-spring-boot-test-autoconfigure/src/site/zh/markdown/index.md
@@ -24,8 +24,8 @@ TheMyBatis-Spring-Boot-Starter-Test 要求以下版本：
 |----------------------------------|---------------|-----------|
 | **3.0**                          | 3.0           | 17 或更高    |
 | **2.3**                          | 2.5 - 2.7     | 8 或更高     |
-| **2.2**                          | 2.5 - 2.7     | 8 或更高     |
-| **2.1**                          | 2.1 - 2.4     | 8 或更高     |
+| **~~2.2 (EOL)~~**                | ~~2.5 - 2.7~~ | ~~8 或更高~~ |
+| **~~2.1 (EOL)~~**                | ~~2.1 - 2.4~~ | ~~8 或更高~~ |
 | **~~2.0 (EOL)~~**                | ~~2.0 或 2.1~~ | ~~8 或更高~~ |
 | **~~1.3 (EOL)~~**                | ~~1.5~~       | ~~6 或更高~~ |
 | **~~1.2 (EOL)~~**                | ~~1.4~~       | ~~6 或更高~~ |
diff --git a/pom.xml b/pom.xml
index 35332d91..3d9af447 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2022 the original author or authors.
+       Copyright 2015-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 
   <groupId>org.mybatis.spring.boot</groupId>
   <artifactId>mybatis-spring-boot</artifactId>
-  <version>2.3.0-SNAPSHOT</version>
+  <version>2.3.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>mybatis-spring-boot</name>
@@ -67,46 +67,53 @@
   </distributionManagement>
 
   <properties>
-    <mybatis.version>3.5.11</mybatis.version>
-    <mybatis-spring.version>2.1.0-SNAPSHOT</mybatis-spring.version>
-    <mybatis-freemarker.version>1.2.3</mybatis-freemarker.version>
+    <mybatis.version>3.5.14</mybatis.version>
+    <mybatis-spring.version>2.1.2</mybatis-spring.version>
+    <mybatis-freemarker.version>1.2.4</mybatis-freemarker.version>
     <mybatis-velocity.version>2.1.1</mybatis-velocity.version>
     <mybatis-thymeleaf.version>1.0.4</mybatis-thymeleaf.version>
-    <spring-boot.version>2.7.6</spring-boot.version>
+    <spring-boot.version>2.7.18</spring-boot.version>
 
     <argLine>-Djdk.attach.allowAttachSelf --add-opens java.base/java.lang=ALL-UNNAMED -Dfile.encoding=UTF-8</argLine>
 
     <!-- Reproducible Builds -->
-    <project.build.outputTimestamp>1757561022</project.build.outputTimestamp>
+    <project.build.outputTimestamp>1700914469</project.build.outputTimestamp>
   </properties>
 
   <build>
-    <resources>
-      <resource>
-        <directory>${project.basedir}/src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-      <resource>
-        <directory>${project.basedir}/src/site</directory>
-        <targetPath>${project.build.directory}/site-src</targetPath>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <executions>
+            <!-- prepare site content by filtering ${project.*} values-->
+            <execution>
+              <id>filter-site</id>
+              <phase>pre-site</phase>
+              <goals>
+                <goal>copy-resources</goal>
+              </goals>
+              <configuration>
+                <outputDirectory>${project.build.directory}/site-src</outputDirectory>
+                <resources>
+                  <resource>
+                    <directory>src/site</directory>
+                    <filtering>true</filtering>
+                  </resource>
+                </resources>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <configuration>
             <locales>en,zh_CN</locales>
-            <!-- Build using files that replace a placeholder using project properties -->
             <siteDirectory>${project.build.directory}/site-src</siteDirectory>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>