Author: ningjiang
Date: Sat Nov 19 13:44:33 2011
New Revision: 1203978
URL: http://svn.apache.org/viewvc?rev=1203978&view=rev
Log:
CAMEL-4697 Using servlet API 2.5 across the camel components
Modified:
camel/trunk/components/camel-http/pom.xml
camel/trunk/components/camel-http4/pom.xml
camel/trunk/components/camel-jetty/pom.xml
camel/trunk/components/camel-servlet/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-http/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/pom.xml?rev=1203978&r1=1203977&r2=1203978&view=diff
==============================================================================
--- camel/trunk/components/camel-http/pom.xml (original)
+++ camel/trunk/components/camel-http/pom.xml Sat Nov 19 13:44:33 2011
@@ -43,13 +43,13 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
+ <version>${httpclient-version}</version>
</dependency>
<!-- testing -->
Modified: camel/trunk/components/camel-http4/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/pom.xml?rev=1203978&r1=1203977&r2=1203978&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/pom.xml (original)
+++ camel/trunk/components/camel-http4/pom.xml Sat Nov 19 13:44:33 2011
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Modified: camel/trunk/components/camel-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/pom.xml?rev=1203978&r1=1203977&r2=1203978&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/pom.xml (original)
+++ camel/trunk/components/camel-jetty/pom.xml Sat Nov 19 13:44:33 2011
@@ -46,6 +46,10 @@
<artifactId>camel-http</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
@@ -56,6 +60,12 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Modified: camel/trunk/components/camel-servlet/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/pom.xml?rev=1203978&r1=1203977&r2=1203978&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/pom.xml (original)
+++ camel/trunk/components/camel-servlet/pom.xml Sat Nov 19 13:44:33 2011
@@ -49,14 +49,14 @@
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -78,6 +78,12 @@
<dependency>
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1203978&r1=1203977&r2=1203978&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Nov 19 13:44:33 2011
@@ -76,7 +76,7 @@
<geronimo-jpa2-spec-version>1.1</geronimo-jpa2-spec-version>
<geronimo-jsp-spec-version>1.0.1</geronimo-jsp-spec-version>
<geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
- <geronimo-servlet-spec-version>1.1.1</geronimo-servlet-spec-version>
+ <geronimo-servlet-spec-version>1.1.2</geronimo-servlet-spec-version>
<groovy-version>1.8.4</groovy-version>
<guiceyfruit-version>2.0</guiceyfruit-version>
<h2-version>1.3.161</h2-version>
@@ -1055,7 +1055,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>${geronimo-servlet-spec-version}</version>
</dependency>
