This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch hib in repository https://gitbox.apache.org/repos/asf/camel.git
commit f26e2a370d9bb01120acfc072a9eb6ce9bf913fa Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Sun May 19 09:33:43 2024 +0200 Remove hibernate from camel-openjpa as it was not working and they dont have Derby database driver anymore --- components/camel-jpa/pom.xml | 47 ---------------------- .../camel-jpa/src/main/docs/jpa-component.adoc | 2 +- parent/pom.xml | 1 - 3 files changed, 1 insertion(+), 49 deletions(-) diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml index 62e834bd1fe..73843128fde 100644 --- a/components/camel-jpa/pom.xml +++ b/components/camel-jpa/pom.xml @@ -126,11 +126,6 @@ <profiles> <profile> <id>openjpa</id> - <activation> - <property> - <name>!hibernate</name> - </property> - </activation> <build> <pluginManagement> <plugins> @@ -211,48 +206,6 @@ </dependency> </dependencies> </profile> - <profile> - <id>hibernate</id> - <activation> - <property> - <name>hibernate</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-hibernate-persistence-xml</id> - <goals> - <goal>copy-resources</goal> - </goals> - <phase>generate-test-resources</phase> - <configuration> - <resources> - <resource> - <directory> - ${project.basedir}/src/test/resources/profiles/hibernate/META-INF - </directory> - </resource> - </resources> - <outputDirectory>${project.build.testOutputDirectory}/META-INF</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-jakarta</artifactId> - <version>${hibernate-version}</version> - <scope>test</scope> - </dependency> - </dependencies> - </profile> <profile> <id>full</id> <activation> diff --git a/components/camel-jpa/src/main/docs/jpa-component.adoc b/components/camel-jpa/src/main/docs/jpa-component.adoc index 3c9bb8ae64f..5319ca82f03 100644 --- a/components/camel-jpa/src/main/docs/jpa-component.adoc +++ b/components/camel-jpa/src/main/docs/jpa-component.adoc @@ -17,7 +17,7 @@ The JPA component enables you to store and retrieve Java objects from persistent storage using EJB 3's Java Persistence Architecture (JPA). JPA is a standard interface layer that wraps Object/Relational Mapping -(ORM) products such as OpenJPA, Hibernate, TopLink, and so on. +(ORM) products such as OpenJPA, Hibernate, and so on. Maven users will need to add the following dependency to their `pom.xml` for this component: diff --git a/parent/pom.xml b/parent/pom.xml index e5241f35eba..10f5b7c8f52 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -214,7 +214,6 @@ <hazelcast-version>5.3.7</hazelcast-version> <hdrhistrogram-version>2.1.12</hdrhistrogram-version> <hibernate-validator-version>8.0.1.Final</hibernate-validator-version> - <hibernate-version>6.3.2.Final</hibernate-version> <hk2-version>2.6.1</hk2-version> <hsqldb-version>2.7.2</hsqldb-version> <httpunit-version>1.7</httpunit-version>