Skip to content

Commit 9698adf

Browse files
kazuki43zookazuki43zoo
authored
Merge pull request #1104 from kazuki43zoo/apply-spring-boot-4.0.0-snapshot
Apply Spring Boot 4.0.0-SNAPSHOT
2 parents a64af05 + 2cd0562 commit 9698adf

File tree

16 files changed

+56
-39
lines changed

16 files changed

+56
-39
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ jobs:
2626
distribution: ${{ matrix.distribution }}
2727
cache: ${{ matrix.cache }}
2828
- name: Test with Maven
29-
run: ./mvnw test -B -V --no-transfer-progress -D"license.skip=true"
29+
run: ./mvnw test -B -V --no-transfer-progress -D"license.skip=true" -D"enforcer.skip=true"

‎.github/workflows/coveralls.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
java-version: 21
1919
- name: Report Coverage to Coveralls for Pull Requests
2020
if: github.event_name == 'pull_request'
21-
run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --no-transfer-progress
21+
run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -Denforcer.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --no-transfer-progress
2222
env:
2323
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2424
PR_NUMBER: ${{ github.event.number }}
2525
- name: Report Coverage to Coveralls for General Push
2626
if: github.event_name == 'push'
27-
run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github --no-transfer-progress
27+
run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -Denforcer.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github --no-transfer-progress
2828
env:
2929
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/support.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ jobs:
4141
distribution: ${{ matrix.distribution }}
4242
- name: Test with Spring Boot Latest
4343
run: |
44-
./mvnw package
44+
./mvnw package -D"enforcer.skip=true"
4545
./mybatis-spring-boot-samples/run_fatjars.sh

‎mybatis-spring-boot-autoconfigure/pom.xml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -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-starter-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-starter-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/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-kotlin/src/main/kotlin/sample/mybatis/kotlin/SampleKotlinApplication.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2023 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.
@@ -25,7 +25,7 @@ import sample.mybatis.kotlin.mapper.CityMapper
2525
class SampleKotlinApplication (private val cityMapper: CityMapper) : CommandLineRunner {
2626

2727
@Transactional
28-
override fun run(vararg args: String?) {
28+
override fun run(vararg args: String) {
2929
println(this.cityMapper.findByState("CA"))
3030
}
3131

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<properties>
3030
<tomcat.major.version>11</tomcat.major.version>
3131
<tomcat.version>11.0.9</tomcat.version>
32+
<bnd.skip>true</bnd.skip>
3233

3334
<module.name>org.mybatis.spring.boot.sample.war</module.name>
3435
</properties>
@@ -68,6 +69,11 @@
6869
<scope>runtime</scope>
6970
</dependency>
7071
<!-- test dependencies -->
72+
<dependency>
73+
<groupId>org.springframework.boot</groupId>
74+
<artifactId>spring-boot-starter-restclient</artifactId>
75+
<scope>test</scope>
76+
</dependency>
7177
<dependency>
7278
<groupId>org.springframework.boot</groupId>
7379
<artifactId>spring-boot-starter-test</artifactId>

‎mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/SampleMybatisApplicationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2022 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.
@@ -22,7 +22,7 @@
2222
import org.junit.jupiter.api.Test;
2323
import org.springframework.beans.factory.annotation.Autowired;
2424
import org.springframework.boot.test.context.SpringBootTest;
25-
import org.springframework.boot.test.web.client.TestRestTemplate;
25+
import org.springframework.boot.web.server.test.client.TestRestTemplate;
2626

2727
/**
2828
* @author Kazuki Shimizu

0 commit comments

Comments
 (0)