From 13be62c3169f4278d62692ca162850c67be3cb4b Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Mon, 22 Apr 2013 17:25:11 +0000
Subject: [PATCH] SOLR-4738: Upgrade jetty to 8.1.10.v20130312

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1470626 13f79535-47bb-0310-9956-ffa450edef68
---
 dev-tools/maven/pom.xml.template                           | 2 +-
 solr/CHANGES.txt                                           | 2 ++
 solr/example/ivy.xml                                       | 2 +-
 solr/licenses/jetty-continuation-8.1.10.v20130312.jar.sha1 | 1 +
 solr/licenses/jetty-continuation-8.1.8.v20121106.jar.sha1  | 1 -
 solr/licenses/jetty-deploy-8.1.10.v20130312.jar.sha1       | 1 +
 solr/licenses/jetty-deploy-8.1.8.v20121106.jar.sha1        | 1 -
 solr/licenses/jetty-http-8.1.10.v20130312.jar.sha1         | 1 +
 solr/licenses/jetty-http-8.1.8.v20121106.jar.sha1          | 1 -
 solr/licenses/jetty-io-8.1.10.v20130312.jar.sha1           | 1 +
 solr/licenses/jetty-io-8.1.8.v20121106.jar.sha1            | 1 -
 solr/licenses/jetty-jmx-8.1.10.v20130312.jar.sha1          | 1 +
 solr/licenses/jetty-jmx-8.1.8.v20121106.jar.sha1           | 1 -
 solr/licenses/jetty-security-8.1.10.v20130312.jar.sha1     | 1 +
 solr/licenses/jetty-security-8.1.8.v20121106.jar.sha1      | 1 -
 solr/licenses/jetty-server-8.1.10.v20130312.jar.sha1       | 1 +
 solr/licenses/jetty-server-8.1.8.v20121106.jar.sha1        | 1 -
 solr/licenses/jetty-servlet-8.1.10.v20130312.jar.sha1      | 1 +
 solr/licenses/jetty-servlet-8.1.8.v20121106.jar.sha1       | 1 -
 solr/licenses/jetty-util-8.1.10.v20130312.jar.sha1         | 1 +
 solr/licenses/jetty-util-8.1.8.v20121106.jar.sha1          | 1 -
 solr/licenses/jetty-webapp-8.1.10.v20130312.jar.sha1       | 1 +
 solr/licenses/jetty-webapp-8.1.8.v20121106.jar.sha1        | 1 -
 solr/licenses/jetty-xml-8.1.10.v20130312.jar.sha1          | 1 +
 solr/licenses/jetty-xml-8.1.8.v20121106.jar.sha1           | 1 -
 solr/licenses/start.jar.sha1                               | 2 +-
 26 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 solr/licenses/jetty-continuation-8.1.10.v20130312.jar.sha1
 delete mode 100644 solr/licenses/jetty-continuation-8.1.8.v20121106.jar.sha1
 create mode 100644 solr/licenses/jetty-deploy-8.1.10.v20130312.jar.sha1
 delete mode 100644 solr/licenses/jetty-deploy-8.1.8.v20121106.jar.sha1
 create mode 100644 solr/licenses/jetty-http-8.1.10.v20130312.jar.sha1
 delete mode 100644 solr/licenses/jetty-http-8.1.8.v20121106.jar.sha1
 create mode 100644 solr/licenses/jetty-io-8.1.10.v20130312.jar.sha1
 delete mode 100644 solr/licenses/jetty-io-8.1.8.v20121106.jar.sha1
 create mode 100644 solr/licenses/jetty-jmx-8.1.10.v20130312.jar.sha1
 delete mode 100644 solr/licenses/jetty-jmx-8.1.8.v20121106.jar.sha1
 create mode 100644 solr/licenses/jetty-security-8.1.10.v20130312.jar.sha1
 delete mode 100644 solr/licenses/jetty-security-8.1.8.v20121106.jar.sha1
 create mode 100644 solr/licenses/jetty-server-8.1.10.v20130312.jar.sha1
 delete mode 100644 solr/licenses/jetty-server-8.1.8.v20121106.jar.sha1
 create mode 100644 solr/licenses/jetty-servlet-8.1.10.v20130312.jar.sha1
 delete mode 100644 solr/licenses/jetty-servlet-8.1.8.v20121106.jar.sha1
 create mode 100644 solr/licenses/jetty-util-8.1.10.v20130312.jar.sha1
 delete mode 100644 solr/licenses/jetty-util-8.1.8.v20121106.jar.sha1
 create mode 100644 solr/licenses/jetty-webapp-8.1.10.v20130312.jar.sha1
 delete mode 100644 solr/licenses/jetty-webapp-8.1.8.v20121106.jar.sha1
 create mode 100644 solr/licenses/jetty-xml-8.1.10.v20130312.jar.sha1
 delete mode 100644 solr/licenses/jetty-xml-8.1.8.v20121106.jar.sha1

diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index b4980789ca5..6cb132e20c4 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -44,7 +44,7 @@
     <base.specification.version>5.0.0</base.specification.version>
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
     <java.compat.version>1.7</java.compat.version>
