Author: dkulp Date: Wed Jul 11 20:50:36 2012 New Revision: 1360389 URL: http://svn.apache.org/viewvc?rev=1360389&view=rev Log: Merged revisions 1360248 via git cherry-pick from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
........ r1360248 | dkulp | 2012-07-11 11:57:42 -0400 (Wed, 11 Jul 2012) | 10 lines Merged revisions 1360241 via git cherry-pick from https://svn.apache.org/repos/asf/camel/trunk ........ r1360241 | dkulp | 2012-07-11 11:52:56 -0400 (Wed, 11 Jul 2012) | 2 lines Open up the cxf range a bit to allow testing with cxf trunk ........ ........ Modified: camel/branches/camel-2.9.x/parent/pom.xml Modified: camel/branches/camel-2.9.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1360389&r1=1360388&r2=1360389&view=diff ============================================================================== --- camel/branches/camel-2.9.x/parent/pom.xml (original) +++ camel/branches/camel-2.9.x/parent/pom.xml Wed Jul 11 20:50:36 2012 @@ -177,7 +177,7 @@ <camel.osgi.import.defaults> org.springframework.*;version="[3,4)", org.apache.commons.logging.*;version="[1.1,2)", - org.apache.cxf.*;version="[2.4,2.7)", + org.apache.cxf.*;version="[2.4,2.8)", org.apache.qpid.*;version="[0.12,0.13)", org.apache.abdera.*;version="[0.4,2)", org.apache.commons.httpclient.*;version="[3.1,4.0)",
