From e39e8353b5321a8ddd9a19054e83822a7b629684 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Fri, 31 Jan 2014 15:52:15 +0000
Subject: QPID-5527: Upgrade to Jetty 8

Applied patch from Emmanuel Bourg.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1563153 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/amqp-1-0-client-websocket/pom.xml        | 20 ++++++------
 qpid/java/broker-plugins/management-http/pom.xml   | 20 ++++++------
 .../server/management/plugin/HttpManagement.java   |  4 +--
 qpid/java/broker-plugins/websocket/pom.xml         | 20 ++++++------
 qpid/java/build.deps                               | 18 +++++------
 qpid/java/ivy.retrieve.xml                         | 18 +++++------
 qpid/java/jca/build.xml                            |  2 +-
 .../java/jca/example/build-geronimo-properties.xml |  3 +-
 qpid/java/jca/pom.xml                              |  4 +--
 .../lib/poms/geronimo-servlet_2.5_spec-1.2.xml     | 22 -------------
 .../lib/poms/geronimo-servlet_3.0_spec-1.0.xml     | 22 +++++++++++++
 .../poms/jetty-continuation-7.6.10.v20130312.xml   | 22 -------------
 .../poms/jetty-continuation-8.1.14.v20131031.xml   | 22 +++++++++++++
 qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml | 28 -----------------
 qpid/java/lib/poms/jetty-http-8.1.14.v20131031.xml | 28 +++++++++++++++++
 qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml   | 28 -----------------
 qpid/java/lib/poms/jetty-io-8.1.14.v20131031.xml   | 28 +++++++++++++++++
 .../lib/poms/jetty-security-7.6.10.v20130312.xml   | 28 -----------------
 .../lib/poms/jetty-security-8.1.14.v20131031.xml   | 28 +++++++++++++++++
 .../lib/poms/jetty-server-7.6.10.v20130312.xml     | 36 ----------------------
 .../lib/poms/jetty-server-8.1.14.v20131031.xml     | 36 ++++++++++++++++++++++
 .../lib/poms/jetty-servlet-7.6.10.v20130312.xml    | 28 -----------------
 .../lib/poms/jetty-servlet-8.1.14.v20131031.xml    | 28 +++++++++++++++++
 qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml | 22 -------------
 qpid/java/lib/poms/jetty-util-8.1.14.v20131031.xml | 22 +++++++++++++
 .../lib/poms/jetty-websocket-7.6.10.v20130312.xml  | 36 ----------------------
 .../lib/poms/jetty-websocket-8.1.14.v20131031.xml  | 36 ++++++++++++++++++++++
 27 files changed, 304 insertions(+), 305 deletions(-)
 delete mode 100644 qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml
 create mode 100644 qpid/java/lib/poms/geronimo-servlet_3.0_spec-1.0.xml
 delete mode 100644 qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml
 create mode 100644 qpid/java/lib/poms/jetty-continuation-8.1.14.v20131031.xml
 delete mode 100644 qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml
 create mode 100644 qpid/java/lib/poms/jetty-http-8.1.14.v20131031.xml
 delete mode 100644 qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml
 create mode 100644 qpid/java/lib/poms/jetty-io-8.1.14.v20131031.xml
 delete mode 100644 qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml
 create mode 100644 qpid/java/lib/poms/jetty-security-8.1.14.v20131031.xml
 delete mode 100644 qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml
 create mode 100644 qpid/java/lib/poms/jetty-server-8.1.14.v20131031.xml
 delete mode 100644 qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml
 create mode 100644 qpid/java/lib/poms/jetty-servlet-8.1.14.v20131031.xml
 delete mode 100644 qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml
 create mode 100644 qpid/java/lib/poms/jetty-util-8.1.14.v20131031.xml
 delete mode 100644 qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml
 create mode 100644 qpid/java/lib/poms/jetty-websocket-8.1.14.v20131031.xml

(limited to 'qpid/java')

