Skip to content

Commit 94f9a0b

Browse files
committed
Hibernate 5 version references in javadoc
Issue: SPR-11694
1 parent cf0a916 commit 94f9a0b

File tree

6 files changed

+9
-12
lines changed

6 files changed

+9
-12
lines changed

spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/ConfigurableJtaPlatform.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.springframework.util.Assert;
3232

3333
/**
34-
* Implementation of Hibernate 4's JtaPlatform SPI, exposing passed-in {@link TransactionManager},
34+
* Implementation of Hibernate 5's JtaPlatform SPI, exposing passed-in {@link TransactionManager},
3535
* {@link UserTransaction} and {@link TransactionSynchronizationRegistry} references.
3636
*
3737
* @author Juergen Hoeller

spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
* style of coding data access objects instead, based on
7171
* {@link SessionFactory#getCurrentSession()}.
7272
* This HibernateTemplate primarily exists as a migration helper for Hibernate 3
73-
* based data access code, to benefit from bug fixes in Hibernate 4.x.</b>
73+
* based data access code, to benefit from bug fixes in Hibernate 5.x.</b>
7474
*
7575
* @author Juergen Hoeller
7676
* @since 4.2

spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@
9292
* support nested transactions! Hence, do not expect Hibernate access code to
9393
* semantically participate in a nested transaction.</i>
9494
*
95-
* <p><b>NOTE: Hibernate 4.2+ is strongly recommended for efficient transaction
96-
* management with Spring, in particular for transactional Spring JDBC access.</b>
97-
*
9895
* @author Juergen Hoeller
9996
* @since 4.2
10097
* @see #setSessionFactory

spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public LocalSessionFactoryBuilder(DataSource dataSource, ResourceLoader resource
118118
/**
119119
* Set the Spring {@link JtaTransactionManager} or the JTA {@link TransactionManager}
120120
* to be used with Hibernate, if any. Allows for using a Spring-managed transaction
121-
* manager for Hibernate 4's session and cache synchronization, with the
121+
* manager for Hibernate 5's session and cache synchronization, with the
122122
* "hibernate.transaction.jta.platform" automatically set to it.
123123
* <p>A passed-in Spring {@link JtaTransactionManager} needs to contain a JTA
124124
* {@link TransactionManager} reference to be usable here, except for the WebSphere
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/**
22
* Package providing integration of
3-
* <a href="http://www.hibernate.org">Hibernate 4.x</a>
3+
* <a href="http://www.hibernate.org">Hibernate 5.x</a>
44
* with Spring concepts.
55
*
66
* <p>Contains an implementation of Spring's transaction SPI for local Hibernate transactions.
77
* This package is intentionally rather minimal, with no template classes or the like,
88
* in order to follow Hibernate recommendations as closely as possible. We recommend
99
* using Hibernate's native <code>sessionFactory.getCurrentSession()</code> style.
1010
*
11-
* <p><b>This package supports Hibernate 4.x only.</b>
12-
* See the {@code org.springframework.orm.hibernate3} package for Hibernate 3.x support.
13-
* <b>Note:</b> Do not use HibernateTemplate or other classes from the hibernate3 package
14-
* with Hibernate 4; this will lead to class definition exceptions at runtime.
11+
* <p><b>This package supports Hibernate 5.x only.</b>
12+
* See the {@code org.springframework.orm.hibernate4} package for Hibernate 4.x support.
13+
* <b>Note:</b> Do not use HibernateTemplate or other classes from the hibernate4 package
14+
* with Hibernate 5; this will lead to class definition exceptions at runtime.
1515
*/
1616
package org.springframework.orm.hibernate5;

spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/support/HibernateDaoSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
* style of coding data access objects instead, based on
4444
* {@link SessionFactory#getCurrentSession()}.
4545
* This HibernateTemplate primarily exists as a migration helper for Hibernate 3
46-
* based data access code, to benefit from bug fixes in Hibernate 4.x.</b>
46+
* based data access code, to benefit from bug fixes in Hibernate 5.x.</b>
4747
*
4848
* @author Juergen Hoeller
4949
* @since 4.2

0 commit comments

Comments
 (0)