Servlet range in osgi should be 3.x and we need to ensure to fix this in all those bundles. Fixed it camel-cxf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fb9b3fcb Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fb9b3fcb Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fb9b3fcb Branch: refs/heads/master Commit: fb9b3fcb0ef1794b9a5646f3912cc8eeb4b120f1 Parents: 821c771 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Mar 12 11:39:02 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Mar 12 11:39:02 2016 +0100 ---------------------------------------------------------------------- components/camel-cxf-transport/pom.xml | 4 +--- parent/pom.xml | 2 +- .../src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fb9b3fcb/components/camel-cxf-transport/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml index 2e99e573..4a537f6 100644 --- a/components/camel-cxf-transport/pom.xml +++ b/components/camel-cxf-transport/pom.xml @@ -30,15 +30,13 @@ <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, javax.activation*;version="[0.0,2)", javax.annotation*;version="[0.0,2)", javax.jws*;version="[0.0,3)", + javax.servlet.*;version="${servlet-version-range}", javax.ws.rs*;version="[0.0,2)", javax.xml.stream*;version="[0.0,2)", javax.xml.ws*;version="[0.0,3.0)", http://git-wip-us.apache.org/repos/asf/camel/blob/fb9b3fcb/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 6046dcc..0f9b608 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -473,7 +473,7 @@ <serp-bundle-version>1.14.1_1</serp-bundle-version> <servicemix-specs-version>2.6.0</servicemix-specs-version> <servlet-api-3.0-version>1.0</servlet-api-3.0-version> - <servlet-version-range>[2.5,4)</servlet-version-range> + <servlet-version-range>[3,4)</servlet-version-range> <shiro-version>1.2.4</shiro-version> <shrinkwrap-descriptors-version>2.0.0-alpha-8</shrinkwrap-descriptors-version> <sip-api-version>1.1</sip-api-version> http://git-wip-us.apache.org/repos/asf/camel/blob/fb9b3fcb/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java index 36aaaa7..6c55b9f 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java @@ -36,7 +36,7 @@ public class CamelCxfTest extends AbstractFeatureTest { @Configuration public static Option[] configure() { - return configure(COMPONENT); + return configure(COMPONENT, "cxf-jaxb"); } } \ No newline at end of file
