SOLR-4839: Upgrade jetty to 9.2.10.v20150310 in trunk. Also, moved the change log entry to 6.0.0 until we backport to 5x.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1675261 13f79535-47bb-0310-9956-ffa450edef68
2015-04-22 05:57:28 +00:00 · 2015-04-22 05:57:28 +00:00 · ede96a0dd1
parent 3c1c7279dc
commit ede96a0dd1
40 changed files with 24 additions and 24 deletions
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@ -184,7 +184,7 @@ org.codehaus.jackson.version = 1.9.13
 /org.codehaus.woodstox/woodstox-core-asl = 4.4.1
 /org.easymock/easymock = 3.0

-org.eclipse.jetty.version = 9.2.9.v20150224
+org.eclipse.jetty.version = 9.2.10.v20150310
 /org.eclipse.jetty/jetty-continuation = ${org.eclipse.jetty.version}
 /org.eclipse.jetty/jetty-deploy = ${org.eclipse.jetty.version}
 /org.eclipse.jetty/jetty-http = ${org.eclipse.jetty.version}
--- a/lucene/licenses/jetty-continuation-9.2.10.v20150310.jar.sha1
+++ b/lucene/licenses/jetty-continuation-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+1c9bc80037e9898974ada7318f11c984363d4707
--- a/lucene/licenses/jetty-continuation-9.2.9.v20150224.jar.sha1
+++ b/lucene/licenses/jetty-continuation-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-476cae89c420170549b4851ed58dca25f349d16d
--- a/lucene/licenses/jetty-http-9.2.10.v20150310.jar.sha1
+++ b/lucene/licenses/jetty-http-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+886b628f62cd518bbb04b37bd1b308fa19340a53
--- a/lucene/licenses/jetty-http-9.2.9.v20150224.jar.sha1
+++ b/lucene/licenses/jetty-http-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-8b30ddc8304df24a36efbfa267acc24b7403b692
--- a/lucene/licenses/jetty-io-9.2.10.v20150310.jar.sha1
+++ b/lucene/licenses/jetty-io-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+29bc6a5e2049d9858bfa811f2728a7a8efcdc1c0
--- a/lucene/licenses/jetty-io-9.2.9.v20150224.jar.sha1
+++ b/lucene/licenses/jetty-io-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-06a4a23ee9decf2762d052bc2ae0501c08cc9023
--- a/lucene/licenses/jetty-server-9.2.10.v20150310.jar.sha1
+++ b/lucene/licenses/jetty-server-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+0e6b8bff28b3e9ca6254415d2aa49603a5887fe8
--- a/lucene/licenses/jetty-server-9.2.9.v20150224.jar.sha1
+++ b/lucene/licenses/jetty-server-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-d30a52e992c3484569f58763f55097a1da3202ee
--- a/lucene/licenses/jetty-servlet-9.2.10.v20150310.jar.sha1
+++ b/lucene/licenses/jetty-servlet-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+9e923adf1671af7da09dba778e132ab0a9c62415
--- a/lucene/licenses/jetty-servlet-9.2.9.v20150224.jar.sha1
+++ b/lucene/licenses/jetty-servlet-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-1797875a3cc524d181733f323866a5f7bbca03a7
--- a/lucene/licenses/jetty-util-9.2.10.v20150310.jar.sha1
+++ b/lucene/licenses/jetty-util-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+90cc75668dc9a9885108733d4d46420907cf863c
--- a/lucene/licenses/jetty-util-9.2.9.v20150224.jar.sha1
+++ b/lucene/licenses/jetty-util-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-b5fb774a02158e9f66fed949581159a8d0dfcbe1
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@ -27,7 +27,7 @@ Carrot2 3.9.0
 Velocity 1.7 and Velocity Tools 2.0
 Apache UIMA 2.3.1
 Apache ZooKeeper 3.4.6
-Jetty 9.2.9.v20150224
+Jetty 9.2.10.v20150310

 System Requirements
 ----------------------
@ -61,6 +61,9 @@ Other Changes
 * SOLR-7355: Switch from Google's ConcurrentLinkedHashMap to Caffeine.  Only
  affects HDFS support. (Ben Manes via Shawn Heisey)

+* SOLR-4839: Upgrade Jetty to 9.2.10.v20150310 and restlet-jee to 2.3.0
+  (Bill Bell, Timothy Potter, Uwe Schindler, Mark Miller, shalin)
+
 ==================  5.2.0 ==================

 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
@ -1326,9 +1329,6 @@ Other Changes
 * SOLR-6905: Test pseudo-field retrieval in distributed search.
  (Ramkumar Aiyengar via shalin)

-* SOLR-4839: Upgrade Jetty to 9.2.6.v20141205 and restlet-jee to 2.3.0
-  (Bill Bell, Timothy Potter, Uwe Schindler, Mark Miller, shalin)
-
 * SOLR-6897: Nuke non-NRT mode from code and configuration. (Hossman, shalin)

 * SOLR-6830: Update Woodstox to 4.4.1 and StAX to 3.1.4. (ab)
