Skip to content

Commit c07b2ca

Browse files
authored
Merge pull request #1145 from mybatis/4.0.x.dev
Apply Spring Boot 4.0.x GA
2 parents 6a4bf9e + 60a9419 commit c07b2ca

File tree

28 files changed

+90
-59
lines changed

28 files changed

+90
-59
lines changed

mybatis-spring-boot-autoconfigure/pom.xml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.mybatis.spring.boot</groupId>
2323
<artifactId>mybatis-spring-boot</artifactId>
24-
<version>3.0.6-SNAPSHOT</version>
24+
<version>4.0.0-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>mybatis-spring-boot-autoconfigure</artifactId>
2727
<name>mybatis-spring-boot-autoconfigure</name>
@@ -47,6 +47,10 @@
4747
<groupId>org.springframework.boot</groupId>
4848
<artifactId>spring-boot-autoconfigure</artifactId>
4949
</dependency>
50+
<dependency>
51+
<groupId>org.springframework.boot</groupId>
52+
<artifactId>spring-boot-jdbc</artifactId>
53+
</dependency>
5054

5155
<!-- Optional dependencies -->
5256
<dependency>
@@ -99,24 +103,19 @@
99103
<artifactId>h2</artifactId>
100104
<scope>test</scope>
101105
</dependency>
102-
<dependency>
103-
<groupId>org.springframework.boot</groupId>
104-
<artifactId>spring-boot-starter-jdbc</artifactId>
105-
<scope>test</scope>
106-
</dependency>
107106
<dependency>
108107
<groupId>org.springframework.boot</groupId>
109108
<artifactId>spring-boot-starter-test</artifactId>
110109
<scope>test</scope>
111110
</dependency>
112111
<dependency>
113-
<groupId>org.flywaydb</groupId>
114-
<artifactId>flyway-core</artifactId>
112+
<groupId>org.springframework.boot</groupId>
113+
<artifactId>spring-boot-flyway</artifactId>
115114
<scope>test</scope>
116115
</dependency>
117116
<dependency>
118-
<groupId>org.liquibase</groupId>
119-
<artifactId>liquibase-core</artifactId>
117+
<groupId>org.springframework.boot</groupId>
118+
<artifactId>spring-boot-liquibase</artifactId>
120119
<scope>test</scope>
121120
</dependency>
122121

mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
5555
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
5656
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
57-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
5857
import org.springframework.boot.context.properties.EnableConfigurationProperties;
58+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
5959
import org.springframework.context.EnvironmentAware;
6060
import org.springframework.context.annotation.Bean;
6161
import org.springframework.context.annotation.Import;

mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ public void setDatabaseId(String databaseId) {
673673
}
674674

675675
public void applyTo(Configuration target) {
676-
PropertyMapper mapper = PropertyMapper.get().alwaysApplyingWhenNonNull();
676+
PropertyMapper mapper = PropertyMapper.get();
677677
mapper.from(getSafeRowBoundsEnabled()).to(target::setSafeRowBoundsEnabled);
678678
mapper.from(getSafeResultHandlerEnabled()).to(target::setSafeResultHandlerEnabled);
679679
mapper.from(getMapUnderscoreToCamelCase()).to(target::setMapUnderscoreToCamelCase);

mybatis-spring-boot-autoconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfigurationTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2024 the original author or authors.
2+
* Copyright 2015-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -76,10 +76,10 @@
7676
import org.springframework.beans.factory.config.RuntimeBeanReference;
7777
import org.springframework.boot.autoconfigure.AutoConfigurations;
7878
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
79-
import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
80-
import org.springframework.boot.autoconfigure.flyway.FlywayMigrationInitializer;
81-
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
82-
import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
79+
import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration;
80+
import org.springframework.boot.flyway.autoconfigure.FlywayMigrationInitializer;
81+
import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
82+
import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration;
8383
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
8484
import org.springframework.context.annotation.Bean;
8585
import org.springframework.context.annotation.Configuration;

mybatis-spring-boot-autoconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/MybatisPropertiesTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2024 the original author or authors.
2+
* Copyright 2015-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
3838
import org.junit.jupiter.api.Test;
3939
import org.springframework.beans.PropertyAccessorFactory;
4040
import org.springframework.boot.autoconfigure.AutoConfigurations;
41-
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
41+
import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
4242
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
4343

4444
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.mybatis.spring.boot</groupId>
2323
<artifactId>mybatis-spring-boot-samples</artifactId>
24-
<version>3.0.6-SNAPSHOT</version>
24+
<version>4.0.0-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>mybatis-spring-boot-sample-annotation</artifactId>
2727
<packaging>jar</packaging>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.mybatis.spring.boot</groupId>
2323
<artifactId>mybatis-spring-boot-samples</artifactId>
24-
<version>3.0.6-SNAPSHOT</version>
24+
<version>4.0.0-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>mybatis-spring-boot-sample-freemarker-legacy</artifactId>
2727
<packaging>jar</packaging>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.mybatis.spring.boot</groupId>
2323
<artifactId>mybatis-spring-boot-samples</artifactId>
24-
<version>3.0.6-SNAPSHOT</version>
24+
<version>4.0.0-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>mybatis-spring-boot-sample-freemarker</artifactId>
2727
<packaging>jar</packaging>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.mybatis.spring.boot</groupId>
2323
<artifactId>mybatis-spring-boot-samples</artifactId>
24-
<version>3.0.6-SNAPSHOT</version>
24+
<version>4.0.0-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>mybatis-spring-boot-sample-groovy</artifactId>
2727
<packaging>jar</packaging>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.mybatis.spring.boot</groupId>
2323
<artifactId>mybatis-spring-boot-samples</artifactId>
24-
<version>3.0.6-SNAPSHOT</version>
24+
<version>4.0.0-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>mybatis-spring-boot-sample-kotlin</artifactId>
2727
<packaging>jar</packaging>

0 commit comments

Comments
 (0)