Skip to content

Commit 0e6deac

Browse files
committed
[#1546] Upgrade to Hibernate ORM 6.2.0.Final
1 parent b83283a commit 0e6deac

File tree

5 files changed

+5
-16
lines changed

5 files changed

+5
-16
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ version = projectVersion
5353
// ./gradlew clean build -PhibernateOrmVersion=5.6.15-SNAPSHOT
5454
ext {
5555
if ( !project.hasProperty('hibernateOrmVersion') ) {
56-
hibernateOrmVersion = '6.2.0.CR4'
56+
hibernateOrmVersion = '6.2.0.Final'
5757
}
5858
if ( !project.hasProperty( 'hibernateOrmGradlePluginVersion' ) ) {
5959
// Same as ORM as default

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ org.gradle.java.installations.auto-download=false
2929
#db = MSSQL
3030

3131
# Enable the SonatypeOS maven repository (mainly for Vert.x snapshots) when present (value ignored)
32-
enableSonatypeOpenSourceSnapshotsRep = true
32+
#enableSonatypeOpenSourceSnapshotsRep = true
3333

3434
# Enable the JBoss Snapshot maven repository (mainly for Hibernate ORM snapshots) when present (value ignored)
3535
#enableJBossSnapshotsRep = true
@@ -38,12 +38,12 @@ enableSonatypeOpenSourceSnapshotsRep = true
3838
#enableMavenLocalRepo = true
3939

4040
# Override default Hibernate ORM version
41-
hibernateOrmVersion = 6.2.0-SNAPSHOT
41+
#hibernateOrmVersion = 6.2.0-SNAPSHOT
4242

4343
# Override default Hibernate ORM Gradle plugin version
4444
# Using the stable version because I don't know how to configure the build to download the snapshot version from
4545
# a remote repository
46-
hibernateOrmGradlePluginVersion = 6.2.0.CR4
46+
#hibernateOrmGradlePluginVersion = 6.2.0.CR4
4747

4848
# If set to true, skip Hibernate ORM version parsing (default is true, if set to null)
4949
# this is required when using intervals or weird versions or the build will fail

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/collection/impl/ReactiveAbstractCollectionPersister.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ default boolean deleteByIndex() {
8282
boolean isRowDeleteEnabled();
8383
boolean isRowInsertEnabled();
8484

85-
boolean hasIdentifier();
8685
boolean indexContainsFormula();
8786

8887
default List<Object> entryList(PersistentCollection<?> collection) {

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/collection/impl/ReactiveBasicCollectionPersister.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,6 @@ public boolean isRowInsertEnabled() {
172172
return super.isRowInsertEnabled();
173173
}
174174

175-
@Override
176-
public boolean hasIdentifier() {
177-
return super.hasIdentifier;
178-
}
179-
180175
@Override
181176
public boolean indexContainsFormula() {
182177
return super.indexContainsFormula;

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/collection/impl/ReactiveOneToManyPersister.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,6 @@ public boolean isRowInsertEnabled() {
167167
return super.isRowInsertEnabled();
168168
}
169169

170-
@Override
171-
public boolean hasIdentifier() {
172-
return super.hasIdentifier;
173-
}
174-
175170
@Override
176171
public boolean indexContainsFormula() {
177172
return super.indexContainsFormula;
@@ -189,7 +184,7 @@ private CompletionStage<Void> writeIndex(
189184
}
190185

191186
// If one-to-many and inverse, still need to create the index. See HHH-5732.
192-
final boolean doWrite = isInverse && hasIndex && !indexContainsFormula && ArrayHelper.countTrue( indexColumnIsSettable ) > 0;
187+
final boolean doWrite = isInverse && hasIndex() && !indexContainsFormula && ArrayHelper.countTrue( indexColumnIsSettable ) > 0;
193188
if ( !doWrite ) {
194189
return voidFuture();
195190
}

0 commit comments

Comments
 (0)