From 091c6f22e6db3cb599356ffeb9cbb8eb5466e312 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Thu, 21 Nov 2019 16:00:40 +1100
Subject: [PATCH] Issue #4342 - fix creation of HttpClient in jetty-openid.xml
 for jetty10

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 jetty-openid/src/main/config/etc/jetty-openid.xml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/jetty-openid/src/main/config/etc/jetty-openid.xml b/jetty-openid/src/main/config/etc/jetty-openid.xml
index 1daa662318c..5072c160495 100644
--- a/jetty-openid/src/main/config/etc/jetty-openid.xml
+++ b/jetty-openid/src/main/config/etc/jetty-openid.xml
@@ -4,8 +4,18 @@
   <Get id="ThreadPool" name="threadPool"/>
   <New id="HttpClient" class="org.eclipse.jetty.client.HttpClient">
     <Arg>
-      <New class="org.eclipse.jetty.util.ssl.SslContextFactory$Client">
-        <Set name="trustAll" type="boolean"><Property name="jetty.openid.sslContextFactory.trustAll" default="false"/></Set>
+      <New class="org.eclipse.jetty.client.http.HttpClientTransportOverHTTP">
+        <Arg>
+          <New class="org.eclipse.jetty.io.ClientConnector">
+            <Set name="sslContextFactory">
+              <New class="org.eclipse.jetty.util.ssl.SslContextFactory$Client">
+                <Set name="trustAll" type="boolean">
+                  <Property name="jetty.openid.sslContextFactory.trustAll" default="false"/>
+                </Set>
+              </New>
+            </Set>
+          </New>
+        </Arg>
       </New>
     </Arg>
     <Set name="executor"><Ref refid="ThreadPool"/></Set>