Return-Path: 
 <commits-return-20678-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 7BA119EE4
	for <apmail-activemq-commits-archive@www.apache.org>;
 Tue, 27 Nov 2012 17:46:49 +0000 (UTC)
Received: (qmail 44791 invoked by uid 500); 27 Nov 2012 17:46:49 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 44748 invoked by uid 500); 27 Nov 2012 17:46:49 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 44737 invoked by uid 99); 27 Nov 2012 17:46:49 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Nov 2012 17:46:49 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Nov 2012 17:46:46 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B6CEF23889F7;
	Tue, 27 Nov 2012 17:46:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1414284 - in /activemq/activemq-apollo/trunk:
 apollo-bdb/pom.xml apollo-distro/pom.xml apollo-leveldb/pom.xml pom.xml
Date: Tue, 27 Nov 2012 17:46:24 -0000
To: commits@activemq.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121127174625.B6CEF23889F7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>