You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/04/22 07:57:29 UTC
svn commit: r1675261 - in /lucene/dev/trunk: lucene/ lucene/licenses/ solr/
solr/licenses/
Author: shalin
Date: Wed Apr 22 05:57:28 2015
New Revision: 1675261
URL: http://svn.apache.org/r1675261
Log:
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.
Added:
lucene/dev/trunk/lucene/licenses/jetty-continuation-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/lucene/licenses/jetty-http-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/lucene/licenses/jetty-io-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/lucene/licenses/jetty-server-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/lucene/licenses/jetty-servlet-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/lucene/licenses/jetty-util-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jetty-continuation-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jetty-deploy-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jetty-http-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jetty-io-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jetty-jmx-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jetty-rewrite-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jetty-security-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jetty-server-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jetty-servlet-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jetty-servlets-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jetty-util-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jetty-webapp-9.2.10.v20150310.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jetty-xml-9.2.10.v20150310.jar.sha1 (with props)
Removed:
lucene/dev/trunk/lucene/licenses/jetty-continuation-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/lucene/licenses/jetty-http-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/lucene/licenses/jetty-io-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/lucene/licenses/jetty-server-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/lucene/licenses/jetty-servlet-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/lucene/licenses/jetty-util-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/solr/licenses/jetty-continuation-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/solr/licenses/jetty-deploy-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/solr/licenses/jetty-http-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/solr/licenses/jetty-io-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/solr/licenses/jetty-jmx-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/solr/licenses/jetty-rewrite-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/solr/licenses/jetty-security-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/solr/licenses/jetty-server-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/solr/licenses/jetty-servlet-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/solr/licenses/jetty-servlets-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/solr/licenses/jetty-util-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/solr/licenses/jetty-webapp-9.2.9.v20150224.jar.sha1
lucene/dev/trunk/solr/licenses/jetty-xml-9.2.9.v20150224.jar.sha1
Modified:
lucene/dev/trunk/lucene/ivy-versions.properties
lucene/dev/trunk/solr/CHANGES.txt
Modified: lucene/dev/trunk/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/ivy-versions.properties?rev=1675261&r1=1675260&r2=1675261&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/ivy-versions.properties (original)
+++ lucene/dev/trunk/lucene/ivy-versions.properties Wed Apr 22 05:57:28 2015
@@ -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}
Added: lucene/dev/trunk/lucene/licenses/jetty-continuation-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/licenses/jetty-continuation-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/licenses/jetty-continuation-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/lucene/licenses/jetty-continuation-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+1c9bc80037e9898974ada7318f11c984363d4707
Added: lucene/dev/trunk/lucene/licenses/jetty-http-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/licenses/jetty-http-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/licenses/jetty-http-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/lucene/licenses/jetty-http-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+886b628f62cd518bbb04b37bd1b308fa19340a53
Added: lucene/dev/trunk/lucene/licenses/jetty-io-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/licenses/jetty-io-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/licenses/jetty-io-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/lucene/licenses/jetty-io-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+29bc6a5e2049d9858bfa811f2728a7a8efcdc1c0
Added: lucene/dev/trunk/lucene/licenses/jetty-server-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/licenses/jetty-server-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/licenses/jetty-server-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/lucene/licenses/jetty-server-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+0e6b8bff28b3e9ca6254415d2aa49603a5887fe8
Added: lucene/dev/trunk/lucene/licenses/jetty-servlet-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/licenses/jetty-servlet-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/licenses/jetty-servlet-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/lucene/licenses/jetty-servlet-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+9e923adf1671af7da09dba778e132ab0a9c62415
Added: lucene/dev/trunk/lucene/licenses/jetty-util-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/licenses/jetty-util-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/licenses/jetty-util-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/lucene/licenses/jetty-util-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+90cc75668dc9a9885108733d4d46420907cf863c
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1675261&r1=1675260&r2=1675261&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Apr 22 05:57:28 2015
@@ -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)
Added: lucene/dev/trunk/solr/licenses/jetty-continuation-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jetty-continuation-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jetty-continuation-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jetty-continuation-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+1c9bc80037e9898974ada7318f11c984363d4707
Added: lucene/dev/trunk/solr/licenses/jetty-deploy-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jetty-deploy-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jetty-deploy-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jetty-deploy-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+e06c533b733c3b19fd02e502045ce841cfc84291
Added: lucene/dev/trunk/solr/licenses/jetty-http-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jetty-http-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jetty-http-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jetty-http-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+886b628f62cd518bbb04b37bd1b308fa19340a53
Added: lucene/dev/trunk/solr/licenses/jetty-io-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jetty-io-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jetty-io-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jetty-io-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+29bc6a5e2049d9858bfa811f2728a7a8efcdc1c0
Added: lucene/dev/trunk/solr/licenses/jetty-jmx-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jetty-jmx-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jetty-jmx-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jetty-jmx-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+fa94eb39f1dd63c40efe44471664f8f70bc7ca2e
Added: lucene/dev/trunk/solr/licenses/jetty-rewrite-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jetty-rewrite-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jetty-rewrite-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jetty-rewrite-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+532576007fb71e632edd3681d4222379d4ea8c07
Added: lucene/dev/trunk/solr/licenses/jetty-security-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jetty-security-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jetty-security-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jetty-security-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+b56228088355023117ba9a9de0da00d652a7e655
Added: lucene/dev/trunk/solr/licenses/jetty-server-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jetty-server-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jetty-server-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jetty-server-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+0e6b8bff28b3e9ca6254415d2aa49603a5887fe8
Added: lucene/dev/trunk/solr/licenses/jetty-servlet-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jetty-servlet-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jetty-servlet-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jetty-servlet-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+9e923adf1671af7da09dba778e132ab0a9c62415
Added: lucene/dev/trunk/solr/licenses/jetty-servlets-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jetty-servlets-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jetty-servlets-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jetty-servlets-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+b48a9bb30e9d5e73dcedf8039f96abdb04a3892c
Added: lucene/dev/trunk/solr/licenses/jetty-util-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jetty-util-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jetty-util-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jetty-util-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+90cc75668dc9a9885108733d4d46420907cf863c
Added: lucene/dev/trunk/solr/licenses/jetty-webapp-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jetty-webapp-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jetty-webapp-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jetty-webapp-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+3fabcf3b8a2d0a6746bb85ec3f8687efa5b66d6c
Added: lucene/dev/trunk/solr/licenses/jetty-xml-9.2.10.v20150310.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jetty-xml-9.2.10.v20150310.jar.sha1?rev=1675261&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jetty-xml-9.2.10.v20150310.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jetty-xml-9.2.10.v20150310.jar.sha1 Wed Apr 22 05:57:28 2015
@@ -0,0 +1 @@
+ab3e76269030a867d7af2692c49aee25825b3a93