From b32bd84ea2b2522094af8ebf9a1be73232b11559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 16 May 2025 16:43:23 +0200 Subject: [PATCH] Upgrade to Spring Data 2025.1.0-M3 Closes gh-45488 --- .../data/jdbc/JdbcDatabaseDialect.java | 18 +++++++++--------- .../spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java index 18cf12dda41..86d310fb072 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java @@ -17,13 +17,13 @@ package org.springframework.boot.autoconfigure.data.jdbc; import org.springframework.data.jdbc.core.dialect.JdbcDb2Dialect; +import org.springframework.data.jdbc.core.dialect.JdbcH2Dialect; +import org.springframework.data.jdbc.core.dialect.JdbcHsqlDbDialect; import org.springframework.data.jdbc.core.dialect.JdbcMySqlDialect; +import org.springframework.data.jdbc.core.dialect.JdbcOracleDialect; import org.springframework.data.jdbc.core.dialect.JdbcPostgresDialect; import org.springframework.data.jdbc.core.dialect.JdbcSqlServerDialect; import org.springframework.data.relational.core.dialect.Dialect; -import org.springframework.data.relational.core.dialect.H2Dialect; -import org.springframework.data.relational.core.dialect.HsqlDbDialect; -import org.springframework.data.relational.core.dialect.OracleDialect; /** * List of database dialects that can be configured in Boot for use with Spring Data JDBC. @@ -39,14 +39,14 @@ public enum JdbcDatabaseDialect { DB2(JdbcDb2Dialect.INSTANCE), /** - * Provides an instance of {@link H2Dialect}. + * Provides an instance of {@link JdbcH2Dialect}. */ - H2(H2Dialect.INSTANCE), + H2(JdbcH2Dialect.INSTANCE), /** - * Provides an instance of {@link HsqlDbDialect}. + * Provides an instance of {@link JdbcHsqlDbDialect}. */ - HSQL(HsqlDbDialect.INSTANCE), + HSQL(JdbcHsqlDbDialect.INSTANCE), /** * Provides an instance of {@link JdbcMySqlDialect}. @@ -59,9 +59,9 @@ public enum JdbcDatabaseDialect { MYSQL(JdbcMySqlDialect.INSTANCE), /** - * Provides an instance of {@link OracleDialect}. + * Provides an instance of {@link JdbcOracleDialect}. */ - ORACLE(OracleDialect.INSTANCE), + ORACLE(JdbcOracleDialect.INSTANCE), /** * Provides an instance of {@link JdbcPostgresDialect}. diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 55c5ff92a8b..3170840dfcf 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -2169,7 +2169,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-batch/releases/tag/v{version}") } } - library("Spring Data Bom", "2025.1.0-M2") { + library("Spring Data Bom", "2025.1.0-M3") { considerSnapshots() calendarName = "Spring Data Release" group("org.springframework.data") {