diff --git a/qpid/java/amqp-1-0-client-websocket/pom.xml b/qpid/java/amqp-1-0-client-websocket/pom.xml
index 205e0d5ab7..3862fb0fc5 100644
--- a/qpid/java/amqp-1-0-client-websocket/pom.xml
+++ b/qpid/java/amqp-1-0-client-websocket/pom.xml
@@ -44,15 +44,15 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.2</version>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <version>1.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -73,14 +73,14 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-continuation</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-security</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -105,7 +105,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-io</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -131,14 +131,14 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-websocket</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
diff --git a/qpid/java/broker-plugins/management-http/pom.xml b/qpid/java/broker-plugins/management-http/pom.xml
index abc754902a..57b2dd863b 100644
--- a/qpid/java/broker-plugins/management-http/pom.xml
+++ b/qpid/java/broker-plugins/management-http/pom.xml
@@ -50,15 +50,15 @@
 
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.5_spec</artifactId>
-      <version>1.2</version>
+      <artifactId>geronimo-servlet_3.0_spec</artifactId>
+      <version>1.0</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -79,14 +79,14 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-continuation</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-security</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-io</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -125,7 +125,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -138,14 +138,14 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-websocket</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 039114056f..3375a784ea 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -29,6 +29,7 @@ import javax.net.ssl.KeyManager;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
+import javax.servlet.DispatcherType;
 
 import org.apache.log4j.Logger;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
@@ -77,7 +78,6 @@ import org.apache.qpid.server.plugin.PluginFactory;
 import org.apache.qpid.server.util.MapValueConverter;
 import org.apache.qpid.transport.network.security.ssl.QpidMultipleTrustManager;
 import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.DispatcherType;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.SessionManager;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
@@ -396,7 +396,7 @@ public class HttpManagement extends AbstractPluginAdapter implements HttpManagem
         root.addServlet(new ServletHolder(new LogFileServlet()), "/rest/logfile");
 
         final SessionManager sessionManager = root.getSessionHandler().getSessionManager();
-        sessionManager.setSessionCookie(JSESSIONID_COOKIE_PREFIX + lastPort);
+        sessionManager.getSessionCookieConfig().setName(JSESSIONID_COOKIE_PREFIX + lastPort);
         sessionManager.setMaxInactiveInterval((Integer)getAttribute(TIME_OUT));
 
         return server;
diff --git a/qpid/java/broker-plugins/websocket/pom.xml b/qpid/java/broker-plugins/websocket/pom.xml
index 2029bd33aa..fb55be05c8 100644
--- a/qpid/java/broker-plugins/websocket/pom.xml
+++ b/qpid/java/broker-plugins/websocket/pom.xml
@@ -38,15 +38,15 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.2</version>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <version>1.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -67,14 +67,14 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-continuation</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-security</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-io</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -113,7 +113,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -126,14 +126,14 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-websocket</artifactId>
-            <version>7.6.10.v20130312</version>
+            <version>8.1.14.v20131031</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index 58dea7009e..4dc5b0ca46 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -35,7 +35,7 @@ geronimo-j2ee=lib/required/geronimo-j2ee-connector_1.5_spec-2.0.0.jar
 geronimo-jta=lib/required/geronimo-jta_1.1_spec-1.1.1.jar
 geronimo-kernel=lib/required/geronimo-kernel-2.2.1.jar
 geronimo-openejb=lib/required/geronimo-ejb_3.0_spec-1.0.1.jar
-geronimo-servlet=lib/required/geronimo-servlet_2.5_spec-1.2.jar
+geronimo-servlet=lib/required/geronimo-servlet_3.0_spec-1.0.jar
 
 junit=lib/required/junit-3.8.1.jar
 mockito-all=lib/required/mockito-all-1.9.0.jar
@@ -49,14 +49,14 @@ slf4j-log4j=lib/required/slf4j-log4j12-1.6.4.jar
 
 xalan=lib/required/xalan-2.7.0.jar
 
