update eclipse.persistence.jpa version to 4.0.2.

Fix spring-orm tests with eclipselink for jre 18+ Closes spring-projectsgh-30648 Signed-off-by: Dmitrii Bocharov <bdshadow@gmail.com>
bdshadow · Aug 20, 2023 · 9975874 · 9975874
1 parent 602a1f4
commit 9975874
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 10 deletions.
diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle
@@ -115,7 +115,7 @@ dependencies {
 		api("org.crac:crac:1.3.0")
 		api("org.dom4j:dom4j:2.1.4")
 		api("org.eclipse.jetty:jetty-reactive-httpclient:3.0.8")
-		api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.3")
+		api("org.eclipse.persistence:org.eclipse.persistence.jpa:4.0.2")
 		api("org.eclipse:yasson:2.0.4")
 		api("org.ehcache:ehcache:3.10.8")
 		api("org.ehcache:jcache:1.0.1")

diff --git a/...est/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java b/...est/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
@@ -23,13 +23,11 @@
 import jakarta.persistence.Query;
 import jakarta.persistence.TransactionRequiredException;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledForJreRange;
 
 import org.springframework.orm.jpa.domain.Person;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.jupiter.api.condition.JRE.JAVA_18;
 
 /**
  * An application-managed entity manager can join an existing transaction,
@@ -39,7 +37,6 @@
  * @author Juergen Hoeller
  * @since 2.0
  */
-@DisabledForJreRange(min = JAVA_18, disabledReason = "These JPA tests don't pass on Java 18+")
 public class ApplicationManagedEntityManagerIntegrationTests extends AbstractEntityManagerFactoryIntegrationTests {
 
 	@Test

diff --git a/.../test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java b/.../test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
@@ -24,7 +24,6 @@
 import jakarta.persistence.Query;
 import jakarta.persistence.TransactionRequiredException;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledForJreRange;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
@@ -34,7 +33,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-import static org.junit.jupiter.api.condition.JRE.JAVA_18;
 
 /**
  * Integration tests using in-memory database for container-managed JPA
@@ -43,7 +41,6 @@
  * @author Juergen Hoeller
  * @since 2.0
  */
-@DisabledForJreRange(min = JAVA_18, disabledReason = "These JPA tests don't pass on Java 18+")
 public class ContainerManagedEntityManagerIntegrationTests extends AbstractEntityManagerFactoryIntegrationTests {
 
 	@Autowired

diff --git a/.../springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java b/.../springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java
@@ -18,20 +18,17 @@
 
 import org.eclipse.persistence.jpa.JpaEntityManager;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledForJreRange;
 
 import org.springframework.orm.jpa.AbstractContainerEntityManagerFactoryIntegrationTests;
 import org.springframework.orm.jpa.EntityManagerFactoryInfo;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.condition.JRE.JAVA_18;
 
 /**
  * EclipseLink-specific JPA tests.
  *
  * @author Juergen Hoeller
  */
-@DisabledForJreRange(min = JAVA_18, disabledReason = "These JPA tests don't pass on Java 18+")
 public class EclipseLinkEntityManagerFactoryIntegrationTests extends AbstractContainerEntityManagerFactoryIntegrationTests {
 
 	@Test