Author: hadrian
Date: Thu Apr 7 15:54:04 2011
New Revision: 1089923
URL: http://svn.apache.org/viewvc?rev=1089923&view=rev
Log:
CAMEL-3829. Backport fix to the 2.7.x branch
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-http/ (props changed)
camel/branches/camel-2.7.x/components/camel-jpa/pom.xml
camel/branches/camel-2.7.x/parent/pom.xml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 15:54:04 2011
@@ -1 +1 @@
-/camel/trunk:1089275
+/camel/trunk:1087856,1089275
Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 15:54:04 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1089275
+/camel/trunk/components/camel-http:917526,1087856,1089275
Modified: camel/branches/camel-2.7.x/components/camel-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-jpa/pom.xml?rev=1089923&r1=1089922&r2=1089923&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-jpa/pom.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-jpa/pom.xml Thu Apr 7 15:54:04
2011
@@ -66,11 +66,10 @@
<artifactId>spring-orm</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <groupId>org.apache.servicemix.specs</groupId>
+
<artifactId>org.apache.servicemix.specs.java-persistence-api-1.1.1</artifactId>
<scope>provided</scope>
- </dependency>
-
+ </dependency>
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
Modified: camel/branches/camel-2.7.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/parent/pom.xml?rev=1089923&r1=1089922&r2=1089923&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/parent/pom.xml (original)
+++ camel/branches/camel-2.7.x/parent/pom.xml Thu Apr 7 15:54:04 2011
@@ -977,6 +977,12 @@
</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-jsp_2.1_spec</artifactId>
<version>${geronimo-jsp-spec-version}</version>
