Skip to content

Commit

Permalink
Hibernate 5 version references in javadoc
Browse files Browse the repository at this point in the history
Issue: SPR-11694
  • Loading branch information
jhoeller committed May 9, 2015
1 parent cf0a916 commit 94f9a0b
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 12 deletions.
Expand Up @@ -31,7 +31,7 @@
import org.springframework.util.Assert;

/**
* Implementation of Hibernate 4's JtaPlatform SPI, exposing passed-in {@link TransactionManager},
* Implementation of Hibernate 5's JtaPlatform SPI, exposing passed-in {@link TransactionManager},
* {@link UserTransaction} and {@link TransactionSynchronizationRegistry} references.
*
* @author Juergen Hoeller
Expand Down
Expand Up @@ -70,7 +70,7 @@
* style of coding data access objects instead, based on
* {@link SessionFactory#getCurrentSession()}.
* This HibernateTemplate primarily exists as a migration helper for Hibernate 3
* based data access code, to benefit from bug fixes in Hibernate 4.x.</b>
* based data access code, to benefit from bug fixes in Hibernate 5.x.</b>
*
* @author Juergen Hoeller
* @since 4.2
Expand Down
Expand Up @@ -92,9 +92,6 @@
* support nested transactions! Hence, do not expect Hibernate access code to
* semantically participate in a nested transaction.</i>
*
* <p><b>NOTE: Hibernate 4.2+ is strongly recommended for efficient transaction
* management with Spring, in particular for transactional Spring JDBC access.</b>
*
* @author Juergen Hoeller
* @since 4.2
* @see #setSessionFactory
Expand Down
Expand Up @@ -118,7 +118,7 @@ public LocalSessionFactoryBuilder(DataSource dataSource, ResourceLoader resource
/**
* Set the Spring {@link JtaTransactionManager} or the JTA {@link TransactionManager}
* to be used with Hibernate, if any. Allows for using a Spring-managed transaction
* manager for Hibernate 4's session and cache synchronization, with the
* manager for Hibernate 5's session and cache synchronization, with the
* "hibernate.transaction.jta.platform" automatically set to it.
* <p>A passed-in Spring {@link JtaTransactionManager} needs to contain a JTA
* {@link TransactionManager} reference to be usable here, except for the WebSphere
Expand Down
@@ -1,16 +1,16 @@
/**
* Package providing integration of
* <a href="http://www.hibernate.org">Hibernate 4.x</a>
* <a href="http://www.hibernate.org">Hibernate 5.x</a>
* with Spring concepts.
*
* <p>Contains an implementation of Spring's transaction SPI for local Hibernate transactions.
* This package is intentionally rather minimal, with no template classes or the like,
* in order to follow Hibernate recommendations as closely as possible. We recommend
* using Hibernate's native <code>sessionFactory.getCurrentSession()</code> style.
*
* <p><b>This package supports Hibernate 4.x only.</b>
* See the {@code org.springframework.orm.hibernate3} package for Hibernate 3.x support.
* <b>Note:</b> Do not use HibernateTemplate or other classes from the hibernate3 package
* with Hibernate 4; this will lead to class definition exceptions at runtime.
* <p><b>This package supports Hibernate 5.x only.</b>
* See the {@code org.springframework.orm.hibernate4} package for Hibernate 4.x support.
* <b>Note:</b> Do not use HibernateTemplate or other classes from the hibernate4 package
* with Hibernate 5; this will lead to class definition exceptions at runtime.
*/
package org.springframework.orm.hibernate5;
Expand Up @@ -43,7 +43,7 @@
* style of coding data access objects instead, based on
* {@link SessionFactory#getCurrentSession()}.
* This HibernateTemplate primarily exists as a migration helper for Hibernate 3
* based data access code, to benefit from bug fixes in Hibernate 4.x.</b>
* based data access code, to benefit from bug fixes in Hibernate 5.x.</b>
*
* @author Juergen Hoeller
* @since 4.2
Expand Down

0 comments on commit 94f9a0b

Please sign in to comment.