--- a/solr/licenses/jetty-continuation-9.2.10.v20150310.jar.sha1
+++ b/solr/licenses/jetty-continuation-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+1c9bc80037e9898974ada7318f11c984363d4707
--- a/solr/licenses/jetty-continuation-9.2.9.v20150224.jar.sha1
+++ b/solr/licenses/jetty-continuation-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-476cae89c420170549b4851ed58dca25f349d16d
--- a/solr/licenses/jetty-deploy-9.2.10.v20150310.jar.sha1
+++ b/solr/licenses/jetty-deploy-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+e06c533b733c3b19fd02e502045ce841cfc84291
--- a/solr/licenses/jetty-deploy-9.2.9.v20150224.jar.sha1
+++ b/solr/licenses/jetty-deploy-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-71421338d40623e953c3b0f4d52fbe431aec5541
--- a/solr/licenses/jetty-http-9.2.10.v20150310.jar.sha1
+++ b/solr/licenses/jetty-http-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+886b628f62cd518bbb04b37bd1b308fa19340a53
--- a/solr/licenses/jetty-http-9.2.9.v20150224.jar.sha1
+++ b/solr/licenses/jetty-http-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-8b30ddc8304df24a36efbfa267acc24b7403b692
--- a/solr/licenses/jetty-io-9.2.10.v20150310.jar.sha1
+++ b/solr/licenses/jetty-io-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+29bc6a5e2049d9858bfa811f2728a7a8efcdc1c0
--- a/solr/licenses/jetty-io-9.2.9.v20150224.jar.sha1
+++ b/solr/licenses/jetty-io-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-06a4a23ee9decf2762d052bc2ae0501c08cc9023
--- a/solr/licenses/jetty-jmx-9.2.10.v20150310.jar.sha1
+++ b/solr/licenses/jetty-jmx-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+fa94eb39f1dd63c40efe44471664f8f70bc7ca2e
--- a/solr/licenses/jetty-jmx-9.2.9.v20150224.jar.sha1
+++ b/solr/licenses/jetty-jmx-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-e0a9df505fbcc7c0481209325a106b922097468d
--- a/solr/licenses/jetty-rewrite-9.2.10.v20150310.jar.sha1
+++ b/solr/licenses/jetty-rewrite-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+532576007fb71e632edd3681d4222379d4ea8c07
--- a/solr/licenses/jetty-rewrite-9.2.9.v20150224.jar.sha1
+++ b/solr/licenses/jetty-rewrite-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-c6ad2ded06bdda6444286fc18348016d82750cf0
--- a/solr/licenses/jetty-security-9.2.10.v20150310.jar.sha1
+++ b/solr/licenses/jetty-security-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+b56228088355023117ba9a9de0da00d652a7e655
--- a/solr/licenses/jetty-security-9.2.9.v20150224.jar.sha1
+++ b/solr/licenses/jetty-security-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-1747a52b01afbf96b58b0ae0f352185560768fc2
--- a/solr/licenses/jetty-server-9.2.10.v20150310.jar.sha1
+++ b/solr/licenses/jetty-server-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+0e6b8bff28b3e9ca6254415d2aa49603a5887fe8
--- a/solr/licenses/jetty-server-9.2.9.v20150224.jar.sha1
+++ b/solr/licenses/jetty-server-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-d30a52e992c3484569f58763f55097a1da3202ee
--- a/solr/licenses/jetty-servlet-9.2.10.v20150310.jar.sha1
+++ b/solr/licenses/jetty-servlet-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+9e923adf1671af7da09dba778e132ab0a9c62415
--- a/solr/licenses/jetty-servlet-9.2.9.v20150224.jar.sha1
+++ b/solr/licenses/jetty-servlet-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-1797875a3cc524d181733f323866a5f7bbca03a7
--- a/solr/licenses/jetty-servlets-9.2.10.v20150310.jar.sha1
+++ b/solr/licenses/jetty-servlets-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+b48a9bb30e9d5e73dcedf8039f96abdb04a3892c
--- a/solr/licenses/jetty-servlets-9.2.9.v20150224.jar.sha1
+++ b/solr/licenses/jetty-servlets-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-9b04f638c23a4db7c8e2dbfe31ab7370ce972ade
--- a/solr/licenses/jetty-util-9.2.10.v20150310.jar.sha1
+++ b/solr/licenses/jetty-util-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+90cc75668dc9a9885108733d4d46420907cf863c
--- a/solr/licenses/jetty-util-9.2.9.v20150224.jar.sha1
+++ b/solr/licenses/jetty-util-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-b5fb774a02158e9f66fed949581159a8d0dfcbe1
--- a/solr/licenses/jetty-webapp-9.2.10.v20150310.jar.sha1
+++ b/solr/licenses/jetty-webapp-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+3fabcf3b8a2d0a6746bb85ec3f8687efa5b66d6c
--- a/solr/licenses/jetty-webapp-9.2.9.v20150224.jar.sha1
+++ b/solr/licenses/jetty-webapp-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-d9d09e9e6cbc61cb0922b7f464fce8c752fefabf
--- a/solr/licenses/jetty-xml-9.2.10.v20150310.jar.sha1
+++ b/solr/licenses/jetty-xml-9.2.10.v20150310.jar.sha1
@ -0,0 +1 @@
+ab3e76269030a867d7af2692c49aee25825b3a93
--- a/solr/licenses/jetty-xml-9.2.9.v20150224.jar.sha1
+++ b/solr/licenses/jetty-xml-9.2.9.v20150224.jar.sha1
@ -1 +0,0 @@
-2c7bab957dec77b3b5b48c2620ad8234289c4041