HHH-19952: Merge hibernate/main into RealTake/main

Author: wonsang.choi

changelog.txt

@@ -1,6 +1,51 @@
 Hibernate 7 Changelog
 =======================
 
+Changes in 7.2.0.CR3 (November 25, 2025)
+------------------------------------------------------------------------------------------------------------------------
+
+https://hibernate.atlassian.net/projects/HHH/versions/36014
+
+
+** Bug
+    * HHH-19939 broken caching for MERGE and REFRESH load plans
+    * HHH-19937 duplicate version check after refresh
+    * HHH-19936 Parameter casts for by-id lookups don't take column definition into account
+    * HHH-19932 NullPointerException in SqmInterpretationsKey::toString
+    * HHH-19926 NullPointerException when executing JPQL IN clause with null parameter on entity association
+    * HHH-19925 Locking root(s) should be based on select-clause, not from-clause
+    * HHH-19924 Session#find with LockMode.UPGRADE_NOWAIT casues AssetionError when no entity with the provided id exists in the database
+    * HHH-19922 org.hibernate.orm:hibernate-platform:pom:7.1.7.Final is missing
+    * HHH-19918 Avoid reflection when instantiating known FormatMapper
+    * HHH-19910 EntityInitializer#resolveInstance wrongly initializes existing detached instance
+    * HHH-19906 JsonGeneratingVisitor#visit doesn't handle plural types correctly
+    * HHH-19905 Implicit join re-use with nested inner and left joins causes ParsingException
+    * HHH-19895 hibernate-core 6.6.30.Final breaks compatibility on entities with composite keys for multiple variants of DB2
+    * HHH-19758 HQL parse failure with SLL can lead to wrong parse
+    * HHH-19749 [Oracle] Merge with @SecondaryTable may generate invalid NUMERIC type casts
+    * HHH-19739 Exceptions during load of entity with different persistent fields with same name
+    * HHH-19240 Significant increase in heap allocation for queries after migrating Hibernate ORM 6.5 to 6.6
+    * HHH-19038 Hibernate.get does not work on detached entities
+    * HHH-18860 Updates on SecondaryTable cause incorrect cast for BigDecimal
+    * HHH-16991 EnhancedUserType cannot be used when defining relations
+    * HHH-14032 Locales with scripts are not round-tripped properly
+
+** Deprecation
+    * HHH-19941 deprecate Session.contains(String, Object)
+
+** Improvement
+    * HHH-19953 Relax scopes of methods in EntityInitializerImpl (for Hibernate Reactive)
+    * HHH-19827 Apply the unified Hibernate Documentation theme
+
+** New Feature
+    * HHH-19931 SchemaManager.truncateTable()
+
+** Task
+    * HHH-19944 Upgrade MS SQL JDBC driver to remediate CVE-2025-59250
+    * HHH-19940 Include maven plugin in the release staging directory
+    * HHH-19921 Drop last JUnit 4 usages in Hibernate Envers 
+    * HHH-19916 More drop JUnit 4 usage work
+
 Note: Please refer to JIRA to learn more about each issue.
 
 Changes in 7.2.0.CR2 (November 10, 2025)

ci/release/Jenkinsfile

@@ -222,15 +222,9 @@ pipeline {
 								withEnv([
 										"DISABLE_REMOTE_GRADLE_CACHE=true"
 								]) {
-                                    def notesFiles = findFiles(glob: 'release_notes.md')
-                                    if ( notesFiles.length < 1 ) {
-                                        throw new IllegalStateException( "Could not locate `release_notes.md`" )
-                                    }
-                                    if ( notesFiles.length > 1 ) {
-                                        throw new IllegalStateException( "Located more than 1 `release_notes.md`" )
-                                    }
+                                    def ghReleaseNote = sh(script: 'realpath -e release_notes.md 2>/dev/null', returnStdout: true).trim()
 
-									sh ".release/scripts/publish.sh -j --notes=${notesFiles[0].path} ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH} "
+                                    sh ".release/scripts/publish.sh -j ${ghReleaseNote != '' ? '--notes=' + ghReleaseNote : ''} ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH} "
 								}
 							}
 						}

documentation/src/main/asciidoc/introduction/Advanced.adoc

@@ -886,6 +886,17 @@ On the other hand, the following annotations specify how a collection should be
 
 Under the covers, Hibernate uses a `TreeSet` or `TreeMap` to maintain the collection in sorted order.
 
