From aeb42d58c09a0e38710f72fff137567b6e5a7321 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sun, 3 Aug 2025 10:15:34 +0900 Subject: [PATCH 1/9] Update version to 4.0.0-SNAPSHOT --- mybatis-spring-boot-autoconfigure/pom.xml | 2 +- .../mybatis-spring-boot-sample-annotation/pom.xml | 2 +- .../mybatis-spring-boot-sample-freemarker-legacy/pom.xml | 2 +- .../mybatis-spring-boot-sample-freemarker/pom.xml | 2 +- .../mybatis-spring-boot-sample-groovy/pom.xml | 2 +- .../mybatis-spring-boot-sample-kotlin/pom.xml | 2 +- .../mybatis-spring-boot-sample-thymeleaf/pom.xml | 2 +- .../mybatis-spring-boot-sample-velocity-legacy/pom.xml | 2 +- .../mybatis-spring-boot-sample-velocity/pom.xml | 2 +- .../mybatis-spring-boot-sample-war/pom.xml | 2 +- .../mybatis-spring-boot-sample-web/pom.xml | 2 +- .../mybatis-spring-boot-sample-xml/pom.xml | 2 +- mybatis-spring-boot-samples/pom.xml | 2 +- mybatis-spring-boot-starter-test/pom.xml | 2 +- mybatis-spring-boot-starter/pom.xml | 2 +- mybatis-spring-boot-test-autoconfigure/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mybatis-spring-boot-autoconfigure/pom.xml b/mybatis-spring-boot-autoconfigure/pom.xml index b12e90177..c146327ea 100644 --- a/mybatis-spring-boot-autoconfigure/pom.xml +++ b/mybatis-spring-boot-autoconfigure/pom.xml @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-autoconfigure mybatis-spring-boot-autoconfigure 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 eab421f23..3a1ae6e33 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 @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot-samples - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-sample-annotation jar 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 0f22a04de..92f3f970f 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 @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot-samples - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-sample-freemarker-legacy jar 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 6948eb349..73d49b9e0 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 @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot-samples - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-sample-freemarker jar 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 405b75629..3091d032c 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 @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot-samples - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-sample-groovy jar 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 7e8fb6fc7..418091f20 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 @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot-samples - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-sample-kotlin jar 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 82b2711ad..e4b5db76f 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 @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot-samples - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-sample-thymeleaf jar 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 18426bb85..06824449c 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 @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot-samples - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-sample-velocity-legacy jar 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 6cc32a93b..6d0949810 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 @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot-samples - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-sample-velocity jar 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 f8a748855..f1266c5f4 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 @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot-samples - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-sample-war war 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 7ccf1a502..63d88488f 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 @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot-samples - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-sample-web jar 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 aae93dc68..b6d283eae 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 @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot-samples - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-sample-xml jar diff --git a/mybatis-spring-boot-samples/pom.xml b/mybatis-spring-boot-samples/pom.xml index 9c1ac7dfd..00ff8f696 100644 --- a/mybatis-spring-boot-samples/pom.xml +++ b/mybatis-spring-boot-samples/pom.xml @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-samples pom diff --git a/mybatis-spring-boot-starter-test/pom.xml b/mybatis-spring-boot-starter-test/pom.xml index dfb0b05cb..606db9431 100644 --- a/mybatis-spring-boot-starter-test/pom.xml +++ b/mybatis-spring-boot-starter-test/pom.xml @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-starter-test mybatis-spring-boot-starter-test diff --git a/mybatis-spring-boot-starter/pom.xml b/mybatis-spring-boot-starter/pom.xml index 1f177ff54..7549a5f4b 100644 --- a/mybatis-spring-boot-starter/pom.xml +++ b/mybatis-spring-boot-starter/pom.xml @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-starter mybatis-spring-boot-starter diff --git a/mybatis-spring-boot-test-autoconfigure/pom.xml b/mybatis-spring-boot-test-autoconfigure/pom.xml index f706194df..310c8794a 100644 --- a/mybatis-spring-boot-test-autoconfigure/pom.xml +++ b/mybatis-spring-boot-test-autoconfigure/pom.xml @@ -21,7 +21,7 @@ org.mybatis.spring.boot mybatis-spring-boot - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT mybatis-spring-boot-test-autoconfigure mybatis-spring-boot-test-autoconfigure diff --git a/pom.xml b/pom.xml index 9937d5c30..fff2fa900 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.mybatis.spring.boot mybatis-spring-boot - 3.0.6-SNAPSHOT + 4.0.0-SNAPSHOT pom mybatis-spring-boot From fb70f129f53127ad6da5081ad6d62254b6ce7250 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sun, 3 Aug 2025 15:43:29 +0900 Subject: [PATCH 2/9] Apply Spring Boot 4.0.0-SNAPSHOT --- mybatis-spring-boot-autoconfigure/pom.xml | 17 ++++++++--------- .../autoconfigure/MybatisAutoConfiguration.java | 2 +- .../MybatisAutoConfigurationTest.java | 10 +++++----- .../autoconfigure/MybatisPropertiesTest.java | 4 ++-- .../mybatis/kotlin/SampleKotlinApplication.kt | 4 ++-- .../mybatis-spring-boot-sample-war/pom.xml | 5 +++++ .../war/SampleMybatisApplicationTest.java | 4 ++-- .../mybatis-spring-boot-sample-web/pom.xml | 5 +++++ .../web/SampleMybatisApplicationTest.java | 4 ++-- ...ampleMybatisWithMockBeanApplicationTest.java | 8 ++++---- mybatis-spring-boot-test-autoconfigure/pom.xml | 5 +++++ ...t.autoconfigure.AutoConfigureMybatis.imports | 16 +++++++++------- pom.xml | 2 +- 13 files changed, 51 insertions(+), 35 deletions(-) diff --git a/mybatis-spring-boot-autoconfigure/pom.xml b/mybatis-spring-boot-autoconfigure/pom.xml index c146327ea..9df570a85 100644 --- a/mybatis-spring-boot-autoconfigure/pom.xml +++ b/mybatis-spring-boot-autoconfigure/pom.xml @@ -47,6 +47,10 @@ org.springframework.boot spring-boot-autoconfigure + + org.springframework.boot + spring-boot-jdbc + @@ -99,24 +103,19 @@ h2 test - - org.springframework.boot - spring-boot-starter-jdbc - test - org.springframework.boot spring-boot-starter-test test - org.flywaydb - flyway-core + org.springframework.boot + spring-boot-starter-flyway test - org.liquibase - liquibase-core + org.springframework.boot + spring-boot-starter-liquibase test diff --git a/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfiguration.java b/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfiguration.java index 5da820faa..21c8410ef 100644 --- a/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfiguration.java +++ b/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfiguration.java @@ -54,8 +54,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; 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.annotation.Bean; import org.springframework.context.annotation.Import; diff --git a/mybatis-spring-boot-autoconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfigurationTest.java b/mybatis-spring-boot-autoconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfigurationTest.java index 77a8e413d..c80405994 100644 --- a/mybatis-spring-boot-autoconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfigurationTest.java +++ b/mybatis-spring-boot-autoconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfigurationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2024 the original author or authors. + * Copyright 2015-2025 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. @@ -76,10 +76,10 @@ import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration; -import org.springframework.boot.autoconfigure.flyway.FlywayMigrationInitializer; -import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; -import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration; +import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration; +import org.springframework.boot.flyway.autoconfigure.FlywayMigrationInitializer; +import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration; +import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/mybatis-spring-boot-autoconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/MybatisPropertiesTest.java b/mybatis-spring-boot-autoconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/MybatisPropertiesTest.java index 4edcc951c..1f11821ae 100644 --- a/mybatis-spring-boot-autoconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/MybatisPropertiesTest.java +++ b/mybatis-spring-boot-autoconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/MybatisPropertiesTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2024 the original author or authors. + * Copyright 2015-2025 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. @@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.PropertyAccessorFactory; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; +import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; /** diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/SampleKotlinApplication.kt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/SampleKotlinApplication.kt index c6327efe4..b0dd58ada 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/SampleKotlinApplication.kt +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/SampleKotlinApplication.kt @@ -1,5 +1,5 @@ /* - * Copyright 2015-2023 the original author or authors. + * Copyright 2015-2025 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. @@ -25,7 +25,7 @@ import sample.mybatis.kotlin.mapper.CityMapper class SampleKotlinApplication (private val cityMapper: CityMapper) : CommandLineRunner { @Transactional - override fun run(vararg args: String?) { + override fun run(vararg args: String) { println(this.cityMapper.findByState("CA")) } 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 f1266c5f4..e5e14f5b0 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 @@ -68,6 +68,11 @@ runtime + + org.springframework.boot + spring-boot-starter-restclient + test + org.springframework.boot spring-boot-starter-test diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/SampleMybatisApplicationTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/SampleMybatisApplicationTest.java index 18f6f7808..c8498ffbf 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/SampleMybatisApplicationTest.java +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/SampleMybatisApplicationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2025 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. @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.web.server.test.client.TestRestTemplate; /** * @author Kazuki Shimizu 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 63d88488f..b67654f31 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 @@ -44,6 +44,11 @@ runtime + + org.springframework.boot + spring-boot-starter-restclient + test + org.springframework.boot spring-boot-starter-test diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/SampleMybatisApplicationTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/SampleMybatisApplicationTest.java index 4a0886e16..80428999b 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/SampleMybatisApplicationTest.java +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/SampleMybatisApplicationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2025 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. @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.web.server.test.client.TestRestTemplate; /** * @author Kazuki Shimizu 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 index ebc116940..220a7e8a6 100644 --- 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 @@ -1,5 +1,5 @@ /* - * Copyright 2015-2023 the original author or authors. + * Copyright 2015-2025 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,8 +24,8 @@ 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 org.springframework.boot.web.server.test.client.TestRestTemplate; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import sample.mybatis.web.domain.City; import sample.mybatis.web.mapper.CityMapper; @@ -39,7 +39,7 @@ class SampleMybatisWithMockBeanApplicationTest { @Autowired private TestRestTemplate restTemplate; - @MockBean + @MockitoBean CityMapper cityMapper; @BeforeEach diff --git a/mybatis-spring-boot-test-autoconfigure/pom.xml b/mybatis-spring-boot-test-autoconfigure/pom.xml index 310c8794a..77b2b1815 100644 --- a/mybatis-spring-boot-test-autoconfigure/pom.xml +++ b/mybatis-spring-boot-test-autoconfigure/pom.xml @@ -69,5 +69,10 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-starter-cache + test + diff --git a/mybatis-spring-boot-test-autoconfigure/src/main/resources/META-INF/spring/org.mybatis.spring.boot.test.autoconfigure.AutoConfigureMybatis.imports b/mybatis-spring-boot-test-autoconfigure/src/main/resources/META-INF/spring/org.mybatis.spring.boot.test.autoconfigure.AutoConfigureMybatis.imports index ee48bc0c5..441b43058 100644 --- a/mybatis-spring-boot-test-autoconfigure/src/main/resources/META-INF/spring/org.mybatis.spring.boot.test.autoconfigure.AutoConfigureMybatis.imports +++ b/mybatis-spring-boot-test-autoconfigure/src/main/resources/META-INF/spring/org.mybatis.spring.boot.test.autoconfigure.AutoConfigureMybatis.imports @@ -1,10 +1,12 @@ # AutoConfigureMybatis auto-configuration imports -org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration -org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration -org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration -org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration -org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration -org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration -org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration +org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration +org.springframework.boot.jdbc.autoconfigure.DataSourceInitializationAutoConfiguration +org.springframework.boot.jdbc.autoconfigure.DataSourceTransactionManagerAutoConfiguration +org.springframework.boot.jdbc.autoconfigure.JdbcClientAutoConfiguration +org.springframework.boot.jdbc.autoconfigure.JdbcTemplateAutoConfiguration +org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration org.mybatis.spring.boot.autoconfigure.MybatisLanguageDriverAutoConfiguration org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration +optional:org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration +optional:org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration +optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration diff --git a/pom.xml b/pom.xml index fff2fa900..0d1796ca7 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ 1.3.1 2.3.0 1.1.0 - 3.5.8 + 4.0.0-SNAPSHOT --add-opens java.base/java.lang=ALL-UNNAMED -Dfile.encoding=UTF-8 From c81b590274b47757e6baa639612cafa8ad0c3a0b Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sun, 3 Aug 2025 16:00:14 +0900 Subject: [PATCH 3/9] Add -Denforcer.skip=true on GitHub Action's workflow --- .github/workflows/ci.yaml | 2 +- .github/workflows/coveralls.yaml | 4 ++-- .github/workflows/support.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5ca528739..d1506bd02 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,4 +26,4 @@ jobs: distribution: ${{ matrix.distribution }} cache: ${{ matrix.cache }} - name: Test with Maven - run: ./mvnw test -B -V --no-transfer-progress -D"license.skip=true" + run: ./mvnw test -B -V --no-transfer-progress -D"license.skip=true" -D"enforcer.skip=true" diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index de596cfd9..0323c40e0 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -18,12 +18,12 @@ jobs: java-version: 21 - name: Report Coverage to Coveralls for Pull Requests if: github.event_name == 'pull_request' - run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --no-transfer-progress + 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 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PR_NUMBER: ${{ github.event.number }} - name: Report Coverage to Coveralls for General Push if: github.event_name == 'push' - run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github --no-transfer-progress + run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -Denforcer.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github --no-transfer-progress env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/support.yaml b/.github/workflows/support.yaml index e016d2eb5..2f03f809a 100644 --- a/.github/workflows/support.yaml +++ b/.github/workflows/support.yaml @@ -41,5 +41,5 @@ jobs: distribution: ${{ matrix.distribution }} - name: Test with Spring Boot Latest run: | - ./mvnw package + ./mvnw package -D"enforcer.skip=true" ./mybatis-spring-boot-samples/run_fatjars.sh From 2437175784f0d967361aeed5804d8f391d091386 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sun, 3 Aug 2025 16:55:17 +0900 Subject: [PATCH 4/9] Support to publish Spring Boot MyBatis 4.0.0-SNAPSHOT --- .github/workflows/sonatype-for-v4.yaml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/sonatype-for-v4.yaml diff --git a/.github/workflows/sonatype-for-v4.yaml b/.github/workflows/sonatype-for-v4.yaml new file mode 100644 index 000000000..976b573d3 --- /dev/null +++ b/.github/workflows/sonatype-for-v4.yaml @@ -0,0 +1,26 @@ +name: Sonatype for 4.x snapshot + +on: + push: + branches: + - 4.0.x.dev + +permissions: read-all + +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@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + cache: maven + distribution: temurin + java-version: 21 + - name: Deploy to Sonatype + run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true -Denforcer.skip=true + env: + CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} + CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} From c6a2ba8bce1cd591c7ebe44372903ab19ea5d183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=99=93=E4=BC=9F?= Date: Fri, 21 Nov 2025 08:14:20 +0800 Subject: [PATCH 5/9] :arrow_up: spring-boot upgrade from 4.0.0-SNAPSHOT to 4.0.0 --- .../spring/boot/autoconfigure/MybatisProperties.java | 2 +- .../mybatis-spring-boot-sample-war/pom.xml | 5 +++++ .../sample/mybatis/war/SampleMybatisApplicationTest.java | 4 +++- .../mybatis-spring-boot-sample-web/pom.xml | 5 +++++ .../sample/mybatis/web/SampleMybatisApplicationTest.java | 4 +++- .../web/SampleMybatisWithMockBeanApplicationTest.java | 4 +++- mybatis-spring-boot-test-autoconfigure/pom.xml | 8 ++++++++ .../spring/boot/test/autoconfigure/MybatisTest.java | 8 ++++---- .../boot/test/autoconfigure/MybatisTypeExcludeFilter.java | 4 ++-- pom.xml | 2 +- 10 files changed, 35 insertions(+), 11 deletions(-) diff --git a/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisProperties.java b/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisProperties.java index da6c41152..4772e6de5 100644 --- a/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisProperties.java +++ b/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisProperties.java @@ -673,7 +673,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); 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 e5e14f5b0..05bb75100 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 @@ -78,6 +78,11 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-resttestclient + test + org.mybatis.spring.boot mybatis-spring-boot-starter-test diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/SampleMybatisApplicationTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/SampleMybatisApplicationTest.java index c8498ffbf..339bff507 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/SampleMybatisApplicationTest.java +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/SampleMybatisApplicationTest.java @@ -21,12 +21,14 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.client.TestRestTemplate; /** * @author Kazuki Shimizu */ +@AutoConfigureTestRestTemplate @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) class SampleMybatisApplicationTest { 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 b67654f31..db06d9b75 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 @@ -49,6 +49,11 @@ spring-boot-starter-restclient test + + org.springframework.boot + spring-boot-resttestclient + test + org.springframework.boot spring-boot-starter-test diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/SampleMybatisApplicationTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/SampleMybatisApplicationTest.java index 80428999b..48341cd51 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/SampleMybatisApplicationTest.java +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/SampleMybatisApplicationTest.java @@ -21,12 +21,14 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.client.TestRestTemplate; /** * @author Kazuki Shimizu */ +@AutoConfigureTestRestTemplate @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) class SampleMybatisApplicationTest { 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 index 220a7e8a6..ac07b71f3 100644 --- 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 @@ -23,8 +23,9 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.client.TestRestTemplate; import org.springframework.test.context.bean.override.mockito.MockitoBean; import sample.mybatis.web.domain.City; @@ -33,6 +34,7 @@ /** * @author Kazuki Shimizu */ +@AutoConfigureTestRestTemplate @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) class SampleMybatisWithMockBeanApplicationTest { diff --git a/mybatis-spring-boot-test-autoconfigure/pom.xml b/mybatis-spring-boot-test-autoconfigure/pom.xml index 77b2b1815..5dc55c65d 100644 --- a/mybatis-spring-boot-test-autoconfigure/pom.xml +++ b/mybatis-spring-boot-test-autoconfigure/pom.xml @@ -37,6 +37,14 @@ org.springframework.boot spring-boot-test-autoconfigure + + org.springframework.boot + spring-boot-jdbc-test + + + org.springframework.boot + spring-boot-cache-test + org.springframework.boot spring-boot-test diff --git a/mybatis-spring-boot-test-autoconfigure/src/main/java/org/mybatis/spring/boot/test/autoconfigure/MybatisTest.java b/mybatis-spring-boot-test-autoconfigure/src/main/java/org/mybatis/spring/boot/test/autoconfigure/MybatisTest.java index d5cdfc360..2662f1f27 100644 --- a/mybatis-spring-boot-test-autoconfigure/src/main/java/org/mybatis/spring/boot/test/autoconfigure/MybatisTest.java +++ b/mybatis-spring-boot-test-autoconfigure/src/main/java/org/mybatis/spring/boot/test/autoconfigure/MybatisTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2025 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. @@ -25,11 +25,11 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.cache.test.autoconfigure.AutoConfigureCache; +import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; -import org.springframework.boot.test.autoconfigure.core.AutoConfigureCache; -import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.filter.annotation.TypeExcludeFilters; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.core.annotation.AliasFor; import org.springframework.core.env.Environment; diff --git a/mybatis-spring-boot-test-autoconfigure/src/main/java/org/mybatis/spring/boot/test/autoconfigure/MybatisTypeExcludeFilter.java b/mybatis-spring-boot-test-autoconfigure/src/main/java/org/mybatis/spring/boot/test/autoconfigure/MybatisTypeExcludeFilter.java index 5a7ee9bca..8d9792474 100644 --- a/mybatis-spring-boot-test-autoconfigure/src/main/java/org/mybatis/spring/boot/test/autoconfigure/MybatisTypeExcludeFilter.java +++ b/mybatis-spring-boot-test-autoconfigure/src/main/java/org/mybatis/spring/boot/test/autoconfigure/MybatisTypeExcludeFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2025 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,7 +19,7 @@ import java.util.Set; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.test.autoconfigure.filter.AnnotationCustomizableTypeExcludeFilter; +import org.springframework.boot.test.context.filter.annotation.AnnotationCustomizableTypeExcludeFilter; import org.springframework.context.annotation.ComponentScan; import org.springframework.core.annotation.AnnotatedElementUtils; diff --git a/pom.xml b/pom.xml index 0d1796ca7..c40968783 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ 1.3.1 2.3.0 1.1.0 - 4.0.0-SNAPSHOT + 4.0.0 --add-opens java.base/java.lang=ALL-UNNAMED -Dfile.encoding=UTF-8 From 0f0f6bef6537e9a1aee4a6cbab1940759dabbd02 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Fri, 28 Nov 2025 08:40:17 +0900 Subject: [PATCH 6/9] Drop workflow for publishing 4.0.0-SNAPSHOT See gh-1106 --- .github/workflows/sonatype-for-v4.yaml | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 .github/workflows/sonatype-for-v4.yaml diff --git a/.github/workflows/sonatype-for-v4.yaml b/.github/workflows/sonatype-for-v4.yaml deleted file mode 100644 index 976b573d3..000000000 --- a/.github/workflows/sonatype-for-v4.yaml +++ /dev/null @@ -1,26 +0,0 @@ -name: Sonatype for 4.x snapshot - -on: - push: - branches: - - 4.0.x.dev - -permissions: read-all - -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@v4 - - name: Set up JDK - uses: actions/setup-java@v4 - with: - cache: maven - distribution: temurin - java-version: 21 - - name: Deploy to Sonatype - run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true -Denforcer.skip=true - env: - CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} - CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} From 1b266c61f17bbd85448f249ab5b3e968313028b9 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Fri, 28 Nov 2025 08:42:23 +0900 Subject: [PATCH 7/9] Drop enforcer.skip=true on workflow See gh-1106 --- .github/workflows/ci.yaml | 2 +- .github/workflows/coveralls.yaml | 4 ++-- .github/workflows/support.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d1506bd02..5ca528739 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,4 +26,4 @@ jobs: distribution: ${{ matrix.distribution }} cache: ${{ matrix.cache }} - name: Test with Maven - run: ./mvnw test -B -V --no-transfer-progress -D"license.skip=true" -D"enforcer.skip=true" + run: ./mvnw test -B -V --no-transfer-progress -D"license.skip=true" diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index 0323c40e0..de596cfd9 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -18,12 +18,12 @@ jobs: java-version: 21 - name: Report Coverage to Coveralls for Pull Requests if: github.event_name == 'pull_request' - 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 + run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --no-transfer-progress env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PR_NUMBER: ${{ github.event.number }} - name: Report Coverage to Coveralls for General Push if: github.event_name == 'push' - run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -Denforcer.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github --no-transfer-progress + run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github --no-transfer-progress env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/support.yaml b/.github/workflows/support.yaml index 2f03f809a..e016d2eb5 100644 --- a/.github/workflows/support.yaml +++ b/.github/workflows/support.yaml @@ -41,5 +41,5 @@ jobs: distribution: ${{ matrix.distribution }} - name: Test with Spring Boot Latest run: | - ./mvnw package -D"enforcer.skip=true" + ./mvnw package ./mybatis-spring-boot-samples/run_fatjars.sh From 770e08ce03709ba564f77184e1fae8e62f9641d5 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Fri, 28 Nov 2025 11:40:49 +0900 Subject: [PATCH 8/9] Added bnd.skip=true in sample application because mistake merging --- .../mybatis-spring-boot-sample-war/pom.xml | 1 + 1 file changed, 1 insertion(+) 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 05bb75100..58592ebb9 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 @@ -29,6 +29,7 @@ 11 11.0.14 + true org.mybatis.spring.boot.sample.war From 60a9419b1e6224c7c48093b79039e0489e48b9eb Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sat, 29 Nov 2025 20:39:36 +0900 Subject: [PATCH 9/9] Refine dependency settings for Spring Boot 4.x See gh-1145 --- mybatis-spring-boot-autoconfigure/pom.xml | 4 ++-- .../mybatis-spring-boot-sample-war/pom.xml | 5 ----- .../mybatis-spring-boot-sample-web/pom.xml | 5 ----- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/mybatis-spring-boot-autoconfigure/pom.xml b/mybatis-spring-boot-autoconfigure/pom.xml index 9df570a85..f2bda7eaf 100644 --- a/mybatis-spring-boot-autoconfigure/pom.xml +++ b/mybatis-spring-boot-autoconfigure/pom.xml @@ -110,12 +110,12 @@ org.springframework.boot - spring-boot-starter-flyway + spring-boot-flyway test org.springframework.boot - spring-boot-starter-liquibase + spring-boot-liquibase test 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 58592ebb9..aa9122ef8 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 @@ -69,11 +69,6 @@ runtime - - org.springframework.boot - spring-boot-starter-restclient - test - org.springframework.boot spring-boot-starter-test 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 db06d9b75..a01a04fb0 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 @@ -44,11 +44,6 @@ runtime - - org.springframework.boot - spring-boot-starter-restclient - test - org.springframework.boot spring-boot-resttestclient