You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2019/06/14 14:47:24 UTC
[lucene-solr] branch master updated (2ee0b16 -> 8d48f92)
This is an automated email from the ASF dual-hosted git repository.
datcm pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 2ee0b16 SOLR-13333: make terms.ttf work without terms.list in standalone mode
new 0c24aa6 SOLR-13541: Upgrade Jetty to 9.4.19.v20190610
new 8d48f92 SOLR-13541: Upgrade solr/CHANGES.txt
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
lucene/ivy-versions.properties | 2 +-
.../jetty-continuation-9.4.14.v20181114.jar.sha1 | 1 -
.../jetty-continuation-9.4.19.v20190610.jar.sha1 | 1 +
lucene/licenses/jetty-http-9.4.14.v20181114.jar.sha1 | 1 -
lucene/licenses/jetty-http-9.4.19.v20190610.jar.sha1 | 1 +
lucene/licenses/jetty-io-9.4.14.v20181114.jar.sha1 | 1 -
lucene/licenses/jetty-io-9.4.19.v20190610.jar.sha1 | 1 +
.../licenses/jetty-server-9.4.14.v20181114.jar.sha1 | 1 -
.../licenses/jetty-server-9.4.19.v20190610.jar.sha1 | 1 +
.../licenses/jetty-servlet-9.4.14.v20181114.jar.sha1 | 1 -
.../licenses/jetty-servlet-9.4.19.v20190610.jar.sha1 | 1 +
lucene/licenses/jetty-util-9.4.14.v20181114.jar.sha1 | 1 -
lucene/licenses/jetty-util-9.4.19.v20190610.jar.sha1 | 1 +
solr/CHANGES.txt | 6 ++++--
solr/licenses/http2-client-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/http2-client-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/http2-common-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/http2-common-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/http2-hpack-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/http2-hpack-9.4.19.v20190610.jar.sha1 | 1 +
...p2-http-client-transport-9.4.14.v20181114.jar.sha1 | 1 -
...p2-http-client-transport-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/http2-server-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/http2-server-9.4.19.v20190610.jar.sha1 | 1 +
.../jetty-alpn-client-9.4.14.v20181114.jar.sha1 | 1 -
.../jetty-alpn-client-9.4.19.v20190610.jar.sha1 | 1 +
.../jetty-alpn-java-client-9.4.14.v20181114.jar.sha1 | 1 -
.../jetty-alpn-java-client-9.4.19.v20190610.jar.sha1 | 1 +
.../jetty-alpn-java-server-9.4.14.v20181114.jar.sha1 | 1 -
.../jetty-alpn-java-server-9.4.19.v20190610.jar.sha1 | 1 +
.../jetty-alpn-server-9.4.14.v20181114.jar.sha1 | 1 -
.../jetty-alpn-server-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-client-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-client-9.4.19.v20190610.jar.sha1 | 1 +
.../jetty-continuation-9.4.14.v20181114.jar.sha1 | 1 -
.../jetty-continuation-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-deploy-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-deploy-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-http-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-http-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-io-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-io-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-jmx-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-jmx-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-rewrite-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-rewrite-9.4.19.v20190610.jar.sha1 | 1 +
.../licenses/jetty-security-9.4.14.v20181114.jar.sha1 | 1 -
.../licenses/jetty-security-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-server-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-server-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-servlet-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-servlet-9.4.19.v20190610.jar.sha1 | 1 +
.../licenses/jetty-servlets-9.4.14.v20181114.jar.sha1 | 1 -
.../licenses/jetty-servlets-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-util-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-util-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-webapp-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-webapp-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-xml-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-xml-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/start.jar.sha1 | 2 +-
.../solr/client/solrj/impl/Http2SolrClient.java | 19 +++++++------------
.../src/java/org/apache/solr/util/SSLTestConfig.java | 5 ++---
63 files changed, 44 insertions(+), 48 deletions(-)
delete mode 100644 lucene/licenses/jetty-continuation-9.4.14.v20181114.jar.sha1
create mode 100644 lucene/licenses/jetty-continuation-9.4.19.v20190610.jar.sha1
delete mode 100644 lucene/licenses/jetty-http-9.4.14.v20181114.jar.sha1
create mode 100644 lucene/licenses/jetty-http-9.4.19.v20190610.jar.sha1
delete mode 100644 lucene/licenses/jetty-io-9.4.14.v20181114.jar.sha1
create mode 100644 lucene/licenses/jetty-io-9.4.19.v20190610.jar.sha1
delete mode 100644 lucene/licenses/jetty-server-9.4.14.v20181114.jar.sha1
create mode 100644 lucene/licenses/jetty-server-9.4.19.v20190610.jar.sha1
delete mode 100644 lucene/licenses/jetty-servlet-9.4.14.v20181114.jar.sha1
create mode 100644 lucene/licenses/jetty-servlet-9.4.19.v20190610.jar.sha1
delete mode 100644 lucene/licenses/jetty-util-9.4.14.v20181114.jar.sha1
create mode 100644 lucene/licenses/jetty-util-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/http2-client-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/http2-client-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/http2-common-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/http2-common-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/http2-hpack-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/http2-hpack-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/http2-http-client-transport-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/http2-http-client-transport-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/http2-server-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/http2-server-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-alpn-client-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-alpn-client-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-alpn-java-client-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-alpn-java-client-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-alpn-java-server-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-alpn-java-server-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-alpn-server-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-alpn-server-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-client-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-client-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-continuation-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-continuation-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-deploy-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-deploy-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-http-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-http-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-io-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-io-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-jmx-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-jmx-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-rewrite-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-rewrite-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-security-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-security-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-server-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-server-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-servlet-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-servlet-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-servlets-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-servlets-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-util-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-util-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-webapp-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-webapp-9.4.19.v20190610.jar.sha1
delete mode 100644 solr/licenses/jetty-xml-9.4.14.v20181114.jar.sha1
create mode 100644 solr/licenses/jetty-xml-9.4.19.v20190610.jar.sha1
[lucene-solr] 02/02: SOLR-13541: Upgrade solr/CHANGES.txt
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
datcm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 8d48f9252ff3418bb36882efb64d6e00166edd1c
Author: Cao Manh Dat <da...@apache.org>
AuthorDate: Fri Jun 14 15:47:17 2019 +0100
SOLR-13541: Upgrade solr/CHANGES.txt
---
solr/CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 214e55a..de56036 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -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
----------------------
[lucene-solr] 01/02: SOLR-13541: Upgrade Jetty to 9.4.19.v20190610
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
datcm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 0c24aa6c75a288e8d42c436162ca221518287d46
Author: Cao Manh Dat <da...@apache.org>
AuthorDate: Fri Jun 14 15:45:45 2019 +0100
SOLR-13541: Upgrade Jetty to 9.4.19.v20190610
---
lucene/ivy-versions.properties | 2 +-
.../jetty-continuation-9.4.14.v20181114.jar.sha1 | 1 -
.../jetty-continuation-9.4.19.v20190610.jar.sha1 | 1 +
lucene/licenses/jetty-http-9.4.14.v20181114.jar.sha1 | 1 -
lucene/licenses/jetty-http-9.4.19.v20190610.jar.sha1 | 1 +
lucene/licenses/jetty-io-9.4.14.v20181114.jar.sha1 | 1 -
lucene/licenses/jetty-io-9.4.19.v20190610.jar.sha1 | 1 +
.../licenses/jetty-server-9.4.14.v20181114.jar.sha1 | 1 -
.../licenses/jetty-server-9.4.19.v20190610.jar.sha1 | 1 +
.../licenses/jetty-servlet-9.4.14.v20181114.jar.sha1 | 1 -
.../licenses/jetty-servlet-9.4.19.v20190610.jar.sha1 | 1 +
lucene/licenses/jetty-util-9.4.14.v20181114.jar.sha1 | 1 -
lucene/licenses/jetty-util-9.4.19.v20190610.jar.sha1 | 1 +
solr/CHANGES.txt | 4 +++-
solr/licenses/http2-client-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/http2-client-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/http2-common-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/http2-common-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/http2-hpack-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/http2-hpack-9.4.19.v20190610.jar.sha1 | 1 +
...p2-http-client-transport-9.4.14.v20181114.jar.sha1 | 1 -
...p2-http-client-transport-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/http2-server-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/http2-server-9.4.19.v20190610.jar.sha1 | 1 +
.../jetty-alpn-client-9.4.14.v20181114.jar.sha1 | 1 -
.../jetty-alpn-client-9.4.19.v20190610.jar.sha1 | 1 +
.../jetty-alpn-java-client-9.4.14.v20181114.jar.sha1 | 1 -
.../jetty-alpn-java-client-9.4.19.v20190610.jar.sha1 | 1 +
.../jetty-alpn-java-server-9.4.14.v20181114.jar.sha1 | 1 -
.../jetty-alpn-java-server-9.4.19.v20190610.jar.sha1 | 1 +
.../jetty-alpn-server-9.4.14.v20181114.jar.sha1 | 1 -
.../jetty-alpn-server-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-client-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-client-9.4.19.v20190610.jar.sha1 | 1 +
.../jetty-continuation-9.4.14.v20181114.jar.sha1 | 1 -
.../jetty-continuation-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-deploy-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-deploy-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-http-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-http-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-io-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-io-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-jmx-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-jmx-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-rewrite-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-rewrite-9.4.19.v20190610.jar.sha1 | 1 +
.../licenses/jetty-security-9.4.14.v20181114.jar.sha1 | 1 -
.../licenses/jetty-security-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-server-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-server-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-servlet-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-servlet-9.4.19.v20190610.jar.sha1 | 1 +
.../licenses/jetty-servlets-9.4.14.v20181114.jar.sha1 | 1 -
.../licenses/jetty-servlets-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-util-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-util-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-webapp-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-webapp-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/jetty-xml-9.4.14.v20181114.jar.sha1 | 1 -
solr/licenses/jetty-xml-9.4.19.v20190610.jar.sha1 | 1 +
solr/licenses/start.jar.sha1 | 2 +-
.../solr/client/solrj/impl/Http2SolrClient.java | 19 +++++++------------
.../src/java/org/apache/solr/util/SSLTestConfig.java | 5 ++---
63 files changed, 43 insertions(+), 47 deletions(-)
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index fa17d87..1285885 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -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}
diff --git a/lucene/licenses/jetty-continuation-9.4.14.v20181114.jar.sha1 b/lucene/licenses/jetty-continuation-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 0d9db3a..0000000
--- a/lucene/licenses/jetty-continuation-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ac4981a61bcaf4e2538de6270300a870224a16b8
diff --git a/lucene/licenses/jetty-continuation-9.4.19.v20190610.jar.sha1 b/lucene/licenses/jetty-continuation-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..d328029
--- /dev/null
+++ b/lucene/licenses/jetty-continuation-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+4acddfa41f45790e43fe4be257c3c4bcf6b846ff
diff --git a/lucene/licenses/jetty-http-9.4.14.v20181114.jar.sha1 b/lucene/licenses/jetty-http-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 5e72e34..0000000
--- a/lucene/licenses/jetty-http-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6d0c8ac42e9894ae7b5032438eb4579c2a47f4fe
diff --git a/lucene/licenses/jetty-http-9.4.19.v20190610.jar.sha1 b/lucene/licenses/jetty-http-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..76f1249
--- /dev/null
+++ b/lucene/licenses/jetty-http-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+b59ff8ecb0cf5d6234958f2404eabf0b72464e14
diff --git a/lucene/licenses/jetty-io-9.4.14.v20181114.jar.sha1 b/lucene/licenses/jetty-io-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index f3acf85..0000000
--- a/lucene/licenses/jetty-io-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a8c6a705ddb9f83a75777d89b0be59fcef3f7637
diff --git a/lucene/licenses/jetty-io-9.4.19.v20190610.jar.sha1 b/lucene/licenses/jetty-io-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..5af4939
--- /dev/null
+++ b/lucene/licenses/jetty-io-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+7eb9a6be62d84e1691e5fdc99223e632485619a8
diff --git a/lucene/licenses/jetty-server-9.4.14.v20181114.jar.sha1 b/lucene/licenses/jetty-server-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 182b5c5..0000000
--- a/lucene/licenses/jetty-server-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b36a3d52d78a1df6406f6fa236a6eeff48cbfef6
diff --git a/lucene/licenses/jetty-server-9.4.19.v20190610.jar.sha1 b/lucene/licenses/jetty-server-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..cbfdf11
--- /dev/null
+++ b/lucene/licenses/jetty-server-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+55786f6e6649bd49425a7da1ac72cd85b8dd4bef
diff --git a/lucene/licenses/jetty-servlet-9.4.14.v20181114.jar.sha1 b/lucene/licenses/jetty-servlet-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index d1576d3..0000000
--- a/lucene/licenses/jetty-servlet-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-96f501462af425190ff7b63e387692c1aa3af2c8
diff --git a/lucene/licenses/jetty-servlet-9.4.19.v20190610.jar.sha1 b/lucene/licenses/jetty-servlet-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..c36dab5
--- /dev/null
+++ b/lucene/licenses/jetty-servlet-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+89e25610b3199fdf34a831c1b306f7e765928959
diff --git a/lucene/licenses/jetty-util-9.4.14.v20181114.jar.sha1 b/lucene/licenses/jetty-util-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index ffced69..0000000
--- a/lucene/licenses/jetty-util-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5bb3d7a38f7ea54138336591d89dd5867b806c02
diff --git a/lucene/licenses/jetty-util-9.4.19.v20190610.jar.sha1 b/lucene/licenses/jetty-util-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..0a2b5ad
--- /dev/null
+++ b/lucene/licenses/jetty-util-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+2fd3cd40279280e8c56241f753d2c52d8d446d19
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index fb16d7b..214e55a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -61,7 +61,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
----------------------
@@ -76,6 +76,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
----------------------
diff --git a/solr/licenses/http2-client-9.4.14.v20181114.jar.sha1 b/solr/licenses/http2-client-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index f2792c4..0000000
--- a/solr/licenses/http2-client-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-78917d06b788fad75fdd4fa73d8d8ff9679200dd
diff --git a/solr/licenses/http2-client-9.4.19.v20190610.jar.sha1 b/solr/licenses/http2-client-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..c17735d
--- /dev/null
+++ b/solr/licenses/http2-client-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+da335ee2e7d1439dcc7e11e89941edfad91e9e10
diff --git a/solr/licenses/http2-common-9.4.14.v20181114.jar.sha1 b/solr/licenses/http2-common-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index dd687dd..0000000
--- a/solr/licenses/http2-common-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-820ca2201ad531983cc3a8e2a82153268828d025
diff --git a/solr/licenses/http2-common-9.4.19.v20190610.jar.sha1 b/solr/licenses/http2-common-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..dcfb3b1
--- /dev/null
+++ b/solr/licenses/http2-common-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+3b8c59c68d52a3d0de0d53f5b3588be3a5c05fb8
diff --git a/solr/licenses/http2-hpack-9.4.14.v20181114.jar.sha1 b/solr/licenses/http2-hpack-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 755beb4..0000000
--- a/solr/licenses/http2-hpack-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e6cc7ae5b5749afe8b787595b28c6813c13c3ac2
diff --git a/solr/licenses/http2-hpack-9.4.19.v20190610.jar.sha1 b/solr/licenses/http2-hpack-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..b2092f1
--- /dev/null
+++ b/solr/licenses/http2-hpack-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+3aaf2c8c9c781f10d4d9da6120c5195b2fcb2ad9
diff --git a/solr/licenses/http2-http-client-transport-9.4.14.v20181114.jar.sha1 b/solr/licenses/http2-http-client-transport-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index d71330c..0000000
--- a/solr/licenses/http2-http-client-transport-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-77139eb205d3ddb2d19458c534c734f11491a429
diff --git a/solr/licenses/http2-http-client-transport-9.4.19.v20190610.jar.sha1 b/solr/licenses/http2-http-client-transport-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..366440f
--- /dev/null
+++ b/solr/licenses/http2-http-client-transport-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+95f58cd0cfa0c4553fc3901138cc6a03ece23b94
diff --git a/solr/licenses/http2-server-9.4.14.v20181114.jar.sha1 b/solr/licenses/http2-server-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index f3b32ac..0000000
--- a/solr/licenses/http2-server-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a2ce60a90cbf4db91240bb585733e33b1a55110f
diff --git a/solr/licenses/http2-server-9.4.19.v20190610.jar.sha1 b/solr/licenses/http2-server-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..1487585
--- /dev/null
+++ b/solr/licenses/http2-server-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+672891a1abbeef85192d137192e347872a6fc9c3
diff --git a/solr/licenses/jetty-alpn-client-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-alpn-client-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 5b09025..0000000
--- a/solr/licenses/jetty-alpn-client-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c567eba368e70a0a9aaded14a554a3b25a0a502e
diff --git a/solr/licenses/jetty-alpn-client-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-alpn-client-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..b2fd01b
--- /dev/null
+++ b/solr/licenses/jetty-alpn-client-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+8c9283b8a04056a0fced23fc474e62aa39764c6b
diff --git a/solr/licenses/jetty-alpn-java-client-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-alpn-java-client-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index ddd5f76..0000000
--- a/solr/licenses/jetty-alpn-java-client-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f093d00fc7112bdf471efdd5d909eb9296b3d30d
diff --git a/solr/licenses/jetty-alpn-java-client-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-alpn-java-client-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..f2e0fc2
--- /dev/null
+++ b/solr/licenses/jetty-alpn-java-client-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+37eff0bd068adca090e14a0fbd9de258a871f9d9
diff --git a/solr/licenses/jetty-alpn-java-server-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-alpn-java-server-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 327c6e2..0000000
--- a/solr/licenses/jetty-alpn-java-server-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-686cc093a08a2ed2bc2bed059117997c8c760262
diff --git a/solr/licenses/jetty-alpn-java-server-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-alpn-java-server-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..860c219
--- /dev/null
+++ b/solr/licenses/jetty-alpn-java-server-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+7e7f62c2c03b74e59211eeeba0ddc067ad422ff7
diff --git a/solr/licenses/jetty-alpn-server-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-alpn-server-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 1b16a36..0000000
--- a/solr/licenses/jetty-alpn-server-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5aa0ca49c6f7cdd4c2c8a628620dc125162213ca
diff --git a/solr/licenses/jetty-alpn-server-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-alpn-server-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..af58105
--- /dev/null
+++ b/solr/licenses/jetty-alpn-server-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+5dd67dacaf1eed80ab95493da840dab35c22ce9c
diff --git a/solr/licenses/jetty-client-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-client-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 9fd6a17..0000000
--- a/solr/licenses/jetty-client-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1c46b088e1119928d54ff704fe38fe1b6b6700d0
diff --git a/solr/licenses/jetty-client-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-client-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..7b4cb62
--- /dev/null
+++ b/solr/licenses/jetty-client-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+4386c1f243042e0f78f2e4c3c6cd239967410d6e
diff --git a/solr/licenses/jetty-continuation-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-continuation-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 0d9db3a..0000000
--- a/solr/licenses/jetty-continuation-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ac4981a61bcaf4e2538de6270300a870224a16b8
diff --git a/solr/licenses/jetty-continuation-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-continuation-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..d328029
--- /dev/null
+++ b/solr/licenses/jetty-continuation-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+4acddfa41f45790e43fe4be257c3c4bcf6b846ff
diff --git a/solr/licenses/jetty-deploy-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-deploy-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index bdc13e2..0000000
--- a/solr/licenses/jetty-deploy-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-db0e01f00c1d11fbf2dfa72a1707b7ac9859c943
diff --git a/solr/licenses/jetty-deploy-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-deploy-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..6bf5df3
--- /dev/null
+++ b/solr/licenses/jetty-deploy-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+8b350466ff1fcb7030a7abc152eed458e086fac2
diff --git a/solr/licenses/jetty-http-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-http-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 5e72e34..0000000
--- a/solr/licenses/jetty-http-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6d0c8ac42e9894ae7b5032438eb4579c2a47f4fe
diff --git a/solr/licenses/jetty-http-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-http-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..76f1249
--- /dev/null
+++ b/solr/licenses/jetty-http-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+b59ff8ecb0cf5d6234958f2404eabf0b72464e14
diff --git a/solr/licenses/jetty-io-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-io-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index f3acf85..0000000
--- a/solr/licenses/jetty-io-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a8c6a705ddb9f83a75777d89b0be59fcef3f7637
diff --git a/solr/licenses/jetty-io-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-io-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..5af4939
--- /dev/null
+++ b/solr/licenses/jetty-io-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+7eb9a6be62d84e1691e5fdc99223e632485619a8
diff --git a/solr/licenses/jetty-jmx-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-jmx-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 44b8ffc..0000000
--- a/solr/licenses/jetty-jmx-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3e02463d2bff175a3231cd3dc26363eaf76a3b17
diff --git a/solr/licenses/jetty-jmx-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-jmx-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..960d08a
--- /dev/null
+++ b/solr/licenses/jetty-jmx-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+8dc81acdc4d3085c0b5f3c80b9a78cc9cb48bc4e
diff --git a/solr/licenses/jetty-rewrite-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-rewrite-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 636b338..0000000
--- a/solr/licenses/jetty-rewrite-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-eb300aa639175741839b25a5109772bcc71a586a
diff --git a/solr/licenses/jetty-rewrite-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-rewrite-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..76f5e9e
--- /dev/null
+++ b/solr/licenses/jetty-rewrite-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+9b830886bd6098c613ed08d99574bbf300519506
diff --git a/solr/licenses/jetty-security-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-security-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 64e0920..0000000
--- a/solr/licenses/jetty-security-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6cbeb2fe9b3cc4f88a7ea040b8a0c4f703cd72ce
diff --git a/solr/licenses/jetty-security-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-security-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..c873d9a
--- /dev/null
+++ b/solr/licenses/jetty-security-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+bfe96e1e78719bdd446e063c3f45c132010237ce
diff --git a/solr/licenses/jetty-server-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-server-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 182b5c5..0000000
--- a/solr/licenses/jetty-server-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b36a3d52d78a1df6406f6fa236a6eeff48cbfef6
diff --git a/solr/licenses/jetty-server-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-server-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..cbfdf11
--- /dev/null
+++ b/solr/licenses/jetty-server-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+55786f6e6649bd49425a7da1ac72cd85b8dd4bef
diff --git a/solr/licenses/jetty-servlet-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-servlet-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index d1576d3..0000000
--- a/solr/licenses/jetty-servlet-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-96f501462af425190ff7b63e387692c1aa3af2c8
diff --git a/solr/licenses/jetty-servlet-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-servlet-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..c36dab5
--- /dev/null
+++ b/solr/licenses/jetty-servlet-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+89e25610b3199fdf34a831c1b306f7e765928959
diff --git a/solr/licenses/jetty-servlets-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-servlets-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 7fec6af..0000000
--- a/solr/licenses/jetty-servlets-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-38cfc07b53e5d285bb2fca78bb2531565ed9c9e5
diff --git a/solr/licenses/jetty-servlets-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-servlets-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..c17d546
--- /dev/null
+++ b/solr/licenses/jetty-servlets-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+b290c176abe2cd9274b9f794bf74497c4759359d
diff --git a/solr/licenses/jetty-util-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-util-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index ffced69..0000000
--- a/solr/licenses/jetty-util-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5bb3d7a38f7ea54138336591d89dd5867b806c02
diff --git a/solr/licenses/jetty-util-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-util-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..0a2b5ad
--- /dev/null
+++ b/solr/licenses/jetty-util-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+2fd3cd40279280e8c56241f753d2c52d8d446d19
diff --git a/solr/licenses/jetty-webapp-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-webapp-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index 1e774f3..0000000
--- a/solr/licenses/jetty-webapp-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0088a04172b5e7736bc3e95eb58623aa9ccdb475
diff --git a/solr/licenses/jetty-webapp-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-webapp-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..60d1c20
--- /dev/null
+++ b/solr/licenses/jetty-webapp-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+945fc0c0fa69504c194e32c5330afa1df0be9574
diff --git a/solr/licenses/jetty-xml-9.4.14.v20181114.jar.sha1 b/solr/licenses/jetty-xml-9.4.14.v20181114.jar.sha1
deleted file mode 100644
index ee13631..0000000
--- a/solr/licenses/jetty-xml-9.4.14.v20181114.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-65cd197bc8082a1007130c8b644cea7938133568
diff --git a/solr/licenses/jetty-xml-9.4.19.v20190610.jar.sha1 b/solr/licenses/jetty-xml-9.4.19.v20190610.jar.sha1
new file mode 100644
index 0000000..bcfa266
--- /dev/null
+++ b/solr/licenses/jetty-xml-9.4.19.v20190610.jar.sha1
@@ -0,0 +1 @@
+d25e67fbe0809cae777065b75b10ecfb5c1bd749
diff --git a/solr/licenses/start.jar.sha1 b/solr/licenses/start.jar.sha1
index b350925..e7dd6a2 100644
--- a/solr/licenses/start.jar.sha1
+++ b/solr/licenses/start.jar.sha1
@@ -1 +1 @@
-ed9434016612e1e2c29b4db88bc5fdfe7dbcec2f
+6ab950be264e74803f12ba43ee5db434a74e6c0c
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index 6d8adc0..8d38cd5 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -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;
}
diff --git a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
index 1705dfc..48438d6 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
@@ -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);