Updated Branches: refs/heads/master 961413cca -> d9dd9ecc5
CAMEL-6751 Upgaded to Jetty 8.1.x and Sevelt API 3.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d9dd9ecc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d9dd9ecc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d9dd9ecc Branch: refs/heads/master Commit: d9dd9ecc5c28ebcf5ed53ef06ec073896a81bf34 Parents: 961413c Author: Willem Jiang <[email protected]> Authored: Mon Sep 16 15:53:51 2013 +0800 Committer: Willem Jiang <[email protected]> Committed: Mon Sep 16 15:53:51 2013 +0800 ---------------------------------------------------------------------- components/camel-http/pom.xml | 2 +- components/camel-http4/pom.xml | 2 +- components/camel-jetty/pom.xml | 23 ++++++++++++++--------- components/camel-servlet/pom.xml | 8 +------- parent/pom.xml | 12 +++++++++--- 5 files changed, 26 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d9dd9ecc/components/camel-http/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml index 6071b90..2e9641f 100644 --- a/components/camel-http/pom.xml +++ b/components/camel-http/pom.xml @@ -45,7 +45,7 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/d9dd9ecc/components/camel-http4/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-http4/pom.xml b/components/camel-http4/pom.xml index adeaa19..93bb090 100644 --- a/components/camel-http4/pom.xml +++ b/components/camel-http4/pom.xml @@ -49,7 +49,7 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/d9dd9ecc/components/camel-jetty/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml index 6450631..1777224 100644 --- a/components/camel-jetty/pom.xml +++ b/components/camel-jetty/pom.xml @@ -46,25 +46,30 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> + <artifactId>jetty-servlet</artifactId> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> + <artifactId>jetty-security</artifactId> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/d9dd9ecc/components/camel-servlet/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml index 98885ae..aaceb82 100644 --- a/components/camel-servlet/pom.xml +++ b/components/camel-servlet/pom.xml @@ -44,12 +44,6 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-http</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -59,7 +53,7 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/d9dd9ecc/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 30602f9..4cbe098 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -151,7 +151,8 @@ <geronimo-jpa2-spec-version>1.1</geronimo-jpa2-spec-version> <geronimo-jsp-spec-version>1.1</geronimo-jsp-spec-version> <geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version> - <geronimo-servlet-spec-version>1.2</geronimo-servlet-spec-version> + <geronimo-servlet-spec-version>1.0</geronimo-servlet-spec-version> + <geronimo-servlet-25-spec-version>1.2</geronimo-servlet-25-spec-version> <geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version> <gmaven-plugin-version>1.4</gmaven-plugin-version> <google-app-engine-version>1.8.3</google-app-engine-version> @@ -212,7 +213,7 @@ <jdom-bundle-version>1.1_4</jdom-bundle-version> <jdom-version>1.1.3</jdom-version> <jedis-client-bundle-version>2.1.0_1</jedis-client-bundle-version> - <jetty-version>7.6.9.v20130131</jetty-version> + <jetty-version>8.1.12.v20130726</jetty-version> <jetty6-bundle-version>6.1.26_4</jetty6-bundle-version> <jetty6-version>6.1.26</jetty6-version> <jettison-version>1.3.4</jettison-version> @@ -346,6 +347,7 @@ <serp-bundle-version>1.14.1_1</serp-bundle-version> <servicemix-specs-version>2.2.0</servicemix-specs-version> <servlet-api-2.5-version>1.1.2</servlet-api-2.5-version> + <servlet-api-3.0-version>1.0</servlet-api-3.0-version> <shiro-version>1.2.2</shiro-version> <!-- use slf4j-api 1.6.x to be easy compatible with older Camel releases --> <slf4j-api-version>1.6.6</slf4j-api-version> @@ -1592,9 +1594,13 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-servlet_2.5_spec</artifactId> + <version>${geronimo-servlet-25-spec-version}</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> <version>${geronimo-servlet-spec-version}</version> </dependency> - <!-- Optional Spring Support --> <dependency> <groupId>org.springframework</groupId>