+[CAUTION]
+====
+The unowned (`mappedBy`) side of a bidirectional association is not responsible for specifying column mappings.
+So it's wrong in principle to use `@OrderColumn` or `@MapKeyColumn` on the unowned side of an association mapping.
+But for unowned collections, we may use `@OrderBy` or `@MapKey` instead.
+That is:
+
+- You can use `@OrderColumn` or `@MapKeyColumn` with an `@ElementCollection`, owned `@ManyToMany`, or owned `@OneToMany`.
+- But use `@OrderBy` or `@MapKey` when it's an _unowned_ `@ManyToMany` or `@OneToMany`.
+====
+
 [[any]]
 === Any mappings
 

documentation/src/main/asciidoc/userguide/chapters/domain/collections.adoc

@@ -683,7 +683,9 @@ include::{extrasdir}/collections-unidirectional-ordered-list-order-column-select
 ----
 ====
 
-With the `order_id` column in place, Hibernate can order the list in-memory after it's being fetched from the database.
+With the `order_id` column in place, Hibernate can order the list in-memory after it's fetched from the database.
+
+The <<collection-list-indexbase-ex,`@ListIndexBase` annotation>> may be used to choose between 0-based and 1-based indexing on the database side.
 
 [[collections-bidirectional-ordered-list]]
 ===== Bidirectional ordered lists
