Skip to content

Commit 133312a

Browse files
committed
Start building against Spring Data Bom 2025.0.0 snapshots
See gh-45436
1 parent 186bbee commit 133312a

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,15 +17,13 @@
1717
package org.springframework.boot.autoconfigure.data.jdbc;
1818

1919
import org.springframework.data.jdbc.core.dialect.JdbcDb2Dialect;
20+
import org.springframework.data.jdbc.core.dialect.JdbcH2Dialect;
21+
import org.springframework.data.jdbc.core.dialect.JdbcHsqlDbDialect;
2022
import org.springframework.data.jdbc.core.dialect.JdbcMySqlDialect;
23+
import org.springframework.data.jdbc.core.dialect.JdbcOracleDialect;
2124
import org.springframework.data.jdbc.core.dialect.JdbcPostgresDialect;
2225
import org.springframework.data.jdbc.core.dialect.JdbcSqlServerDialect;
2326
import org.springframework.data.relational.core.dialect.Dialect;
24-
import org.springframework.data.relational.core.dialect.H2Dialect;
25-
import org.springframework.data.relational.core.dialect.HsqlDbDialect;
26-
import org.springframework.data.relational.core.dialect.MariaDbDialect;
27-
import org.springframework.data.relational.core.dialect.MySqlDialect;
28-
import org.springframework.data.relational.core.dialect.OracleDialect;
2927

3028
/**
3129
* List of database dialects that can be configured in Boot for use with Spring Data JDBC.
@@ -41,29 +39,29 @@ public enum JdbcDatabaseDialect {
4139
DB2(JdbcDb2Dialect.INSTANCE),
4240

4341
/**
44-
* Provides an instance of {@link H2Dialect}.
42+
* Provides an instance of {@link JdbcH2Dialect}.
4543
*/
46-
H2(H2Dialect.INSTANCE),
44+
H2(JdbcH2Dialect.INSTANCE),
4745

4846
/**
49-
* Provides an instance of {@link HsqlDbDialect}.
47+
* Provides an instance of {@link JdbcHsqlDbDialect}.
5048
*/
51-
HSQL(HsqlDbDialect.INSTANCE),
49+
HSQL(JdbcHsqlDbDialect.INSTANCE),
5250

5351
/**
54-
* Provides an instance of {@link MariaDbDialect}.
52+
* Provides an instance of {@link JdbcMySqlDialect}.
5553
*/
56-
MARIA(MySqlDialect.INSTANCE),
54+
MARIA(JdbcMySqlDialect.INSTANCE),
5755

5856
/**
5957
* Provides an instance of {@link JdbcMySqlDialect}.
6058
*/
61-
MYSQL(MySqlDialect.INSTANCE),
59+
MYSQL(JdbcMySqlDialect.INSTANCE),
6260

6361
/**
64-
* Provides an instance of {@link OracleDialect}.
62+
* Provides an instance of {@link JdbcOracleDialect}.
6563
*/
66-
ORACLE(OracleDialect.INSTANCE),
64+
ORACLE(JdbcOracleDialect.INSTANCE),
6765

6866
/**
6967
* Provides an instance of {@link JdbcPostgresDialect}.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2217,7 +2217,7 @@ bom {
22172217
releaseNotes("https://github.com/spring-projects/spring-batch/releases/tag/v{version}")
22182218
}
22192219
}
2220-
library("Spring Data Bom", "2025.0.0-RC1") {
2220+
library("Spring Data Bom", "2025.0.0-SNAPSHOT") {
22212221
prohibit {
22222222
versionRange "[2025.1.0-M1,)"
22232223
because "it exceeds our baseline"

0 commit comments

Comments
 (0)