diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java index 90dd54fcaf..598a7a26d6 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ import org.springframework.transaction.TransactionException; *
Simply begins a standard JPA transaction in {@link #beginTransaction} and * performs standard exception translation through {@link EntityManagerFactoryUtils}. * - *
NOTE: Spring's JPA support requires JPA 2.0 or higher, as of Spring 4.0. + *
NOTE: Spring's JPA support requires JPA 2.1 or higher, as of Spring 5.0. * * @author Juergen Hoeller * @since 2.0 diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java index 51382cfd73..5103b0250e 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionException; /** - * SPI strategy that encapsulates certain functionality that standard JPA 2.0 does + * SPI strategy that encapsulates certain functionality that standard JPA 2.1 does * not offer, such as access to the underlying JDBC Connection. This strategy is * mainly intended for standalone usage of a JPA provider; most of its functionality * is not relevant when running with JTA transactions. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java index a0e7303a94..8127991ecd 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java @@ -67,10 +67,9 @@ import org.springframework.util.ClassUtils; * plus the {@link EntityManagerFactoryInfo} interface which exposes additional * metadata as assembled by this FactoryBean. * - *
NOTE: Spring's JPA support requires JPA 2.0 or higher, as of Spring 4.0. - * JPA 1.0 based applications are still supported; however, a JPA 2.0/2.1 compliant - * persistence provider is needed at runtime. Spring's persistence unit bootstrapping - * automatically detects JPA 2.0 vs 2.1 through checking the JPA API on the classpath. + *
NOTE: Spring's JPA support requires JPA 2.1 or higher, as of Spring 5.0. + * JPA 1.0/2.0 based applications are still supported; however, a JPA 2.1 compliant + * persistence provider is needed at runtime. * * @author Juergen Hoeller * @author Rod Johnson diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java index ab6d60db1e..17c809e89a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,8 +52,8 @@ import javax.persistence.spi.PersistenceProvider; * to the JPA provider, consider using Spring's more powerful * {@link LocalContainerEntityManagerFactoryBean} instead. * - *
NOTE: Spring's JPA support requires JPA 2.0 or higher, as of Spring 4.0. - * JPA 1.0 based applications are still supported; however, a JPA 2.0/2.1 compliant + *
NOTE: Spring's JPA support requires JPA 2.1 or higher, as of Spring 5.0. + * JPA 1.0/2.0 based applications are still supported; however, a JPA 2.1 compliant * persistence provider is needed at runtime. * * @author Juergen Hoeller