Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-11810: Upgrade Jetty to 9.4.8

This commit is contained in:
Erick Erickson 2018-01-16 12:14:03 -08:00
parent a3c4f7388c
commit a6b5c5bfb0
45 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/ivy-versions.properties
View File

@ -230,7 +230,7 @@ org.codehaus.janino.version = 2.7.6
/org.codehaus.woodstox/stax2-api = 3.1.4 /org.codehaus.woodstox/stax2-api = 3.1.4
/org.codehaus.woodstox/woodstox-core-asl = 4.4.1 /org.codehaus.woodstox/woodstox-core-asl = 4.4.1
org.eclipse.jetty.version = 9.3.20.v20170531 org.eclipse.jetty.version = 9.4.8.v20171121
/org.eclipse.jetty/jetty-continuation = ${org.eclipse.jetty.version} /org.eclipse.jetty/jetty-continuation = ${org.eclipse.jetty.version}
/org.eclipse.jetty/jetty-deploy = ${org.eclipse.jetty.version} /org.eclipse.jetty/jetty-deploy = ${org.eclipse.jetty.version}
/org.eclipse.jetty/jetty-http = ${org.eclipse.jetty.version} /org.eclipse.jetty/jetty-http = ${org.eclipse.jetty.version}

1
lucene/licenses/jetty-continuation-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
0176f1ef8366257e7b6214c3bbd710cf47593135

1
lucene/licenses/jetty-continuation-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
34b64138f6589d3d32d02058fe73ec788cb981bf

1
lucene/licenses/jetty-http-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
32f5fe22ed468a49df1ffcbb27c39c1b53f261aa

1
lucene/licenses/jetty-http-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
9879d6c4e37400bf43f0cd4b3c6e34a3ba409864

1
lucene/licenses/jetty-io-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
5b68e7761fcacefcf26ad9ab50943db65fda2c3d

1
lucene/licenses/jetty-io-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
d3fe2dfa62f52ee91ff07cb359f63387e0e30b40

1
lucene/licenses/jetty-server-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
6a1523d44ebb527eed068a5c8bfd22edd6a20530

1
lucene/licenses/jetty-server-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
34614bd9a29de57ef28ca31f1f2b49a412af196d

1
lucene/licenses/jetty-servlet-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
21a698f9d58d03cdf58bf2a40f93de58c2eab138

1
lucene/licenses/jetty-servlet-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
bbbb9b5de08f468c7b9b3de6aea0b098d2c679b6

1
lucene/licenses/jetty-util-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
19ce4203809da37f8ea7a5632704fa71b6f0ccc2

1
lucene/licenses/jetty-util-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
d6ec1a1613c7fa72aa6bf5d8c204750afbc3df3b

4
lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java
View File

