This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new b5048e9f966 Update jpa tests to OpenJPA 4.0.0
b5048e9f966 is described below
commit b5048e9f966068c0f068bc448552d37f723ee582
Author: Croway <[email protected]>
AuthorDate: Tue May 28 12:26:39 2024 +0200
Update jpa tests to OpenJPA 4.0.0
---
components/camel-jpa/pom.xml | 5 +----
.../apache/camel/processor/jpa/JpaPollingConsumerLockEntityTest.java | 3 ++-
parent/pom.xml | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index daaafe2afa0..62e834bd1fe 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -34,7 +34,7 @@
<properties>
<!-- Needs to be investigated: crashes on CI on s390x -->
<skipTests.s390x>true</skipTests.s390x>
-
<camel.surefire.fork.additional-vmargs>-javaagent:${project.basedir}/target/openjpa-${openjpa-version}-jakarta.jar
-Xmx3G</camel.surefire.fork.additional-vmargs>
+
<camel.surefire.fork.additional-vmargs>-javaagent:${project.basedir}/target/openjpa-${openjpa-version}.jar
-Xmx3G</camel.surefire.fork.additional-vmargs>
<camel.surefire.forkTimeout>240</camel.surefire.forkTimeout>
</properties>
@@ -188,7 +188,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${openjpa-version}</version>
- <classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
@@ -209,7 +208,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${openjpa-version}</version>
- <classifier>jakarta</classifier>
</dependency>
</dependencies>
</profile>
@@ -280,7 +278,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${openjpa-version}</version>
- <classifier>jakarta</classifier>
<outputDirectory>${project.build.directory}</outputDirectory>
</artifactItem>
</artifactItems>
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPollingConsumerLockEntityTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPollingConsumerLockEntityTest.java
index 641b019a4db..f67f1f343a5 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPollingConsumerLockEntityTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPollingConsumerLockEntityTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.processor.jpa;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
import jakarta.persistence.OptimisticLockException;
@@ -62,7 +63,7 @@ public class JpaPollingConsumerLockEntityTest extends
AbstractJpaTest {
template.asyncRequestBodyAndHeaders("direct:locked", "message",
headers);
template.asyncRequestBodyAndHeaders("direct:locked", "message",
headers);
- MockEndpoint.assertIsSatisfied(context);
+ MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
}
@Test
diff --git a/parent/pom.xml b/parent/pom.xml
index e4df94274e6..41bf550e2a9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -381,7 +381,7 @@
<olingo4-version>5.0.0</olingo4-version>
<ognl-version>3.4.3</ognl-version>
<openapi-generator>7.5.0</openapi-generator>
- <openjpa-version>3.2.2</openjpa-version>
+ <openjpa-version>4.0.0</openjpa-version>
<opensearch-rest-client-version>2.14.0</opensearch-rest-client-version>
<opensearch-java-client-version>2.10.3</opensearch-java-client-version>
<opensearch-version>2.11.0</opensearch-version>
