From 94f9a0b03a2335d7ccc021c7c33b8b32e01d83ed Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 9 May 2015 19:27:14 +0200 Subject: [PATCH] Hibernate 5 version references in javadoc Issue: SPR-11694 --- .../orm/hibernate5/ConfigurableJtaPlatform.java | 2 +- .../orm/hibernate5/HibernateTemplate.java | 2 +- .../orm/hibernate5/HibernateTransactionManager.java | 3 --- .../orm/hibernate5/LocalSessionFactoryBuilder.java | 2 +- .../springframework/orm/hibernate5/package-info.java | 10 +++++----- .../orm/hibernate5/support/HibernateDaoSupport.java | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/ConfigurableJtaPlatform.java b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/ConfigurableJtaPlatform.java index e1c74b58ef82..8e6cb4fd45a7 100644 --- a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/ConfigurableJtaPlatform.java +++ b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/ConfigurableJtaPlatform.java @@ -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 diff --git a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java index f52d46c1fa36..63c4f1891798 100644 --- a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java +++ b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java @@ -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. + * based data access code, to benefit from bug fixes in Hibernate 5.x. * * @author Juergen Hoeller * @since 4.2 diff --git a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java index 4bf04c983d28..280cc44a4316 100644 --- a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java +++ b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java @@ -92,9 +92,6 @@ * support nested transactions! Hence, do not expect Hibernate access code to * semantically participate in a nested transaction. * - *

NOTE: Hibernate 4.2+ is strongly recommended for efficient transaction - * management with Spring, in particular for transactional Spring JDBC access. - * * @author Juergen Hoeller * @since 4.2 * @see #setSessionFactory diff --git a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java index 5268b1212c91..def7931f09b8 100644 --- a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java +++ b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java @@ -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. *

A passed-in Spring {@link JtaTransactionManager} needs to contain a JTA * {@link TransactionManager} reference to be usable here, except for the WebSphere diff --git a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/package-info.java b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/package-info.java index 16d9f6a8c55f..1211ac0098fd 100644 --- a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/package-info.java +++ b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/package-info.java @@ -1,6 +1,6 @@ /** * Package providing integration of - * Hibernate 4.x + * Hibernate 5.x * with Spring concepts. * *

Contains an implementation of Spring's transaction SPI for local Hibernate transactions. @@ -8,9 +8,9 @@ * in order to follow Hibernate recommendations as closely as possible. We recommend * using Hibernate's native sessionFactory.getCurrentSession() style. * - *

This package supports Hibernate 4.x only. - * See the {@code org.springframework.orm.hibernate3} package for Hibernate 3.x support. - * Note: Do not use HibernateTemplate or other classes from the hibernate3 package - * with Hibernate 4; this will lead to class definition exceptions at runtime. + *

This package supports Hibernate 5.x only. + * See the {@code org.springframework.orm.hibernate4} package for Hibernate 4.x support. + * Note: 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; diff --git a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/support/HibernateDaoSupport.java b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/support/HibernateDaoSupport.java index 8a86f29c45de..d596ebbb82fb 100644 --- a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/support/HibernateDaoSupport.java +++ b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/support/HibernateDaoSupport.java @@ -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. + * based data access code, to benefit from bug fixes in Hibernate 5.x. * * @author Juergen Hoeller * @since 4.2