Author: chirino
Date: Tue Nov 27 17:46:23 2012
New Revision: 1414284
URL: http://svn.apache.org/viewvc?rev=1414284&view=rev
Log:
Switch to the servlet 3.0 API
Modified:
activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
activemq/activemq-apollo/trunk/apollo-distro/pom.xml
activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml
activemq/activemq-apollo/trunk/pom.xml
Modified: activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/pom.xml?rev=1414284&r1=1414283&r2=1414284&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/pom.xml Tue Nov 27 17:46:23 2012
@@ -56,8 +56,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
<version>${servlet-api-version}</version>
<scope>provided</scope>
</dependency>
Modified: activemq/activemq-apollo/trunk/apollo-distro/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/pom.xml?rev=1414284&r1=1414283&r2=1414284&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/pom.xml Tue Nov 27 17:46:23
2012
@@ -99,8 +99,8 @@
<version>${jetty-version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
<version>${servlet-api-version}</version>
</dependency>
<dependency>
Modified: activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml?rev=1414284&r1=1414283&r2=1414284&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml Tue Nov 27 17:46:23
2012
@@ -106,8 +106,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
<version>${servlet-api-version}</version>
<scope>provided</scope>
</dependency>
Modified: activemq/activemq-apollo/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1414284&r1=1414283&r2=1414284&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Tue Nov 27 17:46:23 2012
@@ -112,7 +112,7 @@
<scalate-version>1.5.3</scalate-version>
<scalamd-version>1.5</scalamd-version>
- <servlet-api-version>2.5</servlet-api-version>
+ <servlet-api-version>3.0.0.v201112011016</servlet-api-version>
<jackson-version>2.1.0</jackson-version>
<logback-version>0.9.24</logback-version>
<jersey-version>1.7</jersey-version>
