Merge branch '7.0.x'

spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java

@@ -328,11 +328,11 @@ public abstract class EntityManagerFactoryUtils {
 			}
 		}
 		else if (!TransactionSynchronizationManager.isSynchronizationActive()) {
-			// Indicate that we can't obtain a transactional EntityManager.
+			// Indicate that we can't obtain a transactional EntityAgent.
 			return null;
 		}
 
-		// Create a new EntityManager for use within the current transaction.
+		// Create a new EntityAgent for use within the current transaction.
 		logger.debug("Opening JPA EntityAgent");
 		Object entityAgent = null;
 		if (emHolder != null && emf instanceof EntityManagerFactoryInfo info &&

spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBean.java

@@ -61,9 +61,9 @@ import org.springframework.core.type.filter.TypeFilter;
  * {@link FactoryBean} that creates a Hibernate {@link SessionFactory}. This is the usual
  * way to set up a shared Hibernate SessionFactory in a Spring application context; the
  * SessionFactory can then be passed to data access objects via dependency injection.
+ * Compatible with Hibernate ORM 7.0-7.4 and 8.0.
  *
- * <p>Compatible with Hibernate ORM 7.x, as of Spring Framework 7.0.
- * This Hibernate-specific {@code LocalSessionFactoryBean} can be an immediate alternative
+ * <p>This Hibernate-specific {@code LocalSessionFactoryBean} can be an immediate alternative
  * to {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean} for
  * common JPA purposes: The Hibernate {@code SessionFactory} will natively expose the JPA
  * {@code EntityManagerFactory} interface as well, and Hibernate {@code BeanContainer}

spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java

@@ -74,14 +74,14 @@ import org.springframework.util.ClassUtils;
  * A Spring-provided extension of the standard Hibernate {@link Configuration} class,
  * adding {@link SpringSessionContext} as a default and providing convenient ways
  * to specify a JDBC {@link DataSource} and an application class loader.
+ * Compatible with Hibernate ORM 7.0-7.4 and 8.0.
  *
  * <p>This is designed for programmatic use, for example, in {@code @Bean} factory methods;
  * consider using {@link LocalSessionFactoryBean} for XML bean definition files.
  * Typically combined with {@link HibernateTransactionManager} for declarative
  * transactions against the {@code SessionFactory} and its JDBC {@code DataSource}.
  *
- * <p>Compatible with Hibernate ORM 7.x, as of Spring Framework 7.0.
- * This Hibernate-specific factory builder can also be a convenient way to set up
+ * <p>This Hibernate-specific factory builder can also be a convenient way to set up
  * a JPA {@code EntityManagerFactory} since the Hibernate {@code SessionFactory}
  * natively exposes the JPA {@code EntityManagerFactory} interface as well now.
  *

spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java

@@ -47,7 +47,7 @@ import org.springframework.util.ReflectionUtils;
 
 /**
  * {@link org.springframework.orm.jpa.JpaDialect} implementation for Hibernate.
- * Compatible with Hibernate ORM 7.x and 8.x.
+ * Compatible with Hibernate ORM 7.0-7.4 and 8.0.
  *
  * @author Juergen Hoeller
  * @author Costin Leau

spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java

@@ -50,7 +50,7 @@ import org.springframework.transaction.jta.JtaTransactionManager;
 
 /**
  * {@link org.springframework.orm.jpa.JpaVendorAdapter} implementation for Hibernate.
- * Compatible with Hibernate ORM 7.x and 8.x.
+ * Compatible with Hibernate ORM 7.0-7.4 and 8.0.
  *
  * <p>Exposes Hibernate's persistence provider and Hibernate's Session as extended
  * EntityManager interface, and adapts {@link AbstractJpaVendorAdapter}'s common