You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2013/10/23 08:20:48 UTC
git commit: CAMEL-6886: Replace the SMX JPA 1.0 spec. bundle
dependency with the Geronimo JPA 2 spec. bundle.
Updated Branches:
refs/heads/master 2019236e3 -> f98301227
CAMEL-6886: Replace the SMX JPA 1.0 spec. bundle dependency with the Geronimo JPA 2 spec. bundle.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f9830122
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f9830122
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f9830122
Branch: refs/heads/master
Commit: f983012279bec48451532d3bf4f20d601357962a
Parents: 2019236
Author: Babak Vahdat <bv...@apache.org>
Authored: Wed Oct 23 08:20:39 2013 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Wed Oct 23 08:20:39 2013 +0200
----------------------------------------------------------------------
.../camel-example-tracer/src/main/resources/features.xml | 2 +-
parent/pom.xml | 10 ----------
platforms/karaf/features/src/main/resources/features.xml | 2 +-
3 files changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f9830122/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 e06f2be..5f74aa8 100644
--- a/examples/camel-example-tracer/src/main/resources/features.xml
+++ b/examples/camel-example-tracer/src/main/resources/features.xml
@@ -19,7 +19,7 @@
<repository>mvn:org.apache.camel.karaf/apache-camel/${project.version}/xml/features</repository>
<feature name="jpa-hibernate" version="${project.version}">
- <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/1.4.0</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo-jpa2-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>
http://git-wip-us.apache.org/repos/asf/camel/blob/f9830122/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 09e75f4..2e4b608 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1590,20 +1590,10 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
- <version>${geronimo-jpa-spec-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<version>${geronimo-jpa2-spec-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.java-persistence-api-1.1.1</artifactId>
- <version>${servicemix-specs-version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<version>${geronimo-jta-spec-version}</version>
http://git-wip-us.apache.org/repos/asf/camel/blob/f9830122/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 ef76476..c02dbe1 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -120,8 +120,8 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-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.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix-specs-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>
<feature version='${spring-version-range}'>spring-orm</feature>