diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index be6ef6d6..13a8c2a2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@ jobs:
         # OSS support versions
         # https://spring.io/projects/spring-boot#support
         # and milestone version of the next release
-        spring-boot-version: [ 3.4.4, 3.5.0-M3 ]
+        spring-boot-version: [ 4.0.0-RC1, 4.0.0-SNAPSHOT ]
 
     steps:
       - uses: actions/checkout@v5
diff --git a/doma-spring-boot-autoconfigure/pom.xml b/doma-spring-boot-autoconfigure/pom.xml
index 63a4bb74..bea3b6a1 100644
--- a/doma-spring-boot-autoconfigure/pom.xml
+++ b/doma-spring-boot-autoconfigure/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.seasar.doma.boot</groupId>
         <artifactId>doma-spring-boot</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -28,13 +28,17 @@
             <version>${doma.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
+            <artifactId>spring-boot-jdbc</artifactId>
         </dependency>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-data-commons</artifactId>
+      </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
@@ -42,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <artifactId>spring-boot-starter-jdbc-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/doma-spring-boot-autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfiguration.java b/doma-spring-boot-autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfiguration.java
index 0b79333b..1c5401ee 100644
--- a/doma-spring-boot-autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfiguration.java
+++ b/doma-spring-boot-autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfiguration.java
@@ -47,10 +47,10 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.jdbc.DatabaseDriver;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
+import org.springframework.boot.jdbc.autoconfigure.JdbcConnectionDetails;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ResourceLoader;
diff --git a/doma-spring-boot-autoconfigure/src/test/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfigurationTest.java b/doma-spring-boot-autoconfigure/src/test/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfigurationTest.java
index 52e0741a..acd0a842 100644
--- a/doma-spring-boot-autoconfigure/src/test/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfigurationTest.java
+++ b/doma-spring-boot-autoconfigure/src/test/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfigurationTest.java
@@ -51,8 +51,8 @@
 import org.seasar.doma.message.Message;
 import org.seasar.doma.slf4j.Slf4jJdbcLogger;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
+import org.springframework.boot.jdbc.autoconfigure.JdbcConnectionDetails;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.context.annotation.Bean;
diff --git a/doma-spring-boot-core/pom.xml b/doma-spring-boot-core/pom.xml
index 7f0ca2fa..c2028cb0 100644
--- a/doma-spring-boot-core/pom.xml
+++ b/doma-spring-boot-core/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.seasar.doma.boot</groupId>
         <artifactId>doma-spring-boot</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/doma-spring-boot-jacoco-aggregate/pom.xml b/doma-spring-boot-jacoco-aggregate/pom.xml
index 1244b673..d5ff1a10 100644
--- a/doma-spring-boot-jacoco-aggregate/pom.xml
+++ b/doma-spring-boot-jacoco-aggregate/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.seasar.doma.boot</groupId>
         <artifactId>doma-spring-boot</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>doma-spring-boot-jacoco-aggregate</artifactId>
diff --git a/doma-spring-boot-samples/doma-spring-boot-sample-docker-compose/pom.xml b/doma-spring-boot-samples/doma-spring-boot-sample-docker-compose/pom.xml
index 957f983d..f4fdc8f7 100644
--- a/doma-spring-boot-samples/doma-spring-boot-sample-docker-compose/pom.xml
+++ b/doma-spring-boot-samples/doma-spring-boot-sample-docker-compose/pom.xml
@@ -12,16 +12,11 @@
     <parent>
         <groupId>org.seasar.doma.boot</groupId>
         <artifactId>doma-spring-boot-samples</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.seasar.doma</groupId>
-            <artifactId>doma-core</artifactId>
-            <version>${doma.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.seasar.doma</groupId>
             <artifactId>doma-processor</artifactId>
@@ -35,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -51,7 +46,7 @@
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/doma-spring-boot-samples/doma-spring-boot-sample-entity-listener/pom.xml b/doma-spring-boot-samples/doma-spring-boot-sample-entity-listener/pom.xml
index 2a244f77..6d369ecc 100644
--- a/doma-spring-boot-samples/doma-spring-boot-sample-entity-listener/pom.xml
+++ b/doma-spring-boot-samples/doma-spring-boot-sample-entity-listener/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.seasar.doma.boot</groupId>
         <artifactId>doma-spring-boot-samples</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -30,11 +30,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -43,12 +39,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/doma-spring-boot-samples/doma-spring-boot-sample-entity-listener/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java b/doma-spring-boot-samples/doma-spring-boot-sample-entity-listener/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java
index df7423d4..09c8a8e0 100644
--- a/doma-spring-boot-samples/doma-spring-boot-sample-entity-listener/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java
+++ b/doma-spring-boot-samples/doma-spring-boot-sample-entity-listener/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java
@@ -6,9 +6,11 @@
 import java.util.List;
 
 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.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
@@ -16,8 +18,10 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
+@AutoConfigureTestRestTemplate
 class ApplicationTest {
-	private final TestRestTemplate restTemplate = new TestRestTemplate();
+	@Autowired
+	private TestRestTemplate restTemplate;
 	private final ParameterizedTypeReference<List<Message>> typedReference = new ParameterizedTypeReference<List<Message>>() {
 	};
 	@LocalServerPort
diff --git a/doma-spring-boot-samples/doma-spring-boot-sample-event-handler/pom.xml b/doma-spring-boot-samples/doma-spring-boot-sample-event-handler/pom.xml
index deedf760..ad4aa912 100644
--- a/doma-spring-boot-samples/doma-spring-boot-sample-event-handler/pom.xml
+++ b/doma-spring-boot-samples/doma-spring-boot-sample-event-handler/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.seasar.doma.boot</groupId>
         <artifactId>doma-spring-boot-samples</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -30,11 +30,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -43,12 +39,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/doma-spring-boot-samples/doma-spring-boot-sample-event-handler/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java b/doma-spring-boot-samples/doma-spring-boot-sample-event-handler/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java
index df7423d4..09c8a8e0 100644
--- a/doma-spring-boot-samples/doma-spring-boot-sample-event-handler/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java
+++ b/doma-spring-boot-samples/doma-spring-boot-sample-event-handler/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java
@@ -6,9 +6,11 @@
 import java.util.List;
 
 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.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
@@ -16,8 +18,10 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
+@AutoConfigureTestRestTemplate
 class ApplicationTest {
-	private final TestRestTemplate restTemplate = new TestRestTemplate();
+	@Autowired
+	private TestRestTemplate restTemplate;
 	private final ParameterizedTypeReference<List<Message>> typedReference = new ParameterizedTypeReference<List<Message>>() {
 	};
 	@LocalServerPort
diff --git a/doma-spring-boot-samples/doma-spring-boot-sample-simple/pom.xml b/doma-spring-boot-samples/doma-spring-boot-sample-simple/pom.xml
index 5b1ad237..24929cc2 100644
--- a/doma-spring-boot-samples/doma-spring-boot-sample-simple/pom.xml
+++ b/doma-spring-boot-samples/doma-spring-boot-sample-simple/pom.xml
@@ -12,16 +12,11 @@
     <parent>
         <groupId>org.seasar.doma.boot</groupId>
         <artifactId>doma-spring-boot-samples</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.seasar.doma</groupId>
-            <artifactId>doma-core</artifactId>
-            <version>${doma.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.seasar.doma</groupId>
             <artifactId>doma-processor</artifactId>
@@ -35,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -44,12 +39,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/doma-spring-boot-samples/doma-spring-boot-sample-simple/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java b/doma-spring-boot-samples/doma-spring-boot-sample-simple/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java
index 39ff69cf..0ba00f0d 100644
--- a/doma-spring-boot-samples/doma-spring-boot-sample-simple/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java
+++ b/doma-spring-boot-samples/doma-spring-boot-sample-simple/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java
@@ -6,9 +6,10 @@
 
 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.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
@@ -16,6 +17,7 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
+@AutoConfigureTestRestTemplate
 class ApplicationTest {
 	@Autowired
 	private TestRestTemplate restTemplate;
diff --git a/doma-spring-boot-samples/doma-spring-boot-sample-testcontainers/pom.xml b/doma-spring-boot-samples/doma-spring-boot-sample-testcontainers/pom.xml
index 430b2505..06b1a756 100644
--- a/doma-spring-boot-samples/doma-spring-boot-sample-testcontainers/pom.xml
+++ b/doma-spring-boot-samples/doma-spring-boot-sample-testcontainers/pom.xml
@@ -12,16 +12,11 @@
     <parent>
         <groupId>org.seasar.doma.boot</groupId>
         <artifactId>doma-spring-boot-samples</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.seasar.doma</groupId>
-            <artifactId>doma-core</artifactId>
-            <version>${doma.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.seasar.doma</groupId>
             <artifactId>doma-processor</artifactId>
@@ -35,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
@@ -44,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -54,7 +49,12 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>postgresql</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers-postgresql</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/doma-spring-boot-samples/doma-spring-boot-sample-testcontainers/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java b/doma-spring-boot-samples/doma-spring-boot-sample-testcontainers/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java
index 895e34e2..f133e56a 100644
--- a/doma-spring-boot-samples/doma-spring-boot-sample-testcontainers/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java
+++ b/doma-spring-boot-samples/doma-spring-boot-sample-testcontainers/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java
@@ -13,7 +13,6 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.web.client.RestClient;
-import org.springframework.web.util.UriComponentsBuilder;
 
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @Import(TestcontainersConfiguration.class)
diff --git a/doma-spring-boot-samples/doma-spring-boot-sample-two-datasource/pom.xml b/doma-spring-boot-samples/doma-spring-boot-sample-two-datasource/pom.xml
index de433c10..0ce27d11 100644
--- a/doma-spring-boot-samples/doma-spring-boot-sample-two-datasource/pom.xml
+++ b/doma-spring-boot-samples/doma-spring-boot-sample-two-datasource/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.seasar.doma.boot</groupId>
 		<artifactId>doma-spring-boot-samples</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/doma-spring-boot-samples/doma-spring-boot-sample-two-datasource/src/main/java/org/seasar/doma/boot/sample/configuration/DataSourceConfiguration.java b/doma-spring-boot-samples/doma-spring-boot-sample-two-datasource/src/main/java/org/seasar/doma/boot/sample/configuration/DataSourceConfiguration.java
index 5eb62501..504328b7 100644
--- a/doma-spring-boot-samples/doma-spring-boot-sample-two-datasource/src/main/java/org/seasar/doma/boot/sample/configuration/DataSourceConfiguration.java
+++ b/doma-spring-boot-samples/doma-spring-boot-sample-two-datasource/src/main/java/org/seasar/doma/boot/sample/configuration/DataSourceConfiguration.java
@@ -3,10 +3,10 @@
 import javax.sql.DataSource;
 
 import org.seasar.doma.boot.sample.annotation.Secondary;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
-import org.springframework.boot.autoconfigure.sql.init.SqlDataSourceScriptDatabaseInitializer;
-import org.springframework.boot.autoconfigure.sql.init.SqlInitializationProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.autoconfigure.ApplicationDataSourceScriptDatabaseInitializer;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties;
+import org.springframework.boot.sql.autoconfigure.init.SqlInitializationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -60,16 +60,17 @@ public SqlInitializationProperties secondarySqlInitializationProperties() {
 
 	@Primary
 	@Bean
-	public SqlDataSourceScriptDatabaseInitializer dataSourceInitializer(DataSource dataSource,
+	public ApplicationDataSourceScriptDatabaseInitializer dataSourceInitializer(
+			DataSource dataSource,
 			SqlInitializationProperties properties) {
-		return new SqlDataSourceScriptDatabaseInitializer(dataSource, properties);
+		return new ApplicationDataSourceScriptDatabaseInitializer(dataSource, properties);
 	}
 
 	@Secondary
 	@Bean
-	public SqlDataSourceScriptDatabaseInitializer secondaryDataSourceInitializer(
+	public ApplicationDataSourceScriptDatabaseInitializer secondaryDataSourceInitializer(
 			@Secondary DataSource dataSource,
 			@Secondary SqlInitializationProperties properties) {
-		return new SqlDataSourceScriptDatabaseInitializer(dataSource, properties);
+		return new ApplicationDataSourceScriptDatabaseInitializer(dataSource, properties);
 	}
 }
diff --git a/doma-spring-boot-samples/doma-spring-boot-sample-unified-criteria/pom.xml b/doma-spring-boot-samples/doma-spring-boot-sample-unified-criteria/pom.xml
index 337b7565..4c600811 100644
--- a/doma-spring-boot-samples/doma-spring-boot-sample-unified-criteria/pom.xml
+++ b/doma-spring-boot-samples/doma-spring-boot-sample-unified-criteria/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.seasar.doma.boot</groupId>
         <artifactId>doma-spring-boot-samples</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -33,7 +33,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/doma-spring-boot-samples/pom.xml b/doma-spring-boot-samples/pom.xml
index aab61485..64eca816 100644
--- a/doma-spring-boot-samples/pom.xml
+++ b/doma-spring-boot-samples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>doma-spring-boot</artifactId>
         <groupId>org.seasar.doma.boot</groupId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
diff --git a/doma-spring-boot-starter/pom.xml b/doma-spring-boot-starter/pom.xml
index 5e5c6bc9..33d36fe1 100644
--- a/doma-spring-boot-starter/pom.xml
+++ b/doma-spring-boot-starter/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.seasar.doma.boot</groupId>
         <artifactId>doma-spring-boot</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/doma-spring-boot-starter/src/main/resources/META-INF/spring.provides b/doma-spring-boot-starter/src/main/resources/META-INF/spring.provides
deleted file mode 100644
index b85c2ae0..00000000
--- a/doma-spring-boot-starter/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1 +0,0 @@
-provides: doma-spring-boot-autoconfigure
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index fd52e991..853a4b1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.seasar.doma.boot</groupId>
     <artifactId>doma-spring-boot</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>doma-spring-boot</name>
@@ -48,7 +48,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <doma.version>3.11.1</doma.version>
-        <spring-boot.version>3.3.10</spring-boot.version>
+        <spring-boot.version>4.0.0-RC1</spring-boot.version>
         <source-plugin.version>3.3.1</source-plugin.version>
         <javadoc-plugin.version>3.12.0</javadoc-plugin.version>
         <nexus-staging-plugin.version>1.7.0</nexus-staging-plugin.version>
@@ -187,6 +187,20 @@
                 </configuration>
             </plugin>
         </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.13.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.4.1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <repositories>