Create spring-boot-h2 module

Author: mhalbritter

settings.gradle

@@ -63,6 +63,7 @@ include "spring-boot-project:spring-boot-flyway"
 include "spring-boot-project:spring-boot-freemarker"
 include "spring-boot-project:spring-boot-groovy-templates"
 include "spring-boot-project:spring-boot-gson"
+include "spring-boot-project:spring-boot-h2"
 include "spring-boot-project:spring-boot-hazelcast"
 include "spring-boot-project:spring-boot-integration"
 include "spring-boot-project:spring-boot-jackson"

spring-boot-project/spring-boot-autoconfigure-all/build.gradle

@@ -48,6 +48,7 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-data-jpa"))
 	optional(project(":spring-boot-project:spring-boot-elasticsearch"))
 	optional(project(":spring-boot-project:spring-boot-flyway"))
+	optional(project(":spring-boot-project:spring-boot-h2"))
 	optional(project(":spring-boot-project:spring-boot-hazelcast"))
 	optional(project(":spring-boot-project:spring-boot-jackson"))
 	optional(project(":spring-boot-project:spring-boot-jdbc"))
@@ -70,7 +71,6 @@ dependencies {
 	optional("com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations")
 	optional("com.fasterxml.jackson.module:jackson-module-parameter-names")
 	optional("com.hazelcast:hazelcast-spring")
-	optional("com.h2database:h2")
 	optional("com.nimbusds:oauth2-oidc-sdk")
 	optional("com.oracle.database.jdbc:ojdbc11")
 	optional("com.oracle.database.jdbc:ucp11")

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/security/servlet/PathRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-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.
@@ -20,12 +20,14 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 
-import org.springframework.boot.autoconfigure.h2.H2ConsoleProperties;
 import org.springframework.boot.autoconfigure.security.StaticResourceLocation;
+import org.springframework.boot.h2.autoconfigure.H2ConsoleProperties;
 import org.springframework.boot.security.servlet.ApplicationContextRequestMatcher;
 import org.springframework.boot.web.context.WebServerApplicationContext;
+import org.springframework.context.ApplicationContext;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;
+import org.springframework.util.Assert;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -63,12 +65,12 @@ public static H2ConsoleRequestMatcher toH2Console() {
 	/**
 	 * The request matcher used to match against h2 console path.
 	 */
-	public static final class H2ConsoleRequestMatcher extends ApplicationContextRequestMatcher<H2ConsoleProperties> {
+	public static final class H2ConsoleRequestMatcher extends ApplicationContextRequestMatcher<ApplicationContext> {
 
 		private volatile RequestMatcher delegate;
 
 		private H2ConsoleRequestMatcher() {
-			super(H2ConsoleProperties.class);
+			super(ApplicationContext.class);
 		}
 
 		@Override
@@ -77,12 +79,15 @@ protected boolean ignoreApplicationContext(WebApplicationContext applicationCont
 		}
 
 		@Override
-		protected void initialized(Supplier<H2ConsoleProperties> h2ConsoleProperties) {
-			this.delegate = new AntPathRequestMatcher(h2ConsoleProperties.get().getPath() + "/**");
+		protected void initialized(Supplier<ApplicationContext> context) {
+			H2ConsoleProperties properties = context.get().getBean(H2ConsoleProperties.class);
+			String path = properties.getPath();
+			Assert.hasText(path, "'path' in H2ConsoleProperties must not be empty");
+			this.delegate = new AntPathRequestMatcher(path + "/**");
 		}
 
 		@Override
-		protected boolean matches(HttpServletRequest request, Supplier<H2ConsoleProperties> context) {
+		protected boolean matches(HttpServletRequest request, Supplier<ApplicationContext> context) {
 			return this.delegate.matches(request);
 		}
 

spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -39,7 +39,6 @@ org.springframework.boot.autoconfigure.graphql.rsocket.RSocketGraphQlClientAutoC
 org.springframework.boot.autoconfigure.graphql.security.GraphQlWebFluxSecurityAutoConfiguration
 org.springframework.boot.autoconfigure.graphql.security.GraphQlWebMvcSecurityAutoConfiguration
 org.springframework.boot.autoconfigure.graphql.servlet.GraphQlWebMvcAutoConfiguration
-org.springframework.boot.autoconfigure.h2.H2ConsoleAutoConfiguration
 org.springframework.boot.autoconfigure.hateoas.HypermediaAutoConfiguration
 org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration
 org.springframework.boot.autoconfigure.http.client.HttpClientAutoConfiguration

spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/security/servlet/PathRequestTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-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.
@@ -20,8 +20,8 @@
 import org.assertj.core.api.AssertDelegateTarget;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.autoconfigure.h2.H2ConsoleProperties;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.boot.h2.autoconfigure.H2ConsoleProperties;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.security.web.util.matcher.RequestMatcher;

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -2040,6 +2040,7 @@ bom {
 				"spring-boot-freemarker",
 				"spring-boot-groovy-templates",
 				"spring-boot-gson",
+				"spring-boot-h2",
 				"spring-boot-hazelcast",
 				"spring-boot-integration",
 				"spring-boot-jackson",

spring-boot-project/spring-boot-docs/build.gradle

@@ -66,6 +66,7 @@ dependencies {
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-flyway", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-freemarker", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-gson", configuration: "autoConfigurationMetadata"))
+	autoConfiguration(project(path: ":spring-boot-project:spring-boot-h2", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-hazelcast", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-integration", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-jackson", configuration: "autoConfigurationMetadata"))
@@ -113,6 +114,7 @@ dependencies {
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-flyway", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-freemarker", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-gson", configuration: "configurationPropertiesMetadata"))
+	configurationProperties(project(path: ":spring-boot-project:spring-boot-h2", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-hazelcast", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-integration", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-jackson", configuration: "configurationPropertiesMetadata"))

spring-boot-project/spring-boot-h2/build.gradle

@@ -0,0 +1,25 @@
+plugins {
+	id "java-library"
+	id "org.springframework.boot.auto-configuration"
+	id "org.springframework.boot.configuration-properties"
+	id "org.springframework.boot.deployed"
+	id "org.springframework.boot.optional-dependencies"
+}
+
+description = "Spring Boot H2"
+
+dependencies {
+	api(project(":spring-boot-project:spring-boot"))
+	api("jakarta.servlet:jakarta.servlet-api")
+	api("com.h2database:h2")
+
+	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
+
+	testImplementation(project(":spring-boot-project:spring-boot-test"))
+	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation(project(":spring-boot-project:spring-boot-jdbc"))
+	testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
+	testImplementation("org.springframework:spring-web")
+
+	testRuntimeOnly("ch.qos.logback:logback-classic")
+}

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java renamed to spring-boot-project/spring-boot-h2/src/main/java/org/springframework/boot/h2/autoconfigure/H2ConsoleAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.h2;
+package org.springframework.boot.h2.autoconfigure;
 
 import java.sql.Connection;
 import java.util.List;
@@ -33,9 +33,8 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
-import org.springframework.boot.autoconfigure.h2.H2ConsoleProperties.Settings;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
+import org.springframework.boot.h2.autoconfigure.H2ConsoleProperties.Settings;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.log.LogMessage;
@@ -47,9 +46,9 @@
  * @author Marten Deinum
  * @author Stephane Nicoll
  * @author Phillip Webb
- * @since 1.3.0
+ * @since 4.0.0
  */
-@AutoConfiguration(after = DataSourceAutoConfiguration.class)
+@AutoConfiguration
 @ConditionalOnWebApplication(type = Type.SERVLET)
 @ConditionalOnClass(JakartaWebServlet.class)
 @ConditionalOnBooleanProperty("spring.h2.console.enabled")

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java renamed to spring-boot-project/spring-boot-h2/src/main/java/org/springframework/boot/h2/autoconfigure/H2ConsoleProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.h2;
+package org.springframework.boot.h2.autoconfigure;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.util.Assert;
@@ -25,7 +25,7 @@
  * @author Andy Wilkinson
  * @author Marten Deinum
  * @author Stephane Nicoll
- * @since 1.3.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("spring.h2.console")
 public class H2ConsoleProperties {