适配 spring-boot 4.0.2

pom.xml

@@ -41,17 +41,17 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <jpa.version>3.1.0</jpa.version>
-        <slf4j.version>2.0.16</slf4j.version>
-        <mybatis.version>3.5.16</mybatis.version>
+        <jpa.version>3.2.0</jpa.version>
+        <slf4j.version>2.0.17</slf4j.version>
+        <mybatis.version>3.5.19</mybatis.version>
         <mybatis-freemarker.version>1.2.4</mybatis-freemarker.version>
         <mybatis-velocity.version>2.1.2</mybatis-velocity.version>
         <mybatis-thymeleaf.version>1.0.4</mybatis-thymeleaf.version>
 
         <!--test-->
         <junit.version>4.13.2</junit.version>
         <hsqldb.version>2.7.3</hsqldb.version>
-        <logback.version>1.5.6</logback.version>
+        <logback.version>1.5.25</logback.version>
     </properties>
 
     <licenses>

spring-boot-starter/mapper-spring-boot-autoconfigure/pom.xml

@@ -40,6 +40,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.mybatis.scripting</groupId>

spring-boot-starter/mapper-spring-boot-autoconfigure/src/main/java/tk/mybatis/mapper/autoconfigure/MapperAutoConfiguration.java

@@ -55,8 +55,8 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.context.annotation.Bean;

spring-boot-starter/mapper-spring-boot-autoconfigure/src/main/java/tk/mybatis/mapper/autoconfigure/MybatisProperties.java

@@ -641,7 +641,7 @@ public void setDatabaseId(String databaseId) {
         }
 
         public void applyTo(Configuration target) {
-            PropertyMapper mapper = PropertyMapper.get().alwaysApplyingWhenNonNull();
+            PropertyMapper mapper = PropertyMapper.get();
             mapper.from(getSafeRowBoundsEnabled()).to(target::setSafeRowBoundsEnabled);
             mapper.from(getSafeResultHandlerEnabled()).to(target::setSafeResultHandlerEnabled);
             mapper.from(getMapUnderscoreToCamelCase()).to(target::setMapUnderscoreToCamelCase);

spring-boot-starter/pom.xml

@@ -45,8 +45,8 @@
     </modules>
 
     <properties>
-        <mybatis-spring.version>3.0.4</mybatis-spring.version>
-        <spring-boot.version>3.3.2</spring-boot.version>
+        <mybatis-spring.version>4.0.0</mybatis-spring.version>
+        <spring-boot.version>4.0.2</spring-boot.version>
     </properties>
 
     <repositories>
@@ -123,6 +123,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-jdbc</artifactId>
+                <version>${spring-boot.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

spring/pom.xml

@@ -37,8 +37,8 @@
     <description>Mybatis 通用 Mapper 和 Spring 集成</description>
 
     <properties>
-        <spring.version>6.1.11</spring.version>
-        <mybatis-spring.version>3.0.4</mybatis-spring.version>
+        <spring.version>7.0.3</spring.version>
+        <mybatis-spring.version>4.0.0</mybatis-spring.version>
     </properties>
 
     <dependencies>