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

SOLR-13541: Upgrade Jetty to 9.4.19.v20190610

This commit is contained in:
Cao Manh Dat 2019-06-14 15:45:45 +01:00
parent c73761b798
commit 22fca67bfe
63 changed files with 43 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/ivy-versions.properties
View File

@ -248,7 +248,7 @@ org.codehaus.janino.version = 3.0.9
/org.codehaus.woodstox/stax2-api = 3.1.4
/org.codehaus.woodstox/woodstox-core-asl = 4.4.1
org.eclipse.jetty.version = 9.4.14.v20181114
org.eclipse.jetty.version = 9.4.19.v20190610
/org.eclipse.jetty.http2/http2-client = ${org.eclipse.jetty.version}
/org.eclipse.jetty.http2/http2-common = ${org.eclipse.jetty.version}
/org.eclipse.jetty.http2/http2-hpack = ${org.eclipse.jetty.version}

1
lucene/licenses/jetty-continuation-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
ac4981a61bcaf4e2538de6270300a870224a16b8

1
lucene/licenses/jetty-continuation-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
4acddfa41f45790e43fe4be257c3c4bcf6b846ff

1
lucene/licenses/jetty-http-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
6d0c8ac42e9894ae7b5032438eb4579c2a47f4fe

1
lucene/licenses/jetty-http-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
b59ff8ecb0cf5d6234958f2404eabf0b72464e14

1
lucene/licenses/jetty-io-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
a8c6a705ddb9f83a75777d89b0be59fcef3f7637

1
lucene/licenses/jetty-io-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
7eb9a6be62d84e1691e5fdc99223e632485619a8

1
lucene/licenses/jetty-server-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
b36a3d52d78a1df6406f6fa236a6eeff48cbfef6

1
lucene/licenses/jetty-server-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
55786f6e6649bd49425a7da1ac72cd85b8dd4bef

1
lucene/licenses/jetty-servlet-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
96f501462af425190ff7b63e387692c1aa3af2c8

1
lucene/licenses/jetty-servlet-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
89e25610b3199fdf34a831c1b306f7e765928959

1
lucene/licenses/jetty-util-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
5bb3d7a38f7ea54138336591d89dd5867b806c02

1
lucene/licenses/jetty-util-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
2fd3cd40279280e8c56241f753d2c52d8d446d19

4
solr/CHANGES.txt
View File

@ -26,7 +26,7 @@ Apache Tika 1.19.1
Carrot2 3.16.0
Velocity 2.0 and Velocity Tools 3.0
Apache ZooKeeper 3.5.5
Jetty 9.4.14.v20181114
Jetty 9.4.19.v20190610
Upgrade Notes
----------------------
@ -41,6 +41,8 @@ Upgrade Notes
* SOLR-13515: org.apache.solr.util.SolrPluginUtils.IdentityRegenerator has been removed, please use
the identical org.apache.solr.search.NoOpRegenerator instead. (David Smiley, Christine Poerschke)
* SOLR-13541: Upgrade Jetty to 9.4.19.v20190610. (Erick Erickson, Cao Manh Dat)
New Features
----------------------

1
solr/licenses/http2-client-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
78917d06b788fad75fdd4fa73d8d8ff9679200dd

1
solr/licenses/http2-client-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
da335ee2e7d1439dcc7e11e89941edfad91e9e10

1
solr/licenses/http2-common-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
820ca2201ad531983cc3a8e2a82153268828d025

1
solr/licenses/http2-common-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
3b8c59c68d52a3d0de0d53f5b3588be3a5c05fb8

1
solr/licenses/http2-hpack-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
e6cc7ae5b5749afe8b787595b28c6813c13c3ac2

1
solr/licenses/http2-hpack-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
3aaf2c8c9c781f10d4d9da6120c5195b2fcb2ad9

1
solr/licenses/http2-http-client-transport-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
77139eb205d3ddb2d19458c534c734f11491a429

1
solr/licenses/http2-http-client-transport-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
95f58cd0cfa0c4553fc3901138cc6a03ece23b94

1
solr/licenses/http2-server-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
a2ce60a90cbf4db91240bb585733e33b1a55110f

1
solr/licenses/http2-server-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
672891a1abbeef85192d137192e347872a6fc9c3

1
solr/licenses/jetty-alpn-client-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
c567eba368e70a0a9aaded14a554a3b25a0a502e

1
solr/licenses/jetty-alpn-client-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
8c9283b8a04056a0fced23fc474e62aa39764c6b

1
solr/licenses/jetty-alpn-java-client-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
f093d00fc7112bdf471efdd5d909eb9296b3d30d

1
solr/licenses/jetty-alpn-java-client-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
37eff0bd068adca090e14a0fbd9de258a871f9d9

1
solr/licenses/jetty-alpn-java-server-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
686cc093a08a2ed2bc2bed059117997c8c760262

1
solr/licenses/jetty-alpn-java-server-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
7e7f62c2c03b74e59211eeeba0ddc067ad422ff7

1
solr/licenses/jetty-alpn-server-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
5aa0ca49c6f7cdd4c2c8a628620dc125162213ca

1
solr/licenses/jetty-alpn-server-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
5dd67dacaf1eed80ab95493da840dab35c22ce9c

1
solr/licenses/jetty-client-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
1c46b088e1119928d54ff704fe38fe1b6b6700d0

1
solr/licenses/jetty-client-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
4386c1f243042e0f78f2e4c3c6cd239967410d6e

1
solr/licenses/jetty-continuation-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
ac4981a61bcaf4e2538de6270300a870224a16b8

1
solr/licenses/jetty-continuation-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
4acddfa41f45790e43fe4be257c3c4bcf6b846ff