@@ -701,54 +703,6 @@ include::{example-dir-collection}/BidirectionalOrderByListTest.java[tags=collect
 
 Just like with the unidirectional `@OrderBy` list, the `number` column is used to order the statement on the SQL level.
 
-When using the `@OrderColumn` annotation, the `order_id` column is going to be embedded in the child table:
-
-[[collections-bidirectional-ordered-list-order-column-example]]
-.Bidirectional `@OrderColumn` list
-====
-[source,java]
-----
-include::{example-dir-collection}/BidirectionalOrderColumnListTest.java[tags=collections-bidirectional-ordered-list-order-column-example,indent=0]
-----
-
-[source,sql]
-----
-include::{extrasdir}/collections-bidirectional-ordered-list-order-column-example.sql[]
-----
-====
-
-When fetching the collection, Hibernate will use the fetched ordered columns to sort the elements according to the `@OrderColumn` mapping.
-
-[[collections-customizing-ordered-list-ordinal]]
-===== Customizing ordered list ordinal
-
-You can customize the ordinal of the underlying ordered list by using the https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/ListIndexBase.html[`@ListIndexBase`] annotation.
-
-[[collections-customizing-ordered-list-ordinal-mapping-example]]
-.`@ListIndexBase` mapping example
-====
-[source,java]
-----
-include::{example-dir-collection}/OrderColumnListIndexBaseTest.java[tags=collections-customizing-ordered-list-ordinal-mapping-example,indent=0]
-----
-====
-
-When inserting two `Phone` records, Hibernate is going to start the List index from 100 this time.
-
-[[collections-customizing-ordered-list-ordinal-persist-example]]
-.`@ListIndexBase` persist example
-====
-[source,java]
-----
-include::{example-dir-collection}/OrderColumnListIndexBaseTest.java[tags=collections-customizing-ordered-list-ordinal-persist-example,indent=0]
-----
-
-[source,sql]
-----
-include::{extrasdir}/collections-customizing-ordered-list-ordinal-persist-example.sql[]
-----
-====
-
 [[collections-customizing-ordered-by-sql-clause]]
 ===== Customizing ORDER BY SQL clause
 

hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java

@@ -132,6 +132,8 @@
 	 *
 	 * @see org.hibernate.query.Query#setCacheMode(CacheMode)
 	 * @see org.hibernate.jpa.SpecHints#HINT_SPEC_CACHE_STORE_MODE
+	 *
+	 * @since 6.2
 	 */
 	CacheStoreMode cacheStoreMode() default CacheStoreMode.USE;
 
@@ -140,6 +142,8 @@
 	 *
 	 * @see org.hibernate.query.Query#setCacheMode(CacheMode)
 	 * @see org.hibernate.jpa.SpecHints#HINT_SPEC_CACHE_RETRIEVE_MODE
+	 *
+	 * @since 6.2
 	 */
 	CacheRetrieveMode cacheRetrieveMode() default CacheRetrieveMode.USE;
 

hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java

@@ -54,6 +54,8 @@
 	 * {@link EntityManager#createNamedQuery(String, Class)}.
 	 *
 	 * @see jakarta.persistence.NamedQuery#resultClass()
+	 *
+	 * @since 7.0
 	 */
 	Class<?> resultClass() default void.class;
 
@@ -127,6 +129,8 @@
 	 *
 	 * @see org.hibernate.query.Query#setCacheStoreMode(CacheStoreMode)
 	 * @see org.hibernate.jpa.SpecHints#HINT_SPEC_CACHE_STORE_MODE
+	 *
+	 * @since 6.2
 	 */
 	CacheStoreMode cacheStoreMode() default CacheStoreMode.USE;
 
@@ -135,6 +139,8 @@
 	 *
 	 * @see org.hibernate.query.Query#setCacheRetrieveMode(CacheRetrieveMode)
 	 * @see org.hibernate.jpa.SpecHints#HINT_SPEC_CACHE_RETRIEVE_MODE
+	 *
+	 * @since 6.2
 	 */
 	CacheRetrieveMode cacheRetrieveMode() default CacheRetrieveMode.USE;
 

hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java

@@ -45,7 +45,6 @@ public interface BootLogging extends BasicLogger {
 	@Message(id = 160101, value = "Duplicate generator name: '%s'")
 	void duplicateGeneratorName(String name);
 
-
 	@LogMessage(level = DEBUG)
 	@Message(id = 160111, value = "Package not found or no package-info.java: %s")
 	void packageNotFound(String packageName);
@@ -84,7 +83,6 @@ public interface BootLogging extends BasicLogger {
 					@ManyToOne and @OneToOne associations mapped with @NotFound are forced to EAGER fetching""")
 	void ignoreNotFoundWithFetchTypeLazy(String entity, String association);
 
-	// --- New typed TRACE/DEBUG messages for boot internals ---
 	@LogMessage(level = TRACE)
 	@Message(id = 160140, value = "Binding formula: %s")
 	void bindingFormula(String formula);
@@ -449,4 +447,12 @@ public interface BootLogging extends BasicLogger {
 	@LogMessage(level = DEBUG)
 	@Message(id = 160244, value = "Skipping HBM processing of entity hierarchy [%s], as at least one entity [%s] has been processed")
 	void skippingHbmProcessingOfEntityHierarchy(String rootEntityName, String processedEntity);
+
+	@LogMessage(level = WARN)
+	@Message(id = 160245, value = "Association '%s' is 'mappedBy' another entity and should not specify a '@MapKeyColumn' (use '@MapKey' instead)")
+	void mappedByShouldNotSpecifyMapKeyColumn(String associationPath);
+
+	@LogMessage(level = WARN)
+	@Message(id = 160246, value = "Association '%s' is 'mappedBy' another entity and should not specify an '@OrderColumn' (use '@OrderBy' instead)")
+	void mappedByShouldNotSpecifyOrderColumn(String associationPath);
 }

hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java

@@ -105,9 +105,7 @@ public MetadataSources(ServiceRegistry serviceRegistry, XmlMappingBinderAccess x
 		// service registry really should be either BootstrapServiceRegistry or StandardServiceRegistry type...
 		if ( !isExpectedServiceRegistryType( serviceRegistry ) ) {
 			if ( BOOT_LOGGER.isDebugEnabled() ) {
-				BOOT_LOGGER.unexpectedServiceRegistryType(
-						serviceRegistry.getClass().getName()
-				);
+				BOOT_LOGGER.unexpectedServiceRegistryType( serviceRegistry.getClass().getName() );
 			}
 		}
 		this.serviceRegistry = serviceRegistry;

hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java

@@ -14,6 +14,8 @@
 
 import org.hibernate.boot.archive.spi.ArchiveException;
 
+import static org.hibernate.boot.BootLogging.BOOT_LOGGER;
+
 
 /**
  * Helper for dealing with archives
@@ -89,7 +91,7 @@ else if ( "zip".equals( protocol )
 					"Unable to determine JAR Url from " + url + ". Cause: " + e.getMessage()
 			);
 		}
-		org.hibernate.boot.BootLogging.BOOT_LOGGER.jarUrlFromUrlEntry( String.valueOf(url), String.valueOf(jarUrl) );
+		BOOT_LOGGER.jarUrlFromUrlEntry( String.valueOf(url), String.valueOf(jarUrl) );
 		return jarUrl;
 	}
 

hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java

@@ -13,6 +13,7 @@
 import org.hibernate.boot.internal.ClassLoaderAccessImpl;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.event.spi.PreCollectionUpdateEvent;
 import org.hibernate.event.spi.PreCollectionUpdateEventListener;
 import org.hibernate.event.spi.PreDeleteEvent;
@@ -51,21 +52,26 @@ public class BeanValidationEventListener
 	private final Validator validator;
 	private final GroupsPerOperation groupsPerOperation;
 
+	private SessionFactoryImplementor sessionFactory;
+
 	public BeanValidationEventListener(
 			ValidatorFactory factory, Map<String, Object> settings, ClassLoaderService classLoaderService) {
 		traversableResolver = new HibernateTraversableResolver();
 		validator =
 				factory.usingContext()
 						.traversableResolver( traversableResolver )
 						.getValidator();
-		groupsPerOperation = GroupsPerOperation.from( settings, new ClassLoaderAccessImpl( classLoaderService ) );
+		groupsPerOperation =
+				GroupsPerOperation.from( settings,
+						new ClassLoaderAccessImpl( classLoaderService ) );
 	}
 
 	@Override
 	public void sessionFactoryCreated(SessionFactory factory) {
-		var implementor = factory.unwrap( SessionFactoryImplementor.class );
-		implementor.getMappingMetamodel()
-				.forEachEntityDescriptor( entityPersister -> traversableResolver.addPersister( entityPersister, implementor ) );
+		sessionFactory = factory.unwrap( SessionFactoryImplementor.class );
+		sessionFactory.getMappingMetamodel()
+				.forEachEntityDescriptor( entityPersister ->
+						traversableResolver.addPersister( entityPersister, sessionFactory ) );
 	}
 
 	public boolean onPreInsert(PreInsertEvent event) {
@@ -110,53 +116,69 @@ public void onPreUpdateCollection(PreCollectionUpdateEvent event) {
 		final Object entity = castNonNull( event.getCollection().getOwner() );
 		validate(
 				entity,
-				event.getSession().getEntityPersister( event.getAffectedOwnerEntityName(), entity ),
+				getEntityPersister( event.getSession(), event.getAffectedOwnerEntityName(), entity ),
 				GroupsPerOperation.Operation.UPDATE
 		);
 	}
 
-	private <T> void validate(
-			T object,
-			EntityPersister persister,
-			GroupsPerOperation.Operation operation) {
+	private EntityPersister getEntityPersister(
+			SharedSessionContractImplementor session, String entityName, Object entity) {
+		if ( session != null ) {
+			return session.getEntityPersister( entityName, entity );
+		}
+		else {
+			final var metamodel = sessionFactory.getMappingMetamodel();
+			return entityName == null
+					? metamodel.getEntityDescriptor( entity.getClass().getName() )
+					: metamodel.getEntityDescriptor( entityName )
+							.getSubclassEntityPersister( entity, sessionFactory );
+		}
+	}
+
+	private <T> void validate(T object, EntityPersister persister, GroupsPerOperation.Operation operation) {
 		if ( object != null
 				&& persister.getRepresentationStrategy().getMode() == RepresentationMode.POJO ) {
-			final Class<?>[] groups = groupsPerOperation.get( operation );
+			final var groups = groupsPerOperation.get( operation );
 			if ( groups.length > 0 ) {
 				final var constraintViolations = validator.validate( object, groups );
 				if ( !constraintViolations.isEmpty() ) {
-					final Set<ConstraintViolation<?>> propagatedViolations = setOfSize( constraintViolations.size() );
+					final Set<ConstraintViolation<?>> propagatedViolations =
+							setOfSize( constraintViolations.size() );
 					final Set<String> classNames = new HashSet<>();
 					for ( var violation : constraintViolations ) {
 						BEAN_VALIDATION_LOGGER.trace( violation );
 						propagatedViolations.add( violation );
 						classNames.add( violation.getLeafBean().getClass().getName() );
 					}
-					final var builder =
-							new StringBuilder()
-									.append( "Validation failed for classes " )
-									.append( classNames )
-									.append( " during " )
-									.append( operation.getName() )
-									.append( " time for groups " )
-									.append( toString( groups ) )
-									.append( "\nList of constraint violations:[\n" );
-					for ( var violation : constraintViolations ) {
-						builder.append( "\t" ).append( violation.toString() ).append( "\n" );
-					}
-					builder.append( "]" );
-					throw new ConstraintViolationException( builder.toString(), propagatedViolations );
+					throw new ConstraintViolationException(
+							message( operation, classNames, groups, constraintViolations ),
+							propagatedViolations );
 				}
 			}
 		}
 	}
 
-	private String toString(Class<?>[] groups) {
-		final var string = new StringBuilder( "[" );
+	private <T> String message(
+			GroupsPerOperation.Operation operation,
+			Set<String> classNames,
+			Class<?>[] groups,
+			Set<ConstraintViolation<T>> constraintViolations) {
+		final var builder = new StringBuilder();
+		builder.append( "Validation failed for classes " )
+				.append( classNames )
+				.append( " during " )
+				.append( operation.getName() )
+				.append( " time for groups [" );
 		for ( var group : groups ) {
-			string.append( group.getName() ).append( ", " );
+			builder.append( group.getName() ).append( ", " );
+		}
+		builder.append( "]\nList of constraint violations:[\n" );
+		for ( var violation : constraintViolations ) {
+			builder.append( "\t" )
+					.append( violation.toString() )
+					.append( "\n" );
 		}
-		string.append( "]" );
-		return string.toString();
+		builder.append( "]" );
+		return builder.toString();
 	}
 }