Repository: camel Updated Branches: refs/heads/master 8caf2a416 -> 5a7a671c0
CAMEL-11404: Upgrade Hibernate and JPA spec Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7762e671 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7762e671 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7762e671 Branch: refs/heads/master Commit: 7762e671c32fec956654b5b1856106053e268741 Parents: 8caf2a4 Author: James Netherton <jamesnether...@gmail.com> Authored: Tue Jun 20 13:57:55 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jun 22 19:05:43 2017 +0200 ---------------------------------------------------------------------- components/camel-bam/pom.xml | 2 +- components/camel-jpa/pom.xml | 8 +++++++- examples/camel-example-spring-boot-rest-jpa/pom.xml | 1 - .../camel-example-tracer/src/main/resources/features.xml | 8 ++++---- parent/pom.xml | 9 ++++----- platforms/karaf/features/src/main/resources/features.xml | 4 ++-- .../components-starter/camel-bam-starter/pom.xml | 4 ---- .../components-starter/camel-jpa-starter/pom.xml | 2 +- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 4 ++-- .../org/apache/camel/itest/springboot/CamelJpaTest.java | 2 ++ .../main/resources/spring-boot-fix-dependencies.properties | 7 ++----- 11 files changed, 25 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7762e671/components/camel-bam/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-bam/pom.xml b/components/camel-bam/pom.xml index c5a48ab..a03d8dc 100644 --- a/components/camel-bam/pom.xml +++ b/components/camel-bam/pom.xml @@ -60,7 +60,7 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.0_spec</artifactId> + <artifactId>geronimo-jpa_2.1_spec</artifactId> </dependency> <!-- testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/7762e671/components/camel-jpa/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml index a6baef4..09748e8 100644 --- a/components/camel-jpa/pom.xml +++ b/components/camel-jpa/pom.xml @@ -66,7 +66,7 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.0_spec</artifactId> + <artifactId>geronimo-jpa_2.1_spec</artifactId> <scope>provided</scope> </dependency> @@ -85,6 +85,12 @@ <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-persistence-jdbc</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_2.0_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.derby</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/7762e671/examples/camel-example-spring-boot-rest-jpa/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-boot-rest-jpa/pom.xml b/examples/camel-example-spring-boot-rest-jpa/pom.xml index c8e692c..8a6a895 100644 --- a/examples/camel-example-spring-boot-rest-jpa/pom.xml +++ b/examples/camel-example-spring-boot-rest-jpa/pom.xml @@ -61,7 +61,6 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> - <version>5.0.9.Final</version> </dependency> </dependencies> </dependencyManagement> http://git-wip-us.apache.org/repos/asf/camel/blob/7762e671/examples/camel-example-tracer/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-tracer/src/main/resources/features.xml b/examples/camel-example-tracer/src/main/resources/features.xml index e196da7..1326050 100644 --- a/examples/camel-example-tracer/src/main/resources/features.xml +++ b/examples/camel-example-tracer/src/main/resources/features.xml @@ -19,9 +19,9 @@ --> <features> <repository>mvn:org.apache.camel.karaf/apache-camel/${project.version}/xml/features</repository> - + <feature name="jpa-hibernate" version="${project.version}"> - <bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo-jpa2-spec-version}</bundle> + <bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.1_spec/${geronimo-jpa-spec-version}</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/1.2.2_5</bundle> <bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_2</bundle> @@ -35,8 +35,8 @@ <bundle>mvn:org.hibernate/com.springsource.org.hibernate/3.3.2.GA</bundle> <bundle>mvn:org.springframework/spring-orm/${spring-version}</bundle> </feature> - - + + <feature name="camel-example-tracer" version="${project.version}"> <feature version="${project.version}">camel</feature> <feature version="${project.version}">camel-jpa</feature> http://git-wip-us.apache.org/repos/asf/camel/blob/7762e671/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 42077c1..e965d95 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -241,7 +241,7 @@ <geronimo-jcdi-1.1-spec-version>1.0</geronimo-jcdi-1.1-spec-version> <geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version> <geronimo-jms2-spec-version>1.0-alpha-2</geronimo-jms2-spec-version> - <geronimo-jpa2-spec-version>1.1</geronimo-jpa2-spec-version> + <geronimo-jpa-spec-version>1.0-alpha-1</geronimo-jpa-spec-version> <geronimo-jsp-spec-version>1.1</geronimo-jsp-spec-version> <geronimo-json-spec-version>1.0</geronimo-json-spec-version> <geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version> @@ -277,8 +277,7 @@ <hbase-version>1.2.1</hbase-version> <hessian-version>4.0.38</hessian-version> <hibernate-validator-version>5.4.1.Final</hibernate-validator-version> - <!-- Spring 3.2.x and 4.0.x still stick to JPA 2.0. Hibernate 4.3.x upgraded to JPA 2.1. --> - <hibernate-version>4.2.20.Final</hibernate-version> + <hibernate-version>5.0.12.Final</hibernate-version> <hikaricp-version>2.3.13</hikaricp-version> <hk2-version>2.3.0</hk2-version> <hk2-osgi-resource-version>1.0.1</hk2-osgi-resource-version> @@ -3900,8 +3899,8 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.0_spec</artifactId> - <version>${geronimo-jpa2-spec-version}</version> + <artifactId>geronimo-jpa_2.1_spec</artifactId> + <version>${geronimo-jpa-spec-version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/7762e671/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 810d3ab..5f82446 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -203,7 +203,7 @@ <bundle dependency='true'>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle> <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle> - <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo-jpa2-spec-version}</bundle> + <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.1_spec/${geronimo-jpa-spec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle> @@ -1154,7 +1154,7 @@ <feature version='${spring-version-range}'>spring-orm</feature> <feature version='${spring-version-range}'>spring-tx</feature> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation-1.0-spec-version}</bundle> - <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo-jpa2-spec-version}</bundle> + <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.1_spec/${geronimo-jpa-spec-version}</bundle> <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-spec-version}</bundle> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle> http://git-wip-us.apache.org/repos/asf/camel/blob/7762e671/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml b/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml index c78fe92..230855a 100644 --- a/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml @@ -44,10 +44,6 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.0_spec</artifactId> - </exclusion> </exclusions> <!--END OF GENERATED CODE--> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/7762e671/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml index 78cf5ad..b2cc3b9 100644 --- a/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml @@ -58,7 +58,7 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.0_spec</artifactId> + <artifactId>geronimo-jpa_2.1_spec</artifactId> </dependency> <!--END OF GENERATED CODE--> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/7762e671/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index 04e3a39..580275f 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -3001,8 +3001,8 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.0_spec</artifactId> - <version>1.1</version> + <artifactId>geronimo-jpa_2.1_spec</artifactId> + <version>1.0-alpha-1</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/7762e671/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJpaTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJpaTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJpaTest.java index 3104041..467c47a 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJpaTest.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJpaTest.java @@ -35,6 +35,8 @@ public class CamelJpaTest extends AbstractSpringBootTestSupport { public static ITestConfig createTestConfig() { return new ITestConfigBuilder() .module(inferModuleName(CamelJpaTest.class)) + // Exclude tests which require build time enhancement of @Entity annotated classes + .unitTestExclusionPattern(".*(.*Idempotent.*Test$|JpaUsePersistTest$|JpaTraceEventMessageTest$)") .build(); } http://git-wip-us.apache.org/repos/asf/camel/blob/7762e671/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties index 718c2fb..4689625 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties +++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties @@ -15,7 +15,7 @@ ## limitations under the License. ## --------------------------------------------------------------------------- # This file contains additional dependencies needed by camel modules in a spring-boot deployment -# Use comma-separated values to include ultiple dependencies +# Use comma-separated values to include multiple dependencies # Global dependencies included in all modules (except the ones in the list) @@ -46,7 +46,7 @@ camel-jbpm=org.apache.geronimo.specs:geronimo-jms_1.1_spec camel-jcr=org.apache.lucene:lucene-core:${lucene3-version} camel-jira=com.atlassian.jira:jira-rest-java-client camel-jms=org.apache.geronimo.specs:geronimo-jms_1.1_spec -camel-jpa=org.apache.geronimo.specs:geronimo-jpa_2.0_spec +camel-jpa=org.apache.geronimo.specs:geronimo-jpa_2.1_spec camel-kubernetes=org.hibernate:hibernate-validator camel-scala=org.scala-lang:scala-library:${scala-version},org.scala-lang.modules:scala-xml_2.11:${scalaxml-version} @@ -64,8 +64,5 @@ camel-servletlistener=javax.servlet:javax.servlet-api camel-swagger-java=org.hibernate:hibernate-validator -# Needs JPA 2.1 -exclude_camel-bam=org.apache.geronimo.specs:geronimo-jpa_2.0_spec - # Existed for Netty 3 exclude_camel-hbase=io.netty:netty
