Author: hadrian
Date: Thu Apr 7 15:57:24 2011
New Revision: 1089927
URL: http://svn.apache.org/viewvc?rev=1089927&view=rev
Log:
CAMEL-3844. Backport to camel-2.7.x
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/parent/pom.xml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 15:57:24 2011
@@ -1 +1 @@
-/camel/trunk:1087856,1089275
+/camel/trunk:1087856,1088583,1089275
Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 15:57:24 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1087856,1089275
+/camel/trunk/components/camel-http:917526,1087856,1088583,1089275
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=1089927&r1=1089926&r2=1089927&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:57:24 2011
@@ -160,7 +160,7 @@
<camel.osgi.import.defaults>
org.springframework.*;version="[3,4)",
org.apache.commons.logging.*;version="[1.1,2)",
- org.apache.cxf.*;version="[2.3.2,2.4)",
+ org.apache.cxf.*;version="[2.3.2,2.5)",
org.apache.qpid.*;version="[0.5,0.6)",
org.apache.abdera.*;version="[0.4,0.5)",
org.apache.commons.httpclient.*;version="[3.1,4.0)",
