This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch openjpa4 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4d4e35d424a3b36e70ba1d0258a209521142f7f6 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Sun May 19 09:27:41 2024 +0200 Upgrade openjpa to 4.0 --- components/camel-jpa/pom.xml | 5 +---- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 5 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/parent/pom.xml b/parent/pom.xml index a473dbaa41c..e5241f35eba 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.13.0</opensearch-rest-client-version> <opensearch-java-client-version>2.10.2</opensearch-java-client-version> <opensearch-version>2.11.0</opensearch-version>