From 0270808b3c02b97d68f703a1ba01016b315fbe22 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 16 Jan 2018 14:39:14 +0100 Subject: [PATCH] Upgrade to EclipseLink 2.7.1 --- spring-orm/spring-orm.gradle | 2 +- .../orm/jpa/vendor/EclipseLinkJpaDialect.java | 5 +++-- .../orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/spring-orm/spring-orm.gradle b/spring-orm/spring-orm.gradle index 3df661497c7..1fd47272664 100644 --- a/spring-orm/spring-orm.gradle +++ b/spring-orm/spring-orm.gradle @@ -8,7 +8,7 @@ dependencies { optional(project(":spring-aop")) optional(project(":spring-context")) optional(project(":spring-web")) - optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.0") + optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.1") optional("org.hibernate:hibernate-core:5.2.12.Final") optional("javax.servlet:javax.servlet-api:3.1.0") testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java index 0584c059023..d6c52a02e55 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -31,7 +31,8 @@ import org.springframework.transaction.TransactionException; /** * {@link org.springframework.orm.jpa.JpaDialect} implementation for Eclipse - * Persistence Services (EclipseLink). Developed and tested against EclipseLink 2.4. + * Persistence Services (EclipseLink). Developed and tested against EclipseLink 2.7; + * backwards-compatible with EclipseLink 2.5 and 2.6 at runtime. * *

By default, this class acquires an early EclipseLink transaction with an early * JDBC Connection for non-read-only transactions. This allows for mixing JDBC and diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java index ec072cf10b2..78e65e29c3a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -19,7 +19,6 @@ package org.springframework.orm.jpa.vendor; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; - import javax.persistence.EntityManager; import javax.persistence.spi.PersistenceProvider; @@ -31,7 +30,8 @@ import org.springframework.lang.Nullable; /** * {@link org.springframework.orm.jpa.JpaVendorAdapter} implementation for Eclipse - * Persistence Services (EclipseLink). Developed and tested against EclipseLink 2.4. + * Persistence Services (EclipseLink). Developed and tested against EclipseLink 2.7; + * backwards-compatible with EclipseLink 2.5 and 2.6 at runtime. * *

Exposes EclipseLink's persistence provider and EntityManager extension interface, * and adapts {@link AbstractJpaVendorAdapter}'s common configuration settings.