-jetty=lib/required/jetty-server-7.6.10.v20130312.jar
-jetty-continuation=lib/required/jetty-continuation-7.6.10.v20130312.jar
-jetty-security=lib/required/jetty-security-7.6.10.v20130312.jar
-jetty-util=lib/required/jetty-util-7.6.10.v20130312.jar
-jetty-io=lib/required/jetty-io-7.6.10.v20130312.jar
-jetty-http=lib/required/jetty-http-7.6.10.v20130312.jar
-jetty-servlet=lib/required/jetty-servlet-7.6.10.v20130312.jar
-jetty-websocket=lib/required/jetty-websocket-7.6.10.v20130312.jar
+jetty=lib/required/jetty-server-8.1.14.v20131031.jar
+jetty-continuation=lib/required/jetty-continuation-8.1.14.v20131031.jar
+jetty-security=lib/required/jetty-security-8.1.14.v20131031.jar
+jetty-util=lib/required/jetty-util-8.1.14.v20131031.jar
+jetty-io=lib/required/jetty-io-8.1.14.v20131031.jar
+jetty-http=lib/required/jetty-http-8.1.14.v20131031.jar
+jetty-servlet=lib/required/jetty-servlet-8.1.14.v20131031.jar
+jetty-websocket=lib/required/jetty-websocket-8.1.14.v20131031.jar
 servlet-api=${geronimo-servlet}
 
 dojo-version=1.9.1
diff --git a/qpid/java/ivy.retrieve.xml b/qpid/java/ivy.retrieve.xml
index 388e2d0dc4..59b3fa70af 100644
--- a/qpid/java/ivy.retrieve.xml
+++ b/qpid/java/ivy.retrieve.xml
@@ -49,7 +49,7 @@
     <dependency org="org.apache.geronimo.specs" name="geronimo-j2ee-connector_1.5_spec" rev="2.0.0" transitive="false"/>
     <dependency org="org.apache.geronimo.specs" name="geronimo-jms_1.1_spec" rev="1.0" transitive="false"/>
     <dependency org="org.apache.geronimo.specs" name="geronimo-jta_1.1_spec" rev="1.1.1" transitive="false"/>
-    <dependency org="org.apache.geronimo.specs" name="geronimo-servlet_2.5_spec" rev="1.2" transitive="false"/>
+    <dependency org="org.apache.geronimo.specs" name="geronimo-servlet_3.0_spec" rev="1.0" transitive="false"/>
     <dependency org="com.google.code.gson" name="gson" rev="2.0" transitive="false"/>
     <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.9.0" transitive="false"/>
     <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.9.0" transitive="false"/>
@@ -61,14 +61,14 @@
     <dependency org="org.mockito" name="mockito-all" rev="1.9.0" transitive="false"/>
     <dependency org="org.slf4j" name="slf4j-api" rev="1.6.4" transitive="false"/>
     <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.4" transitive="false"/>
-    <dependency org="org.eclipse.jetty" name="jetty-server" rev="7.6.10.v20130312" transitive="false"/>
-    <dependency org="org.eclipse.jetty" name="jetty-websocket" rev="7.6.10.v20130312" transitive="false"/>
-    <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="7.6.10.v20130312" transitive="false"/>
-    <dependency org="org.eclipse.jetty" name="jetty-io" rev="7.6.10.v20130312" transitive="false"/>
-    <dependency org="org.eclipse.jetty" name="jetty-http" rev="7.6.10.v20130312" transitive="false"/>
-    <dependency org="org.eclipse.jetty" name="jetty-security" rev="7.6.10.v20130312" transitive="false"/>
-    <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="7.6.10.v20130312" transitive="false"/>
-    <dependency org="org.eclipse.jetty" name="jetty-util" rev="7.6.10.v20130312" transitive="false"/>
+    <dependency org="org.eclipse.jetty" name="jetty-server" rev="8.1.14.v20131031" transitive="false"/>
+    <dependency org="org.eclipse.jetty" name="jetty-websocket" rev="8.1.14.v20131031" transitive="false"/>
+    <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="8.1.14.v20131031" transitive="false"/>
+    <dependency org="org.eclipse.jetty" name="jetty-io" rev="8.1.14.v20131031" transitive="false"/>
+    <dependency org="org.eclipse.jetty" name="jetty-http" rev="8.1.14.v20131031" transitive="false"/>
+    <dependency org="org.eclipse.jetty" name="jetty-security" rev="8.1.14.v20131031" transitive="false"/>
+    <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="8.1.14.v20131031" transitive="false"/>
+    <dependency org="org.eclipse.jetty" name="jetty-util" rev="8.1.14.v20131031" transitive="false"/>
     <dependency org="xalan" name="xalan" rev="2.7.0" transitive="false"/>
     <dependency org="velocity" name="velocity" rev="1.4" transitive="false"/>
     <dependency org="velocity" name="velocity-dep" rev="1.4" transitive="false"/>
