From f2323b6bc25a18b70e947a401dbc64e5dbab1d8d Mon Sep 17 00:00:00 2001
From: Andy Taylor <andytaylor@apache.org>
Date: Tue, 27 Jan 2015 16:24:50 +0000
Subject: [PATCH] upgrade to jetty 8 to be consistent with ActiveMQ 5

---
 activemq-web/pom.xml                            | 2 +-
 distribution/activemq/pom.xml                   | 2 +-
 distribution/activemq/src/main/assembly/dep.xml | 3 ++-
 pom.xml                                         | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index 22898ee9c4..5121f99e4e 100644
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -45,7 +45,7 @@
       </dependency>
       <dependency>
          <groupId>org.eclipse.jetty.aggregate</groupId>
-         <artifactId>jetty-all-server</artifactId>
+         <artifactId>jetty-all</artifactId>
       </dependency>
       <dependency>
          <groupId>junit</groupId>
diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml
index 16529bc22a..6962143fc3 100644
--- a/distribution/activemq/pom.xml
+++ b/distribution/activemq/pom.xml
@@ -154,7 +154,7 @@
        </dependency>
        <dependency>
           <groupId>org.eclipse.jetty.aggregate</groupId>
-          <artifactId>jetty-all-server</artifactId>
+          <artifactId>jetty-all</artifactId>
        </dependency>
        <dependency>
           <groupId>org.apache.geronimo.specs</groupId>
diff --git a/distribution/activemq/src/main/assembly/dep.xml b/distribution/activemq/src/main/assembly/dep.xml
index 04c7724f65..15bffeb16b 100644
--- a/distribution/activemq/src/main/assembly/dep.xml
+++ b/distribution/activemq/src/main/assembly/dep.xml
@@ -61,7 +61,8 @@
             <include>io.airlift:airline</include>
             <include>com.google.guava:guava</include>
             <include>javax.inject:javax.inject</include>
-            <include>org.eclipse.jetty.aggregate:jetty-all-server</include>
+            <include>org.eclipse.jetty.aggregate:jetty-all</include>
+            <include>org.apache.geronimo.specs:</include>
             <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
          </includes>
          <!--excludes>
diff --git a/pom.xml b/pom.xml
index 9b6faeb844..c3ae18af4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -385,8 +385,8 @@
          <!-- ## Jetty web Dependencies ##-->
          <dependency>
             <groupId>org.eclipse.jetty.aggregate</groupId>
-            <artifactId>jetty-all-server</artifactId>
-            <version>7.6.9.v20130131</version>
+            <artifactId>jetty-all</artifactId>
+            <version>8.1.16.v20140903</version>
             <!-- License: (Joint): Apache 2.0 & EPL 1.0 -->
         </dependency>
         <dependency>