Skip to content

Commit 1a0a628

Browse files
committed
fixup! Create spring-boot-h2 module
1 parent 56bf65a commit 1a0a628

File tree

14 files changed

+14
-14
lines changed

14 files changed

+14
-14
lines changed

Diff for: settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ include "spring-boot-project:spring-boot-flyway"
6767
include "spring-boot-project:spring-boot-freemarker"
6868
include "spring-boot-project:spring-boot-groovy-templates"
6969
include "spring-boot-project:spring-boot-gson"
70-
include "spring-boot-project:spring-boot-h2"
70+
include "spring-boot-project:spring-boot-h2console"
7171
include "spring-boot-project:spring-boot-hateoas"
7272
include "spring-boot-project:spring-boot-hazelcast"
7373
include "spring-boot-project:spring-boot-http"

Diff for: spring-boot-project/spring-boot-autoconfigure-all/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencies {
4444
optional(project(":spring-boot-project:spring-boot-data-jpa"))
4545
optional(project(":spring-boot-project:spring-boot-data-mongodb"))
4646
optional(project(":spring-boot-project:spring-boot-flyway"))
47-
optional(project(":spring-boot-project:spring-boot-h2"))
47+
optional(project(":spring-boot-project:spring-boot-h2console"))
4848
optional(project(":spring-boot-project:spring-boot-hazelcast"))
4949
optional(project(":spring-boot-project:spring-boot-http"))
5050
optional(project(":spring-boot-project:spring-boot-jackson"))

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import jakarta.servlet.http.HttpServletRequest;
2222

2323
import org.springframework.boot.autoconfigure.security.StaticResourceLocation;
24-
import org.springframework.boot.h2.autoconfigure.H2ConsoleProperties;
24+
import org.springframework.boot.h2console.autoconfigure.H2ConsoleProperties;
2525
import org.springframework.boot.security.servlet.ApplicationContextRequestMatcher;
2626
import org.springframework.boot.web.context.WebServerApplicationContext;
2727
import org.springframework.context.ApplicationContext;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.junit.jupiter.api.Test;
2222

2323
import org.springframework.boot.autoconfigure.web.ServerProperties;
24-
import org.springframework.boot.h2.autoconfigure.H2ConsoleProperties;
24+
import org.springframework.boot.h2console.autoconfigure.H2ConsoleProperties;
2525
import org.springframework.mock.web.MockHttpServletRequest;
2626
import org.springframework.mock.web.MockServletContext;
2727
import org.springframework.security.web.util.matcher.RequestMatcher;

Diff for: spring-boot-project/spring-boot-dependencies/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2010,7 +2010,7 @@ bom {
20102010
"spring-boot-freemarker",
20112011
"spring-boot-groovy-templates",
20122012
"spring-boot-gson",
2013-
"spring-boot-h2",
2013+
"spring-boot-h2console",
20142014
"spring-boot-hateoas",
20152015
"spring-boot-hazelcast",
20162016
"spring-boot-http",

Diff for: spring-boot-project/spring-boot-docs/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ dependencies {
7373
autoConfiguration(project(path: ":spring-boot-project:spring-boot-flyway", configuration: "autoConfigurationMetadata"))
7474
autoConfiguration(project(path: ":spring-boot-project:spring-boot-freemarker", configuration: "autoConfigurationMetadata"))
7575
autoConfiguration(project(path: ":spring-boot-project:spring-boot-gson", configuration: "autoConfigurationMetadata"))
76-
autoConfiguration(project(path: ":spring-boot-project:spring-boot-h2", configuration: "autoConfigurationMetadata"))
76+
autoConfiguration(project(path: ":spring-boot-project:spring-boot-h2console", configuration: "autoConfigurationMetadata"))
7777
autoConfiguration(project(path: ":spring-boot-project:spring-boot-hateoas", configuration: "autoConfigurationMetadata"))
7878
autoConfiguration(project(path: ":spring-boot-project:spring-boot-hazelcast", configuration: "autoConfigurationMetadata"))
7979
autoConfiguration(project(path: ":spring-boot-project:spring-boot-http", configuration: "autoConfigurationMetadata"))
@@ -130,7 +130,7 @@ dependencies {
130130
configurationProperties(project(path: ":spring-boot-project:spring-boot-flyway", configuration: "configurationPropertiesMetadata"))
131131
configurationProperties(project(path: ":spring-boot-project:spring-boot-freemarker", configuration: "configurationPropertiesMetadata"))
132132
configurationProperties(project(path: ":spring-boot-project:spring-boot-gson", configuration: "configurationPropertiesMetadata"))
133-
configurationProperties(project(path: ":spring-boot-project:spring-boot-h2", configuration: "configurationPropertiesMetadata"))
133+
configurationProperties(project(path: ":spring-boot-project:spring-boot-h2console", configuration: "configurationPropertiesMetadata"))
134134
configurationProperties(project(path: ":spring-boot-project:spring-boot-hateoas", configuration: "configurationPropertiesMetadata"))
135135
configurationProperties(project(path: ":spring-boot-project:spring-boot-hazelcast", configuration: "configurationPropertiesMetadata"))
136136
configurationProperties(project(path: ":spring-boot-project:spring-boot-http", configuration: "configurationPropertiesMetadata"))

Diff for: spring-boot-project/spring-boot-h2/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

-1
This file was deleted.

Diff for: spring-boot-project/spring-boot-h2/src/main/java/org/springframework/boot/h2/autoconfigure/H2ConsoleAutoConfiguration.java renamed to spring-boot-project/spring-boot-h2console/src/main/java/org/springframework/boot/h2console/autoconfigure/H2ConsoleAutoConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.h2.autoconfigure;
17+
package org.springframework.boot.h2console.autoconfigure;
1818

1919
import java.sql.Connection;
2020
import java.util.List;
@@ -34,7 +34,7 @@
3434
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
3535
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
3636
import org.springframework.boot.context.properties.EnableConfigurationProperties;
37-
import org.springframework.boot.h2.autoconfigure.H2ConsoleProperties.Settings;
37+
import org.springframework.boot.h2console.autoconfigure.H2ConsoleProperties.Settings;
3838
import org.springframework.boot.web.servlet.ServletRegistrationBean;
3939
import org.springframework.context.annotation.Bean;
4040
import org.springframework.core.log.LogMessage;

Diff for: spring-boot-project/spring-boot-h2/src/main/java/org/springframework/boot/h2/autoconfigure/H2ConsoleProperties.java renamed to spring-boot-project/spring-boot-h2console/src/main/java/org/springframework/boot/h2console/autoconfigure/H2ConsoleProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.h2.autoconfigure;
17+
package org.springframework.boot.h2console.autoconfigure;
1818

1919
import org.springframework.boot.context.properties.ConfigurationProperties;
2020
import org.springframework.util.Assert;

Diff for: spring-boot-project/spring-boot-h2/src/main/java/org/springframework/boot/h2/autoconfigure/package-info.java renamed to spring-boot-project/spring-boot-h2console/src/main/java/org/springframework/boot/h2console/autoconfigure/package-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
/**
1818
* Auto-configuration for H2's Console.
1919
*/
20-
package org.springframework.boot.h2.autoconfigure;
20+
package org.springframework.boot.h2console.autoconfigure;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.springframework.boot.h2console.autoconfigure.H2ConsoleAutoConfiguration

Diff for: spring-boot-project/spring-boot-h2/src/test/java/org/springframework/boot/h2/autoconfigure/H2ConsoleAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-h2console/src/test/java/org/springframework/boot/h2console/autoconfigure/H2ConsoleAutoConfigurationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.h2.autoconfigure;
17+
package org.springframework.boot.h2console.autoconfigure;
1818

1919
import java.net.URL;
2020
import java.net.URLClassLoader;

Diff for: spring-boot-project/spring-boot-h2/src/test/java/org/springframework/boot/h2/autoconfigure/H2ConsolePropertiesTests.java renamed to spring-boot-project/spring-boot-h2console/src/test/java/org/springframework/boot/h2console/autoconfigure/H2ConsolePropertiesTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.h2.autoconfigure;
17+
package org.springframework.boot.h2console.autoconfigure;
1818

1919
import org.junit.jupiter.api.Test;
2020

0 commit comments

Comments
 (0)