@ -28,7 +28,7 @@ import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.server.session.HashSessionIdManager; import org.eclipse.jetty.server.session.DefaultSessionIdManager;
import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.junit.AfterClass; import org.junit.AfterClass;
@ -109,7 +109,7 @@ public abstract class ReplicatorTestCase extends LuceneTestCase {
connector.setHost("127.0.0.1"); connector.setHost("127.0.0.1");
server.setConnectors(new Connector[] {connector}); server.setConnectors(new Connector[] {connector});
server.setSessionIdManager(new HashSessionIdManager(new Random(random().nextLong()))); server.setSessionIdManager(new DefaultSessionIdManager(server, new Random(random().nextLong())));
server.setHandler(handler); server.setHandler(handler);
server.start(); server.start();

6
solr/CHANGES.txt
View File

@ -47,7 +47,7 @@ Carrot2 3.15.0
Velocity 1.7 and Velocity Tools 2.0 Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1 Apache UIMA 2.3.1
Apache ZooKeeper 3.4.10 Apache ZooKeeper 3.4.10
Jetty 9.3.20.v20170531 Jetty 9.4.8.v20171121
Upgrade Notes Upgrade Notes
---------------------- ----------------------
@ -89,9 +89,11 @@ New Features
* SOLR-11064: Collection APIs should use the disk space hint when using policy framework (noble) * SOLR-11064: Collection APIs should use the disk space hint when using policy framework (noble)
* SOLR-11854: multivalued primative fields can now be sorted by implicitly choosing the min/max * SOLR-11854: multivalued primitive fields can now be sorted by implicitly choosing the min/max
value for asc/desc sort orders. (hossman) value for asc/desc sort orders. (hossman)
* SOLR-11810: Upgrade Jetty to 9.4.8.v20171121 (Varun Thacker, Erick Erickson)
Bug Fixes Bug Fixes
---------------------- ----------------------

8
solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
View File

@ -53,11 +53,11 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.server.handler.gzip.GzipHandler; import org.eclipse.jetty.server.handler.gzip.GzipHandler;
import org.eclipse.jetty.server.session.HashSessionIdManager; import org.eclipse.jetty.server.session.DefaultSessionIdManager;
import org.eclipse.jetty.servlet.BaseHolder;
import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.servlet.Source;
import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.QueuedThreadPool;
@ -248,7 +248,7 @@ public class JettySolrRunner {
connector.setIdleTimeout(THREAD_POOL_MAX_IDLE_TIME_MS); connector.setIdleTimeout(THREAD_POOL_MAX_IDLE_TIME_MS);
server.setConnectors(new Connector[] {connector}); server.setConnectors(new Connector[] {connector});
server.setSessionIdManager(new HashSessionIdManager(new Random())); server.setSessionIdManager(new DefaultSessionIdManager(server, new Random()));
} else { } else {
ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory()); ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory());
connector.setPort(port); connector.setPort(port);
@ -300,7 +300,7 @@ public class JettySolrRunner {
String pathSpec = config.extraServlets.get(servletHolder); String pathSpec = config.extraServlets.get(servletHolder);
root.addServlet(servletHolder, pathSpec); root.addServlet(servletHolder, pathSpec);
} }
dispatchFilter = root.getServletHandler().newFilterHolder(BaseHolder.Source.EMBEDDED); dispatchFilter = root.getServletHandler().newFilterHolder(Source.EMBEDDED);
dispatchFilter.setHeldClass(SolrDispatchFilter.class); dispatchFilter.setHeldClass(SolrDispatchFilter.class);
dispatchFilter.setInitParameter("excludePatterns", excludePatterns); dispatchFilter.setInitParameter("excludePatterns", excludePatterns);
root.addFilter(dispatchFilter, "*", EnumSet.of(DispatcherType.REQUEST)); root.addFilter(dispatchFilter, "*", EnumSet.of(DispatcherType.REQUEST));

1
solr/licenses/jetty-continuation-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
0176f1ef8366257e7b6214c3bbd710cf47593135

1
solr/licenses/jetty-continuation-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
34b64138f6589d3d32d02058fe73ec788cb981bf

1
solr/licenses/jetty-deploy-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
160c0cefd2fddacd040c41801f40a5a372a9302c

1
solr/licenses/jetty-deploy-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
5737f32c5f017905f92baea5479d6ee9c5405dc8

1
solr/licenses/jetty-http-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
32f5fe22ed468a49df1ffcbb27c39c1b53f261aa

1
solr/licenses/jetty-http-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
9879d6c4e37400bf43f0cd4b3c6e34a3ba409864

1
solr/licenses/jetty-io-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
5b68e7761fcacefcf26ad9ab50943db65fda2c3d

1
solr/licenses/jetty-io-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
d3fe2dfa62f52ee91ff07cb359f63387e0e30b40

1
solr/licenses/jetty-jmx-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
4a28dd045b8992752ff7727f25cf9e888e9c8c4c

1
solr/licenses/jetty-jmx-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
7ee4d6a96cced3c1758125e3a5ad26281c5c7123

1
solr/licenses/jetty-rewrite-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
8fb029863ceb6531ee0e24c59a004f622226217b

1
solr/licenses/jetty-rewrite-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
755ec66c0d7bb4fc7c4293dfca329c2cf4f044f3

1
solr/licenses/jetty-security-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
9e2ded957c05f447a0611fa64ca4ab5f7cc5aa65

1
solr/licenses/jetty-security-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
e8350eec683b55494287f06740543e4be6f75425

1
solr/licenses/jetty-server-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
6a1523d44ebb527eed068a5c8bfd22edd6a20530

1
solr/licenses/jetty-server-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
34614bd9a29de57ef28ca31f1f2b49a412af196d

