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
---
 .../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 ++++++++++++++++++++++
 18 files changed, 250 insertions(+), 250 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/lib')

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