Skip to content

Commit ce778ce

Browse files
bdshadowsnicoll
authored andcommitted
Fix spring-orm tests with eclipselink and Java 18+
See gh-31078
1 parent a33791e commit ce778ce

File tree

4 files changed

+1
-10
lines changed

4 files changed

+1
-10
lines changed

framework-platform/framework-platform.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ dependencies {
116116
api("org.crac:crac:1.4.0")
117117
api("org.dom4j:dom4j:2.1.4")
118118
api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.0")
119-
api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.3")
119+
api("org.eclipse.persistence:org.eclipse.persistence.jpa:4.0.2")
120120
api("org.eclipse:yasson:2.0.4")
121121
api("org.ehcache:ehcache:3.10.8")
122122
api("org.ehcache:jcache:1.0.1")

spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,11 @@
2323
import jakarta.persistence.Query;
2424
import jakarta.persistence.TransactionRequiredException;
2525
import org.junit.jupiter.api.Test;
26-
import org.junit.jupiter.api.condition.DisabledForJreRange;
2726

2827
import org.springframework.orm.jpa.domain.Person;
2928

3029
import static org.assertj.core.api.Assertions.assertThat;
3130
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
32-
import static org.junit.jupiter.api.condition.JRE.JAVA_18;
3331

3432
/**
3533
* An application-managed entity manager can join an existing transaction,
@@ -39,7 +37,6 @@
3937
* @author Juergen Hoeller
4038
* @since 2.0
4139
*/
42-
@DisabledForJreRange(min = JAVA_18, disabledReason = "These JPA tests don't pass on Java 18+")
4340
public class ApplicationManagedEntityManagerIntegrationTests extends AbstractEntityManagerFactoryIntegrationTests {
4441

4542
@Test

spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import jakarta.persistence.Query;
2525
import jakarta.persistence.TransactionRequiredException;
2626
import org.junit.jupiter.api.Test;
27-
import org.junit.jupiter.api.condition.DisabledForJreRange;
2827

2928
import org.springframework.beans.factory.annotation.Autowired;
3029
import org.springframework.dao.DataAccessException;
@@ -34,7 +33,6 @@
3433
import static org.assertj.core.api.Assertions.assertThat;
3534
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
3635
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
37-
import static org.junit.jupiter.api.condition.JRE.JAVA_18;
3836

3937
/**
4038
* Integration tests using in-memory database for container-managed JPA
@@ -43,7 +41,6 @@
4341
* @author Juergen Hoeller
4442
* @since 2.0
4543
*/
46-
@DisabledForJreRange(min = JAVA_18, disabledReason = "These JPA tests don't pass on Java 18+")
4744
public class ContainerManagedEntityManagerIntegrationTests extends AbstractEntityManagerFactoryIntegrationTests {
4845

4946
@Autowired

spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,17 @@
1818

1919
import org.eclipse.persistence.jpa.JpaEntityManager;
2020
import org.junit.jupiter.api.Test;
21-
import org.junit.jupiter.api.condition.DisabledForJreRange;
2221

2322
import org.springframework.orm.jpa.AbstractContainerEntityManagerFactoryIntegrationTests;
2423
import org.springframework.orm.jpa.EntityManagerFactoryInfo;
2524

2625
import static org.assertj.core.api.Assertions.assertThat;
27-
import static org.junit.jupiter.api.condition.JRE.JAVA_18;
2826

2927
/**
3028
* EclipseLink-specific JPA tests.
3129
*
3230
* @author Juergen Hoeller
3331
*/
34-
@DisabledForJreRange(min = JAVA_18, disabledReason = "These JPA tests don't pass on Java 18+")
3532
public class EclipseLinkEntityManagerFactoryIntegrationTests extends AbstractContainerEntityManagerFactoryIntegrationTests {
3633

3734
@Test

0 commit comments

Comments
 (0)