diff --git a/qpid/java/jca/build.xml b/qpid/java/jca/build.xml
index 7137467e4b..83cc781ba9 100644
--- a/qpid/java/jca/build.xml
+++ b/qpid/java/jca/build.xml
@@ -24,7 +24,7 @@
   <property name="module.name" value="jca"/>
 
   <property name="module.genpom" value="true"/>
-  <property name="module.genpom.args" value="-Sgeronimo-j2ee-connector_1.5_spec=provided -Sgeronimo-jta_1.1_spec=provided -Sgeronimo-jms_1.1_spec=provided -Sgeronimo-ejb_3.0_spec=provided -Sgeronimo-servlet_2.5_spec=provided -Sgeronimo-kernel=provided"/>
+  <property name="module.genpom.args" value="-Sgeronimo-j2ee-connector_1.5_spec=provided -Sgeronimo-jta_1.1_spec=provided -Sgeronimo-jms_1.1_spec=provided -Sgeronimo-ejb_3.0_spec=provided -Sgeronimo-servlet_3.0_spec=provided -Sgeronimo-kernel=provided"/>
 
   <import file="../module.xml"/>
 
diff --git a/qpid/java/jca/example/build-geronimo-properties.xml b/qpid/java/jca/example/build-geronimo-properties.xml
index a20753117f..3c84b7634a 100644
--- a/qpid/java/jca/example/build-geronimo-properties.xml
+++ b/qpid/java/jca/example/build-geronimo-properties.xml
@@ -87,7 +87,6 @@
     <path id="compile.classpath">
         <fileset dir="${geronimo.home}/repository/org/apache/geronimo/specs">
             <include name="geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1.jar"/>
-            <include name="geronimo-servlet_2.5_spec/1.2/geronimo-servlet_2.5_spec-1.2.jar"/>
             <include name="geronimo-ejb_3.0_spec/1.0.1/geronimo-ejb_3.0_spec-1.0.1.jar"/>
             <include name="geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar"/>
 
@@ -113,7 +112,7 @@
         <fileset dir="${geronimo.home}/repository/org/apache/geronimo/specs">
             <include name="geronimo-j2ee-connector_1.5_spec/2.0.0/geronimo-j2ee-connector_1.5_spec-2.0.0.jar"/>
             <include name="geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1.jar"/>
-            <include name="geronimo-servlet_2.5_spec/1.2/geronimo-servlet_2.5_spec-1.2.jar"/>
+            <include name="geronimo-servlet_3.0_spec/1.0/geronimo-servlet_3.0_spec-1.0.jar"/>
             <include name="geronimo-ejb_3.0_spec/1.0.1/geronimo-ejb_3.0_spec-1.0.1.jar"/>
             <include name="geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar"/>
         </fileset>