-    <jetty.version>8.1.8.v20121106</jetty.version>
+    <jetty.version>8.1.10.v20130312</jetty.version>
     <slf4j.version>1.6.6</slf4j.version>
     <log4j.version>1.2.16</log4j.version>
     <tika.version>1.3</tika.version>
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 18d497707d5..2453ba346dc 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -76,6 +76,8 @@ Other Changes
 * SOLR-2079: Add option to pass HttpServletRequest in the SolrQueryRequest context map.
   (Tomás Fernández Löbbe via Robert Muir)
 
+* SOLR-4738: Update Jetty to 8.1.10.v20130312 (Mark Miller, Robert Muir)
+
 ==================  4.3.0 ==================
 
 Versions of Major Components
diff --git a/solr/example/ivy.xml b/solr/example/ivy.xml
index 6d2ebd78d04..9b62bcf97a8 100644
--- a/solr/example/ivy.xml
+++ b/solr/example/ivy.xml
@@ -17,7 +17,7 @@
    under the License.    
 -->
 <!DOCTYPE ivy-module [
-  <!ENTITY jetty.version "8.1.8.v20121106">
+  <!ENTITY jetty.version "8.1.10.v20130312">
 ]>
 <ivy-module version="2.0">
     <info organisation="org.apache.solr" module="example"/>
