Repository: camel Updated Branches: refs/heads/master dcbd8f33e -> 038e1617f
CAMEL-9513 Upgrade the Servlet API to 3.1 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/038e1617 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/038e1617 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/038e1617 Branch: refs/heads/master Commit: 038e1617fb9357cd5e04f90c41f156eaa1e99886 Parents: dcbd8f3 Author: Andrea Cosentino <anco...@gmail.com> Authored: Mon Mar 7 16:48:11 2016 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Wed Mar 9 09:22:45 2016 +0100 ---------------------------------------------------------------------- components/camel-atmosphere-websocket/pom.xml | 7 +++--- components/camel-couchdb/pom.xml | 2 +- components/camel-cxf-transport/pom.xml | 4 ++-- components/camel-gae/pom.xml | 4 ++-- components/camel-http-common/pom.xml | 5 ++-- components/camel-http/pom.xml | 5 ++-- components/camel-jetty-common/pom.xml | 5 ++-- components/camel-jetty8/pom.xml | 5 ++-- components/camel-jetty9/pom.xml | 14 ------------ components/camel-servlet/pom.xml | 11 +++------ components/camel-servletlistener/pom.xml | 4 ++-- components/camel-spring-ws/pom.xml | 4 ++-- components/camel-urlrewrite/pom.xml | 4 ++-- examples/camel-example-gauth/pom.xml | 4 ++-- examples/camel-example-reportincident/pom.xml | 4 ++-- parent/pom.xml | 6 ++--- .../features/src/main/resources/features.xml | 24 ++++++++++---------- 17 files changed, 49 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/components/camel-atmosphere-websocket/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml index afe1faa..efe297a 100644 --- a/components/camel-atmosphere-websocket/pom.xml +++ b/components/camel-atmosphere-websocket/pom.xml @@ -36,7 +36,7 @@ </camel.osgi.export.pkg> <camel.osgi.import.pkg> !org.apache.camel.component.atmosphere.websocket.*, - javax.servlet*;version="2.5", + javax.servlet*;version="3.1.0", org.atmosphere.*;version="${atmosphere-version-range}", org.apache.catalina;resolution:=optional, org.apache.catalina.comet;resolution:=optional, @@ -60,8 +60,9 @@ <artifactId>camel-servlet</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet-api-version}</version> </dependency> <!-- atmosphere --> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/components/camel-couchdb/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-couchdb/pom.xml b/components/camel-couchdb/pom.xml index 5348d4b..a9ca475 100644 --- a/components/camel-couchdb/pom.xml +++ b/components/camel-couchdb/pom.xml @@ -70,4 +70,4 @@ <scope>test</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/components/camel-cxf-transport/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml index 8b6687f..2e99e573 100644 --- a/components/camel-cxf-transport/pom.xml +++ b/components/camel-cxf-transport/pom.xml @@ -77,8 +77,8 @@ </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> </dependency> <!-- OSGi, Blueprint --> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/components/camel-gae/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-gae/pom.xml b/components/camel-gae/pom.xml index 4a356cf..75a7880 100644 --- a/components/camel-gae/pom.xml +++ b/components/camel-gae/pom.xml @@ -51,8 +51,8 @@ <artifactId>camel-servlet</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/components/camel-http-common/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-http-common/pom.xml b/components/camel-http-common/pom.xml index b353bbe..997afd7 100644 --- a/components/camel-http-common/pom.xml +++ b/components/camel-http-common/pom.xml @@ -43,8 +43,9 @@ <artifactId>camel-core</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet-api-version}</version> </dependency> <!-- testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/components/camel-http/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml index 01e370d..91df298 100644 --- a/components/camel-http/pom.xml +++ b/components/camel-http/pom.xml @@ -51,8 +51,9 @@ <artifactId>camel-http-common</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet-api-version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/components/camel-jetty-common/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml index 929f4ff..2bcd010 100644 --- a/components/camel-jetty-common/pom.xml +++ b/components/camel-jetty-common/pom.xml @@ -48,8 +48,9 @@ <artifactId>camel-http-common</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet-api-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/components/camel-jetty8/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty8/pom.xml b/components/camel-jetty8/pom.xml index 5a65250..737c628 100644 --- a/components/camel-jetty8/pom.xml +++ b/components/camel-jetty8/pom.xml @@ -52,8 +52,9 @@ <artifactId>camel-jetty-common</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet-api-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/components/camel-jetty9/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml index d568e18..289cfca 100644 --- a/components/camel-jetty9/pom.xml +++ b/components/camel-jetty9/pom.xml @@ -47,13 +47,6 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-http-common</artifactId> - <exclusions> - <!-- must use the servlet-api that jetty 9 provides which is 3.1 --> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -95,13 +88,6 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-jetty-common</artifactId> - <exclusions> - <!-- must use the servlet-api that jetty 9 provides which is 3.1 --> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> - </exclusion> - </exclusions> </dependency> <!-- test dependencies --> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/components/camel-servlet/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml index 2307262..9cc129d 100644 --- a/components/camel-servlet/pom.xml +++ b/components/camel-servlet/pom.xml @@ -46,12 +46,6 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-http-common</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -59,8 +53,9 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet-api-version}</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/components/camel-servletlistener/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-servletlistener/pom.xml b/components/camel-servletlistener/pom.xml index 92c1099..d59802b 100644 --- a/components/camel-servletlistener/pom.xml +++ b/components/camel-servletlistener/pom.xml @@ -43,8 +43,8 @@ <artifactId>camel-core</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/components/camel-spring-ws/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml index 2d32b8c..e748952 100644 --- a/components/camel-spring-ws/pom.xml +++ b/components/camel-spring-ws/pom.xml @@ -70,8 +70,8 @@ </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/components/camel-urlrewrite/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-urlrewrite/pom.xml b/components/camel-urlrewrite/pom.xml index 73a761b..5f59671 100644 --- a/components/camel-urlrewrite/pom.xml +++ b/components/camel-urlrewrite/pom.xml @@ -52,8 +52,8 @@ <version>${urlrewritefilter-version}</version> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/examples/camel-example-gauth/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-gauth/pom.xml b/examples/camel-example-gauth/pom.xml index aaa4407..a211889 100644 --- a/examples/camel-example-gauth/pom.xml +++ b/examples/camel-example-gauth/pom.xml @@ -43,8 +43,8 @@ <artifactId>camel-gae</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/examples/camel-example-reportincident/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml index 423286f..7408bc8 100755 --- a/examples/camel-example-reportincident/pom.xml +++ b/examples/camel-example-reportincident/pom.xml @@ -65,8 +65,8 @@ </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 924c3b9..e62d21a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -2062,9 +2062,9 @@ <version>${geronimo-jta-spec-version}</version> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> - <version>${geronimo-servlet-spec-version}</version> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet-api-version}</version> </dependency> <!-- Optional Spring Support --> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/038e1617/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 33864f4..0062335 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -291,7 +291,7 @@ <feature name='camel-cometd' version='${project.version}' resolver='(obr)' start-level='50'> <feature>jetty</feature> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> + <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-cometd/${project.version}</bundle> </feature> @@ -306,7 +306,7 @@ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> - <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> + <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <bundle>mvn:org.apache.camel/camel-couchdb/${project.version}</bundle> </feature> <feature name='camel-crypto' version='${project.version}' resolver='(obr)' start-level='50'> @@ -713,7 +713,7 @@ <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> - <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> + <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle> <bundle>mvn:org.apache.camel/camel-http/${project.version}</bundle> </feature> @@ -721,7 +721,7 @@ <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> - <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> + <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle> <bundle>mvn:org.apache.camel/camel-http4/${project.version}</bundle> </feature> @@ -729,7 +729,7 @@ <feature version='${project.version}'>camel-core</feature> <feature>transaction</feature> <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> - <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> + <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <bundle dependency='true'>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle> @@ -917,7 +917,7 @@ mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation-1.0-spec-version} </bundle> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo-jpa2-spec-version}</bundle> - <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> + <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <feature version='${spring-version-range-karaf}'>spring-tx</feature> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-spec-version}</bundle> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle> @@ -951,7 +951,7 @@ <bundle>mvn:org.apache.camel/camel-jsonpath/${project.version}</bundle> </feature> <feature name='camel-jt400' version='${project.version}' resolver='(obr)' start-level='50'> - <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> + <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jt400/${jt400-bundle-version}</bundle> <feature version='${project.version}'>camel-core</feature> <feature>transaction</feature> @@ -1133,7 +1133,7 @@ <feature version='${project.version}'>camel-core</feature> <feature version='${project.version}'>camel-spring</feature> <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> - <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> + <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <bundle dependency='true'>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle> <bundle dependency='true'>mvn:org.mybatis/mybatis/${mybatis-version}</bundle> @@ -1334,7 +1334,7 @@ <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle> - <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> + <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <bundle dependency='true'>mvn:org.cometd.java/cometd-java-client/${cometd-java-client-version}</bundle> <bundle dependency='true'>mvn:org.cometd.java/bayeux-api/${cometd-java-client-version}</bundle> <bundle dependency='true'>mvn:org.cometd.java/cometd-java-common/${cometd-java-client-version}</bundle> @@ -1428,7 +1428,7 @@ <bundle dependency='true'>mvn:com.googlecode.json-simple/json-simple/${json-simple-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> - <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> + <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-slack/${project.version}</bundle> </feature> @@ -1702,7 +1702,7 @@ <bundle>mvn:org.apache.camel/camel-vertx/${project.version}</bundle> </feature> <feature name='camel-velocity' version='${project.version}' resolver='(obr)' start-level='50'> - <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> + <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle> @@ -1722,7 +1722,7 @@ <feature name='camel-websocket' version='${project.version}' resolver='(obr)' start-level='50'> <feature>jetty</feature> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> + <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <bundle>mvn:org.apache.camel/camel-websocket/${project.version}</bundle> </feature> <feature name='camel-xmlbeans' version='${project.version}' resolver='(obr)' start-level='50'>
