diff --git a/framework-docs/modules/ROOT/pages/data-access/orm/hibernate.adoc b/framework-docs/modules/ROOT/pages/data-access/orm/hibernate.adoc index a5c38886a52..c55b5efcb30 100644 --- a/framework-docs/modules/ROOT/pages/data-access/orm/hibernate.adoc +++ b/framework-docs/modules/ROOT/pages/data-access/orm/hibernate.adoc @@ -14,7 +14,7 @@ As of Spring Framework 7.0, Spring requires Hibernate ORM 7.x for Spring's `HibernateJpaVendorAdapter`. The `org.springframework.orm.jpa.hibernate` package supersedes the former `orm.hibernate5`: -now for use with Hibernate ORM 7.1+, tightly integrated with `HibernateJpaVendorAdapter` +now for use with Hibernate ORM 7.x, tightly integrated with `HibernateJpaVendorAdapter` as well as supporting Hibernate's native `SessionFactory.getCurrentSession()` style. ==== diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBean.java index 3adff0e01fb..0b806971b3f 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBean.java @@ -62,7 +62,7 @@ import org.springframework.core.type.filter.TypeFilter; * 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.1, as of Spring Framework 7.0. + *

Compatible with Hibernate ORM 7.x, as of Spring Framework 7.0. * 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 @@ -78,6 +78,7 @@ import org.springframework.core.type.filter.TypeFilter; * @see HibernateTransactionManager * @see LocalSessionFactoryBuilder * @see org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean + * @see org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter */ public class LocalSessionFactoryBean extends HibernateExceptionTranslator implements SmartFactoryBean, ResourceLoaderAware, BeanFactoryAware, diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java index 80f69e02c85..31c51341510 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java @@ -80,7 +80,7 @@ import org.springframework.util.ClassUtils; * Typically combined with {@link HibernateTransactionManager} for declarative * transactions against the {@code SessionFactory} and its JDBC {@code DataSource}. * - *

Compatible with Hibernate ORM 7.1, as of Spring Framework 7.0. + *

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 * a JPA {@code EntityManagerFactory} since the Hibernate {@code SessionFactory} * natively exposes the JPA {@code EntityManagerFactory} interface as well now. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/package-info.java b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/package-info.java index a20766242b0..f1808ace2cf 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/package-info.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/package-info.java @@ -6,7 +6,7 @@ * but potentially also for JPA repositories or mixed use of native Hibernate and JPA. * *

As of Spring Framework 7.0, this package supersedes {@code orm.hibernate5} - - * now for use with Hibernate ORM 7.1+, tightly integrated with JPA. + * now for use with Hibernate ORM 7.x, tightly integrated with JPA. */ @NullMarked package org.springframework.orm.jpa.hibernate;