diff --git a/solr/licenses/jetty-continuation-8.1.10.v20130312.jar.sha1 b/solr/licenses/jetty-continuation-8.1.10.v20130312.jar.sha1
new file mode 100644
index 00000000000..40d32c2e00f
--- /dev/null
+++ b/solr/licenses/jetty-continuation-8.1.10.v20130312.jar.sha1
@@ -0,0 +1 @@
+c0e26574ddcac7a86486f19a8b3782657acfd961
diff --git a/solr/licenses/jetty-continuation-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-continuation-8.1.8.v20121106.jar.sha1
deleted file mode 100644
index c209db50e79..00000000000
--- a/solr/licenses/jetty-continuation-8.1.8.v20121106.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a237d7057c35ae73b821b0f601746dc9a578c361
diff --git a/solr/licenses/jetty-deploy-8.1.10.v20130312.jar.sha1 b/solr/licenses/jetty-deploy-8.1.10.v20130312.jar.sha1
new file mode 100644
index 00000000000..7262965587b
--- /dev/null
+++ b/solr/licenses/jetty-deploy-8.1.10.v20130312.jar.sha1
@@ -0,0 +1 @@
+875b96ef84e3b83a40b3aac9e473434d6414a389
diff --git a/solr/licenses/jetty-deploy-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-deploy-8.1.8.v20121106.jar.sha1
deleted file mode 100644
index 006b26c039d..00000000000
--- a/solr/licenses/jetty-deploy-8.1.8.v20121106.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-30672b112c7f72a721d8e92d6b5ba250be57d094
diff --git a/solr/licenses/jetty-http-8.1.10.v20130312.jar.sha1 b/solr/licenses/jetty-http-8.1.10.v20130312.jar.sha1
new file mode 100644
index 00000000000..7cc91649c4e
--- /dev/null
+++ b/solr/licenses/jetty-http-8.1.10.v20130312.jar.sha1
@@ -0,0 +1 @@
+d9eb53007e04d6338f12f3ded60fad1f7bfcb40e
diff --git a/solr/licenses/jetty-http-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-http-8.1.8.v20121106.jar.sha1
deleted file mode 100644
index 1ead45e0ef4..00000000000
--- a/solr/licenses/jetty-http-8.1.8.v20121106.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5f3f0a4b1dbc4a36f97649c9fee940134fe584ca
diff --git a/solr/licenses/jetty-io-8.1.10.v20130312.jar.sha1 b/solr/licenses/jetty-io-8.1.10.v20130312.jar.sha1
new file mode 100644
index 00000000000..2ba8e66bf24
--- /dev/null
+++ b/solr/licenses/jetty-io-8.1.10.v20130312.jar.sha1
@@ -0,0 +1 @@
+e829c768f2b9de5d9fae3bc0aba3996bd0344f56
diff --git a/solr/licenses/jetty-io-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-io-8.1.8.v20121106.jar.sha1
deleted file mode 100644
index 558d9e0ea83..00000000000
--- a/solr/licenses/jetty-io-8.1.8.v20121106.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b413448bb6d474b82bb3d988604d3df988a689e3
diff --git a/solr/licenses/jetty-jmx-8.1.10.v20130312.jar.sha1 b/solr/licenses/jetty-jmx-8.1.10.v20130312.jar.sha1
new file mode 100644
index 00000000000..e400550c907
--- /dev/null
+++ b/solr/licenses/jetty-jmx-8.1.10.v20130312.jar.sha1
@@ -0,0 +1 @@
+6e48870e2af2caf2a77751eae3a79bfcf6b90a78
diff --git a/solr/licenses/jetty-jmx-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-jmx-8.1.8.v20121106.jar.sha1
deleted file mode 100644
index d4e12194fa3..00000000000
--- a/solr/licenses/jetty-jmx-8.1.8.v20121106.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a798ea58162ac462657a21497c84c76a57f20d4f
diff --git a/solr/licenses/jetty-security-8.1.10.v20130312.jar.sha1 b/solr/licenses/jetty-security-8.1.10.v20130312.jar.sha1
new file mode 100644
index 00000000000..2de8273372f
--- /dev/null
+++ b/solr/licenses/jetty-security-8.1.10.v20130312.jar.sha1
@@ -0,0 +1 @@
+a386e7f0a8b9157b99a2f29a6deac61e007a2b9b
diff --git a/solr/licenses/jetty-security-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-security-8.1.8.v20121106.jar.sha1
deleted file mode 100644
index 10545888c22..00000000000
--- a/solr/licenses/jetty-security-8.1.8.v20121106.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b3efb0450900cf30932c9acf6e47deb936fac2d7
diff --git a/solr/licenses/jetty-server-8.1.10.v20130312.jar.sha1 b/solr/licenses/jetty-server-8.1.10.v20130312.jar.sha1
new file mode 100644
index 00000000000..2674565b8f6
--- /dev/null
+++ b/solr/licenses/jetty-server-8.1.10.v20130312.jar.sha1
@@ -0,0 +1 @@
+13ca9587bc1645f8fac89454b15252a2ad5bdcf5
diff --git a/solr/licenses/jetty-server-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-server-8.1.8.v20121106.jar.sha1
deleted file mode 100644
index 73d71178687..00000000000
--- a/solr/licenses/jetty-server-8.1.8.v20121106.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-61e7c2d0cb168d82696f8fabb8c4da834d736e78
diff --git a/solr/licenses/jetty-servlet-8.1.10.v20130312.jar.sha1 b/solr/licenses/jetty-servlet-8.1.10.v20130312.jar.sha1
new file mode 100644
index 00000000000..ac4faaac6ca
--- /dev/null
+++ b/solr/licenses/jetty-servlet-8.1.10.v20130312.jar.sha1
@@ -0,0 +1 @@
+98f8029fe7236e9c66381c04f292b5319f47ca84
diff --git a/solr/licenses/jetty-servlet-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-servlet-8.1.8.v20121106.jar.sha1
deleted file mode 100644
index 56b39be9f07..00000000000
--- a/solr/licenses/jetty-servlet-8.1.8.v20121106.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-285ea47746e9ab988a8291ea9fd6545b537e0ce9
diff --git a/solr/licenses/jetty-util-8.1.10.v20130312.jar.sha1 b/solr/licenses/jetty-util-8.1.10.v20130312.jar.sha1
new file mode 100644
index 00000000000..cff356ddd4e
--- /dev/null
+++ b/solr/licenses/jetty-util-8.1.10.v20130312.jar.sha1
@@ -0,0 +1 @@
+d198a8ad8ea20b4fb74c781175c48500ec2b8b7a
diff --git a/solr/licenses/jetty-util-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-util-8.1.8.v20121106.jar.sha1
deleted file mode 100644
index 7c12f4ab4ae..00000000000
--- a/solr/licenses/jetty-util-8.1.8.v20121106.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-03174e8d53033e3c4d350eba3112efdc170b40dc
diff --git a/solr/licenses/jetty-webapp-8.1.10.v20130312.jar.sha1 b/solr/licenses/jetty-webapp-8.1.10.v20130312.jar.sha1
new file mode 100644
index 00000000000..fded150fab4
--- /dev/null
+++ b/solr/licenses/jetty-webapp-8.1.10.v20130312.jar.sha1
@@ -0,0 +1 @@
+a3353244b93e895f1ca8f607077f247063470233
diff --git a/solr/licenses/jetty-webapp-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-webapp-8.1.8.v20121106.jar.sha1
deleted file mode 100644
index 6cceaf86424..00000000000
--- a/solr/licenses/jetty-webapp-8.1.8.v20121106.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5beadb7635372ed38c543dd82e2e270a409b1ab8
diff --git a/solr/licenses/jetty-xml-8.1.10.v20130312.jar.sha1 b/solr/licenses/jetty-xml-8.1.10.v20130312.jar.sha1
new file mode 100644
index 00000000000..db8de90f5d3
--- /dev/null
+++ b/solr/licenses/jetty-xml-8.1.10.v20130312.jar.sha1
@@ -0,0 +1 @@
+96eb17dd4265732b0cb9cd15e36f83633832dd65
diff --git a/solr/licenses/jetty-xml-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-xml-8.1.8.v20121106.jar.sha1
deleted file mode 100644
index 643f7a9f848..00000000000
--- a/solr/licenses/jetty-xml-8.1.8.v20121106.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1f03630eea10f58899442af3626ac0aba33d7ea2
diff --git a/solr/licenses/start.jar.sha1 b/solr/licenses/start.jar.sha1
index 44d32ab8351..a375ce17183 100644
--- a/solr/licenses/start.jar.sha1
+++ b/solr/licenses/start.jar.sha1
@@ -1 +1 @@
-5f657368cd61ab70babe98bcd6709e199a4829d9
+8e1a37a8daae3f222d957012f826047497466a56