Repository: camel Updated Branches: refs/heads/master ef669f95a -> 8f425e763
CAMEL-9627: Fixed camel-cxf-transport osgi bundle wont install in karaf. Use same pom.xml magic we do in camel-servlet to make the OSGi gods happy. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8f425e76 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8f425e76 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8f425e76 Branch: refs/heads/master Commit: 8f425e763520559b0be647218db5d48cedc82d43 Parents: ef669f9 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Feb 20 15:49:51 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Feb 20 15:49:51 2016 +0100 ---------------------------------------------------------------------- components/camel-cxf-transport/pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8f425e76/components/camel-cxf-transport/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml index 6990bd9..8b6687f 100644 --- a/components/camel-cxf-transport/pom.xml +++ b/components/camel-cxf-transport/pom.xml @@ -30,6 +30,9 @@ <description>Camel Transport for CXF </description> <properties> + <camel.osgi.import.before.defaults> + javax.servlet.*;version="${servlet-version-range}" + </camel.osgi.import.before.defaults> <camel.osgi.import> !org.apache.camel.component.cxf.*, !META-INF.cxf.camel, @@ -39,7 +42,6 @@ javax.ws.rs*;version="[0.0,2)", javax.xml.stream*;version="[0.0,2)", javax.xml.ws*;version="[0.0,3.0)", - javax.servlet*;resolution="optional";version="[0,4)", org.apache.camel.*;${camel.osgi.import.camel.version}, org.springframework*;version="${spring-version-range}";resolution:=optional, ${camel.osgi.import.defaults},