diff --git a/qpid/java/jca/pom.xml b/qpid/java/jca/pom.xml
index 859b8aabac..c7a8de61fe 100644
--- a/qpid/java/jca/pom.xml
+++ b/qpid/java/jca/pom.xml
@@ -70,8 +70,8 @@
 
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.5_spec</artifactId>
-      <version>1.2</version>
+      <artifactId>geronimo-servlet_3.0_spec</artifactId>
+      <version>1.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml b/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml
deleted file mode 100644
index 11228afcfa..0000000000
--- a/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <groupId>org.apache.geronimo.specs</groupId>
-  <artifactId>geronimo-servlet_2.5_spec</artifactId>
-  <version>1.2</version>
-</dep>
diff --git a/qpid/java/lib/poms/geronimo-servlet_3.0_spec-1.0.xml b/qpid/java/lib/poms/geronimo-servlet_3.0_spec-1.0.xml
new file mode 100644
index 0000000000..5e7093bb0a
--- /dev/null
+++ b/qpid/java/lib/poms/geronimo-servlet_3.0_spec-1.0.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<dep>
+  <groupId>org.apache.geronimo.specs</groupId>
+  <artifactId>geronimo-servlet_3.0_spec</artifactId>
+  <version>1.0</version>
+</dep>
diff --git a/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml
deleted file mode 100644
index 5beba95d17..0000000000
--- a/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-continuation</artifactId>
-  <version>7.6.10.v20130312</version>
-</dep>
diff --git a/qpid/java/lib/poms/jetty-continuation-8.1.14.v20131031.xml b/qpid/java/lib/poms/jetty-continuation-8.1.14.v20131031.xml
new file mode 100644
index 0000000000..10b7a4c499
--- /dev/null
+++ b/qpid/java/lib/poms/jetty-continuation-8.1.14.v20131031.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<dep>
+  <groupId>org.eclipse.jetty</groupId>
+  <artifactId>jetty-continuation</artifactId>
+  <version>8.1.14.v20131031</version>
+</dep>
diff --git a/qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml
deleted file mode 100644
index 5c840bedd6..0000000000
--- a/qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-http</artifactId>
-  <version>7.6.10.v20130312</version>
-  <exclusions>
-    <exclusion>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-io</artifactId>
-    </exclusion>
-  </exclusions>
-</dep>
diff --git a/qpid/java/lib/poms/jetty-http-8.1.14.v20131031.xml b/qpid/java/lib/poms/jetty-http-8.1.14.v20131031.xml
new file mode 100644
index 0000000000..929fcbef3a
--- /dev/null
+++ b/qpid/java/lib/poms/jetty-http-8.1.14.v20131031.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<dep>
+  <groupId>org.eclipse.jetty</groupId>
+  <artifactId>jetty-http</artifactId>
+  <version>8.1.14.v20131031</version>
+  <exclusions>
+    <exclusion>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+    </exclusion>
+  </exclusions>
+</dep>
diff --git a/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml
deleted file mode 100644
index 9cec3998ea..0000000000
--- a/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-io</artifactId>
-  <version>7.6.10.v20130312</version>
-  <exclusions>
-    <exclusion>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-    </exclusion>
-  </exclusions>
-</dep>
diff --git a/qpid/java/lib/poms/jetty-io-8.1.14.v20131031.xml b/qpid/java/lib/poms/jetty-io-8.1.14.v20131031.xml
new file mode 100644
index 0000000000..42be6ad6ab
--- /dev/null
+++ b/qpid/java/lib/poms/jetty-io-8.1.14.v20131031.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<dep>
+  <groupId>org.eclipse.jetty</groupId>
+  <artifactId>jetty-io</artifactId>
+  <version>8.1.14.v20131031</version>
+  <exclusions>
+    <exclusion>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+    </exclusion>
+  </exclusions>
+</dep>
diff --git a/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml
deleted file mode 100644
index 9501750ba0..0000000000
--- a/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-security</artifactId>
-  <version>7.6.10.v20130312</version>
-  <exclusions>
-    <exclusion>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-    </exclusion>
-  </exclusions>
-</dep>
diff --git a/qpid/java/lib/poms/jetty-security-8.1.14.v20131031.xml b/qpid/java/lib/poms/jetty-security-8.1.14.v20131031.xml
new file mode 100644
index 0000000000..8079c78d96
--- /dev/null
+++ b/qpid/java/lib/poms/jetty-security-8.1.14.v20131031.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<dep>
+  <groupId>org.eclipse.jetty</groupId>
+  <artifactId>jetty-security</artifactId>
+  <version>8.1.14.v20131031</version>
+  <exclusions>
+    <exclusion>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+    </exclusion>
+  </exclusions>
+</dep>
diff --git a/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml
deleted file mode 100644
index 587860b50f..0000000000
--- a/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-server</artifactId>
-  <version>7.6.10.v20130312</version>
-  <exclusions>
-    <exclusion>
-      <groupId>org.eclipse.jetty.orbit</groupId>
-      <artifactId>javax.servlet</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-continuation</artifactId>
-    </exclusion>
-     <exclusion>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-http</artifactId>
-    </exclusion>
-  </exclusions>
-</dep>
diff --git a/qpid/java/lib/poms/jetty-server-8.1.14.v20131031.xml b/qpid/java/lib/poms/jetty-server-8.1.14.v20131031.xml
new file mode 100644
index 0000000000..5b8160efd4
--- /dev/null
+++ b/qpid/java/lib/poms/jetty-server-8.1.14.v20131031.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<dep>
+  <groupId>org.eclipse.jetty</groupId>
+  <artifactId>jetty-server</artifactId>
+  <version>8.1.14.v20131031</version>
+  <exclusions>
+    <exclusion>
+      <groupId>org.eclipse.jetty.orbit</groupId>
+      <artifactId>javax.servlet</artifactId>
+    </exclusion>
+    <exclusion>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+    </exclusion>
+     <exclusion>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+    </exclusion>
+  </exclusions>
+</dep>
diff --git a/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml
deleted file mode 100644
index 4c0ff0a41b..0000000000
--- a/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-servlet</artifactId>
-  <version>7.6.10.v20130312</version>
-  <exclusions>
-    <exclusion>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-security</artifactId>
-    </exclusion>
-  </exclusions>
-</dep>
diff --git a/qpid/java/lib/poms/jetty-servlet-8.1.14.v20131031.xml b/qpid/java/lib/poms/jetty-servlet-8.1.14.v20131031.xml
new file mode 100644
index 0000000000..5abcf03a18
--- /dev/null
+++ b/qpid/java/lib/poms/jetty-servlet-8.1.14.v20131031.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<dep>
+  <groupId>org.eclipse.jetty</groupId>
+  <artifactId>jetty-servlet</artifactId>
+  <version>8.1.14.v20131031</version>
+  <exclusions>
+    <exclusion>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+    </exclusion>
+  </exclusions>
+</dep>
diff --git a/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml
deleted file mode 100644
index f5c990248f..0000000000
--- a/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-util</artifactId>
-  <version>7.6.10.v20130312</version>
-</dep>
diff --git a/qpid/java/lib/poms/jetty-util-8.1.14.v20131031.xml b/qpid/java/lib/poms/jetty-util-8.1.14.v20131031.xml
new file mode 100644
index 0000000000..e134444e44
--- /dev/null
+++ b/qpid/java/lib/poms/jetty-util-8.1.14.v20131031.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<dep>
+  <groupId>org.eclipse.jetty</groupId>
+  <artifactId>jetty-util</artifactId>
+  <version>8.1.14.v20131031</version>
+</dep>
diff --git a/qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml
deleted file mode 100644
index 4d3ebd1666..0000000000
--- a/qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-websocket</artifactId>
-  <version>7.6.10.v20130312</version>
-  <exclusions>
-    <exclusion>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-io</artifactId>
-    </exclusion>
-    <exclusion>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-http</artifactId>
-    </exclusion>
-  </exclusions>
-</dep>
diff --git a/qpid/java/lib/poms/jetty-websocket-8.1.14.v20131031.xml b/qpid/java/lib/poms/jetty-websocket-8.1.14.v20131031.xml
new file mode 100644
index 0000000000..1592ca3d56
--- /dev/null
+++ b/qpid/java/lib/poms/jetty-websocket-8.1.14.v20131031.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<dep>
+  <groupId>org.eclipse.jetty</groupId>
+  <artifactId>jetty-websocket</artifactId>
+  <version>8.1.14.v20131031</version>
+  <exclusions>
+    <exclusion>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+    </exclusion>
+    <exclusion>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+    </exclusion>
+    <exclusion>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+    </exclusion>
+  </exclusions>
+</dep>
-- 
cgit v1.2.1