From ce778cee27218968c2a5866dadc705ba2594a4d0 Mon Sep 17 00:00:00 2001 From: Dmitrii Bocharov Date: Sun, 20 Aug 2023 23:00:44 +0200 Subject: [PATCH] Fix spring-orm tests with eclipselink and Java 18+ See gh-31078 --- framework-platform/framework-platform.gradle | 2 +- .../jpa/ApplicationManagedEntityManagerIntegrationTests.java | 3 --- .../orm/jpa/ContainerManagedEntityManagerIntegrationTests.java | 3 --- .../EclipseLinkEntityManagerFactoryIntegrationTests.java | 3 --- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index b2741933bbe..5646843a8e4 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -116,7 +116,7 @@ dependencies { api("org.crac:crac:1.4.0") api("org.dom4j:dom4j:2.1.4") api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.0") - 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/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java index d37cecb4650..d6ae4653653 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java @@ -23,13 +23,11 @@ import jakarta.persistence.EntityManager; 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 @@ import static org.junit.jupiter.api.condition.JRE.JAVA_18; * @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/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java index d1c6ff0cb8b..5092edad1c7 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java @@ -24,7 +24,6 @@ import jakarta.persistence.PersistenceException; 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 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.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 @@ import static org.junit.jupiter.api.condition.JRE.JAVA_18; * @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/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java index 712c7627ef9..b89bc14c2e0 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java @@ -18,20 +18,17 @@ package org.springframework.orm.jpa.eclipselink; 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