Author: dkulp Date: Thu Sep 6 16:25:56 2012 New Revision: 1381667 URL: http://svn.apache.org/viewvc?rev=1381667&view=rev Log: Merged revisions 1381665 via git cherry-pick from https://svn.apache.org/repos/asf/camel/trunk
........ r1381665 | dkulp | 2012-09-06 12:24:36 -0400 (Thu, 06 Sep 2012) | 2 lines Open up the jaxrs range a bit to allow testing with latest CXF ........ Modified: camel/branches/camel-2.10.x/components/camel-cxf/pom.xml Modified: camel/branches/camel-2.10.x/components/camel-cxf/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/pom.xml?rev=1381667&r1=1381666&r2=1381667&view=diff ============================================================================== --- camel/branches/camel-2.10.x/components/camel-cxf/pom.xml (original) +++ camel/branches/camel-2.10.x/components/camel-cxf/pom.xml Thu Sep 6 16:25:56 2012 @@ -45,7 +45,7 @@ javax.activation*;version="[0.0,2)", javax.annotation*;version="[0.0,2)", javax.jws*;version="[0.0,3)", - javax.ws.rs*;version="[0.0,2)", + javax.ws.rs*;version="[0.0,3)", javax.xml.stream*;version="[0.0,2)", javax.xml.ws*;version="[0.0,3.0)", org.apache.camel.*;${camel.osgi.import.camel.version},