1
solr/licenses/jetty-servlet-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
21a698f9d58d03cdf58bf2a40f93de58c2eab138

1
solr/licenses/jetty-servlet-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
bbbb9b5de08f468c7b9b3de6aea0b098d2c679b6

1
solr/licenses/jetty-servlets-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
0bb3b1ddc06525eba71c37f51402996502d323a9

1
solr/licenses/jetty-servlets-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
f7b7f3d6be91f5e1a47b4d3ecaf286652b4d1332

1
solr/licenses/jetty-util-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
19ce4203809da37f8ea7a5632704fa71b6f0ccc2

1
solr/licenses/jetty-util-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
d6ec1a1613c7fa72aa6bf5d8c204750afbc3df3b

1
solr/licenses/jetty-webapp-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
5b41166ce279c481216501d45c0d0f4f6da23c0b

1
solr/licenses/jetty-webapp-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
695278449233cee9bae9eed930a5264b574774f0

1
solr/licenses/jetty-xml-9.3.20.v20170531.jar.sha1
View File

@ -1 +0,0 @@
9f3f158a6a4587c4283561a3a3fc5a187173becf

1
solr/licenses/jetty-xml-9.4.8.v20171121.jar.sha1 Normal file
View File

@ -0,0 +1 @@
b0d6f87f580a9bd7fa9aaf9b7448bf63cf0ac34f

2
solr/licenses/start.jar.sha1
View File

@ -1 +1 @@
68b040771da53967c7e48f2ffd7c53732687f425 54904991ec70b400057a7a82c3603035740a6d53

4
solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
View File

@ -37,7 +37,7 @@ import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.session.HashSessionIdManager; import org.eclipse.jetty.server.session.DefaultSessionIdManager;
import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebAppContext;
import org.junit.Rule; import org.junit.Rule;
import org.junit.rules.RuleChain; import org.junit.rules.RuleChain;
@ -74,7 +74,7 @@ public class JettyWebappTest extends SolrTestCaseJ4
server = new Server(port); server = new Server(port);
// insecure: only use for tests!!!! // insecure: only use for tests!!!!
server.setSessionIdManager(new HashSessionIdManager(new Random(random().nextLong()))); server.setSessionIdManager(new DefaultSessionIdManager(server, new Random(random().nextLong())));
new WebAppContext(server, path, context ); new WebAppContext(server, path, context );
ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory()); ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory());

11
solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
View File

@ -16,7 +16,8 @@
*/ */
package org.apache.solr.util; package org.apache.solr.util;
import java.util.Random; import javax.net.ssl.SSLContext;
import java.io.IOException;
import java.security.KeyManagementException; import java.security.KeyManagementException;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.KeyStoreException; import java.security.KeyStoreException;
@ -24,17 +25,15 @@ import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.security.SecureRandomSpi; import java.security.SecureRandomSpi;
import java.security.UnrecoverableKeyException; import java.security.UnrecoverableKeyException;
import java.util.Random;
import javax.net.ssl.SSLContext;
import java.net.MalformedURLException;
import org.apache.http.config.Registry; import org.apache.http.config.Registry;
import org.apache.http.config.RegistryBuilder; import org.apache.http.config.RegistryBuilder;
import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.socket.ConnectionSocketFactory;
import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.socket.PlainConnectionSocketFactory;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.conn.ssl.SSLContexts;
import org.apache.http.conn.ssl.SSLContextBuilder; import org.apache.http.conn.ssl.SSLContextBuilder;
import org.apache.http.conn.ssl.SSLContexts;
import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.conn.ssl.SSLSocketFactory;
import org.apache.http.conn.ssl.TrustSelfSignedStrategy; import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
import org.apache.solr.client.solrj.embedded.SSLConfig; import org.apache.solr.client.solrj.embedded.SSLConfig;
@ -89,7 +88,7 @@ public class SSLTestConfig extends SSLConfig {
Resource result; Resource result;
try { try {
result = Resource.newResource(userInput); result = Resource.newResource(userInput);
} catch (MalformedURLException e) { } catch (IOException e) {
throw new IllegalArgumentException("Can't build " + type + " Resource: " + e.getMessage(), e); throw new IllegalArgumentException("Can't build " + type + " Resource: " + e.getMessage(), e);
} }
if (! result.exists()) { if (! result.exists()) {