1
solr/licenses/jetty-deploy-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
db0e01f00c1d11fbf2dfa72a1707b7ac9859c943

1
solr/licenses/jetty-deploy-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
8b350466ff1fcb7030a7abc152eed458e086fac2

1
solr/licenses/jetty-http-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
6d0c8ac42e9894ae7b5032438eb4579c2a47f4fe

1
solr/licenses/jetty-http-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
b59ff8ecb0cf5d6234958f2404eabf0b72464e14

1
solr/licenses/jetty-io-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
a8c6a705ddb9f83a75777d89b0be59fcef3f7637

1
solr/licenses/jetty-io-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
7eb9a6be62d84e1691e5fdc99223e632485619a8

1
solr/licenses/jetty-jmx-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
3e02463d2bff175a3231cd3dc26363eaf76a3b17

1
solr/licenses/jetty-jmx-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
8dc81acdc4d3085c0b5f3c80b9a78cc9cb48bc4e

1
solr/licenses/jetty-rewrite-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
eb300aa639175741839b25a5109772bcc71a586a

1
solr/licenses/jetty-rewrite-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
9b830886bd6098c613ed08d99574bbf300519506

1
solr/licenses/jetty-security-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
6cbeb2fe9b3cc4f88a7ea040b8a0c4f703cd72ce

1
solr/licenses/jetty-security-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
bfe96e1e78719bdd446e063c3f45c132010237ce

1
solr/licenses/jetty-server-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
b36a3d52d78a1df6406f6fa236a6eeff48cbfef6

1
solr/licenses/jetty-server-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
55786f6e6649bd49425a7da1ac72cd85b8dd4bef

1
solr/licenses/jetty-servlet-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
96f501462af425190ff7b63e387692c1aa3af2c8

1
solr/licenses/jetty-servlet-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
89e25610b3199fdf34a831c1b306f7e765928959

1
solr/licenses/jetty-servlets-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
38cfc07b53e5d285bb2fca78bb2531565ed9c9e5

1
solr/licenses/jetty-servlets-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
b290c176abe2cd9274b9f794bf74497c4759359d

1
solr/licenses/jetty-util-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
5bb3d7a38f7ea54138336591d89dd5867b806c02

1
solr/licenses/jetty-util-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
2fd3cd40279280e8c56241f753d2c52d8d446d19

1
solr/licenses/jetty-webapp-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
0088a04172b5e7736bc3e95eb58623aa9ccdb475

1
solr/licenses/jetty-webapp-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
945fc0c0fa69504c194e32c5330afa1df0be9574

1
solr/licenses/jetty-xml-9.4.14.v20181114.jar.sha1
View File

@ -1 +0,0 @@
65cd197bc8082a1007130c8b644cea7938133568

1
solr/licenses/jetty-xml-9.4.19.v20190610.jar.sha1 Normal file
View File

@ -0,0 +1 @@
d25e67fbe0809cae777065b75b10ecfb5c1bd749

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

@ -1 +1 @@
ed9434016612e1e2c29b4db88bc5fdfe7dbcec2f
6ab950be264e74803f12ba43ee5db434a74e6c0c

19
solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
View File

@ -914,7 +914,13 @@ public class Http2SolrClient extends SolrClient {
}
private static SslContextFactory getDefaultSslContextFactory() {
SslContextFactory sslContextFactory = new SslContextFactory(false);
String checkPeerNameStr = System.getProperty(HttpClientUtil.SYS_PROP_CHECK_PEER_NAME);
boolean sslCheckPeerName = true;
if (checkPeerNameStr == null || "false".equalsIgnoreCase(checkPeerNameStr)) {
sslCheckPeerName = false;
}
SslContextFactory.Client sslContextFactory = new SslContextFactory.Client(!sslCheckPeerName);
if (null != System.getProperty("javax.net.ssl.keyStore")) {
sslContextFactory.setKeyStorePath
@ -933,17 +939,6 @@ public class Http2SolrClient extends SolrClient {
(System.getProperty("javax.net.ssl.trustStorePassword"));
}
String checkPeerNameStr = System.getProperty(HttpClientUtil.SYS_PROP_CHECK_PEER_NAME);
boolean sslCheckPeerName = true;
if (checkPeerNameStr == null || "false".equalsIgnoreCase(checkPeerNameStr)) {
sslCheckPeerName = false;
}
if (System.getProperty("tests.jettySsl.clientAuth") != null) {
sslCheckPeerName = sslCheckPeerName || Boolean.getBoolean("tests.jettySsl.clientAuth");
}
sslContextFactory.setNeedClientAuth(sslCheckPeerName);
return sslContextFactory;
}

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

@ -185,10 +185,9 @@ public class SSLTestConfig {
return new SSLConfig(isSSLMode(), isClientAuthMode(), null, null, null, null) {
@Override
public SslContextFactory createContextFactory() {
SslContextFactory factory = new SslContextFactory(false);
SslContextFactory.Client factory = new SslContextFactory.Client(!checkPeerName);
try {
factory.setSslContext(buildClientSSLContext());
factory.setNeedClientAuth(checkPeerName);
} catch (KeyManagementException | UnrecoverableKeyException | NoSuchAlgorithmException | KeyStoreException e) {
throw new IllegalStateException("Unable to setup https scheme for HTTPClient to test SSL.", e);
}
@ -214,7 +213,7 @@ public class SSLTestConfig {
return new SSLConfig(isSSLMode(), isClientAuthMode(), null, null, null, null) {
@Override
public SslContextFactory createContextFactory() {
SslContextFactory factory = new SslContextFactory(false);
SslContextFactory.Server factory = new SslContextFactory.Server();
try {
SSLContextBuilder builder = SSLContexts.custom();
builder.setSecureRandom(NotSecurePsuedoRandom.INSTANCE);