Skip to content

Commit 5d75655

Browse files
committed
Revert "Force the default version of all supported Hibernate ORM dialects"
We'd rather rely on ORM defaults where possible. This reverts commit d3b0fd7e0c5dcc860be28e620830a4292550361b.
1 parent 982d46f commit 5d75655

File tree

12 files changed

+4
-253
lines changed

12 files changed

+4
-253
lines changed

extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceBuildTimeConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class DataSourceBuildTimeConfig {
4141
* or simply a warning in case the database cannot be reached.
4242
*
4343
* The default for this property is specific to each extension;
44-
* the Hibernate ORM extension will default to the oldest version supported in Quarkus.
44+
* the Hibernate ORM extension will default to the oldest version it supports.
4545
*
4646
* @asciidoclet
4747
*/

extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,9 @@ public final class HibernateOrmProcessor {
178178
void registerHibernateOrmMetadataForCoreDialects(
179179
BuildProducer<DatabaseKindDialectBuildItem> producer) {
180180
producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.DB2,
181-
"org.hibernate.dialect.DB2Dialect", DialectVersions.Defaults.DB2));
181+
"org.hibernate.dialect.DB2Dialect"));
182182
producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.DERBY,
183-
"org.hibernate.dialect.DerbyDialect", DialectVersions.Defaults.DERBY));
183+
"org.hibernate.dialect.DerbyDialect"));
184184
producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.H2,
185185
// Using our own default version is extra important for H2
186186
// See https://github.com/quarkusio/quarkus/issues/1886
@@ -194,7 +194,7 @@ void registerHibernateOrmMetadataForCoreDialects(
194194
producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.ORACLE,
195195
"org.hibernate.dialect.OracleDialect", DialectVersions.Defaults.ORACLE));
196196
producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.POSTGRESQL,
197-
"org.hibernate.dialect.PostgreSQLDialect", DialectVersions.Defaults.POSTGRESQL));
197+
"org.hibernate.dialect.PostgreSQLDialect"));
198198
}
199199

200200
@BuildStep

extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/config/DialectVersions.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@ public final class DialectVersions {
1616
public static final class Defaults {
1717

1818
// The following constants must be at least equal to the default dialect version in Hibernate ORM
19-
public static final String DB2 = "10.5";
20-
public static final String DERBY = "10.14";
2119
public static final String MARIADB = "10.6";
2220
public static final String MSSQL = "13"; // 2016
2321
public static final String MYSQL = "8";
2422
public static final String ORACLE = "12";
25-
public static final String POSTGRESQL = "10.0";
2623

2724
// This must be aligned on the H2 version in the Quarkus BOM
2825
public static final String H2 = "2.1.210";

integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/DialectEndpoint.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

integration-tests/jpa-db2/src/test/java/io/quarkus/it/jpa/db2/DialectInGraalITCase.java

Lines changed: 0 additions & 11 deletions
This file was deleted.

integration-tests/jpa-db2/src/test/java/io/quarkus/it/jpa/db2/DialectTest.java

Lines changed: 0 additions & 27 deletions
This file was deleted.

integration-tests/jpa-derby/src/main/java/io/quarkus/it/jpa/derby/DialectEndpoint.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

integration-tests/jpa-derby/src/test/java/io/quarkus/it/jpa/derby/DialectInGraalITCase.java

Lines changed: 0 additions & 11 deletions
This file was deleted.

integration-tests/jpa-derby/src/test/java/io/quarkus/it/jpa/derby/DialectTest.java

Lines changed: 0 additions & 27 deletions
This file was deleted.

integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/DialectEndpoint.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)