summaryrefslogtreecommitdiff
path: root/qpid/java/lib
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2014-01-31 15:52:15 +0000
committerRobert Gemmell <robbie@apache.org>2014-01-31 15:52:15 +0000
commite39e8353b5321a8ddd9a19054e83822a7b629684 (patch)
tree50b8c6513d4fec6a55e613bb44bf75b607df8332 /qpid/java/lib
parentf7e49d4b3d51aa3b9c1e57032f1ade212552dbac (diff)
downloadqpid-python-e39e8353b5321a8ddd9a19054e83822a7b629684.tar.gz
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
Diffstat (limited to 'qpid/java/lib')
-rw-r--r--qpid/java/lib/poms/geronimo-servlet_3.0_spec-1.0.xml (renamed from qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml)4
-rw-r--r--qpid/java/lib/poms/jetty-continuation-8.1.14.v20131031.xml (renamed from qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml)2
-rw-r--r--qpid/java/lib/poms/jetty-http-8.1.14.v20131031.xml (renamed from qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml)2
-rw-r--r--qpid/java/lib/poms/jetty-io-8.1.14.v20131031.xml (renamed from qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml)2
-rw-r--r--qpid/java/lib/poms/jetty-security-8.1.14.v20131031.xml (renamed from qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml)2
-rw-r--r--qpid/java/lib/poms/jetty-server-8.1.14.v20131031.xml (renamed from qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml)2
-rw-r--r--qpid/java/lib/poms/jetty-servlet-8.1.14.v20131031.xml (renamed from qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml)2
-rw-r--r--qpid/java/lib/poms/jetty-util-8.1.14.v20131031.xml (renamed from qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml)2
-rw-r--r--qpid/java/lib/poms/jetty-websocket-8.1.14.v20131031.xml (renamed from qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml)2
9 files changed, 10 insertions, 10 deletions
diff --git a/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml b/qpid/java/lib/poms/geronimo-servlet_3.0_spec-1.0.xml
index 11228afcfa..5e7093bb0a 100644
--- a/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml
+++ b/qpid/java/lib/poms/geronimo-servlet_3.0_spec-1.0.xml
@@ -17,6 +17,6 @@
-->
<dep>
<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>
</dep>
diff --git a/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-continuation-8.1.14.v20131031.xml
index 5beba95d17..10b7a4c499 100644
--- a/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-continuation-8.1.14.v20131031.xml
@@ -18,5 +18,5 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-continuation</artifactId>
- <version>7.6.10.v20130312</version>
+ <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-8.1.14.v20131031.xml
index 5c840bedd6..929fcbef3a 100644
--- a/qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-http-8.1.14.v20131031.xml
@@ -18,7 +18,7 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-io-8.1.14.v20131031.xml
index 9cec3998ea..42be6ad6ab 100644
--- a/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-io-8.1.14.v20131031.xml
@@ -18,7 +18,7 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-security-8.1.14.v20131031.xml
index 9501750ba0..8079c78d96 100644
--- a/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-security-8.1.14.v20131031.xml
@@ -18,7 +18,7 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-server-8.1.14.v20131031.xml
index 587860b50f..5b8160efd4 100644
--- a/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-server-8.1.14.v20131031.xml
@@ -18,7 +18,7 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
diff --git a/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-servlet-8.1.14.v20131031.xml
index 4c0ff0a41b..5abcf03a18 100644
--- a/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-servlet-8.1.14.v20131031.xml
@@ -18,7 +18,7 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml b/qpid/java/lib/poms/jetty-util-8.1.14.v20131031.xml
index f5c990248f..e134444e44 100644
--- a/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-util-8.1.14.v20131031.xml
@@ -18,5 +18,5 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>7.6.10.v20130312</version>
+ <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-8.1.14.v20131031.xml
index 4d3ebd1666..1592ca3d56 100644
--- a/qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml
+++ b/qpid/java/lib/poms/jetty-websocket-8.1.14.v20131031.xml
@@ -18,7 +18,7 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>