From 0501575efaf98f00727a0074dd8dcc6e2c545d30 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Fri, 28 Aug 2020 12:09:23 +0530
Subject: [PATCH] client: explicitly define SslContextFactory::Server for https
 (#4288)

Fixes #4199

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 client/src/main/java/org/apache/cloudstack/ServerDaemon.java | 2 +-
 pom.xml                                                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/main/java/org/apache/cloudstack/ServerDaemon.java b/client/src/main/java/org/apache/cloudstack/ServerDaemon.java
index 12c5f981466..6e719ef3ca5 100644
--- a/client/src/main/java/org/apache/cloudstack/ServerDaemon.java
+++ b/client/src/main/java/org/apache/cloudstack/ServerDaemon.java
@@ -220,7 +220,7 @@ public class ServerDaemon implements Daemon {
         // Configure SSL
         if (httpsEnable && !Strings.isNullOrEmpty(keystoreFile) && new File(keystoreFile).exists()) {
             // SSL Context
-            final SslContextFactory sslContextFactory = new SslContextFactory();
+            final SslContextFactory sslContextFactory = new SslContextFactory.Server();
 
             // Define keystore path and passwords
             sslContextFactory.setKeyStorePath(keystoreFile);
diff --git a/pom.xml b/pom.xml
index 7bc6396ce3c..d6ec3d59cc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,8 +144,8 @@
         <cs.jaxb.version>2.3.0</cs.jaxb.version>
         <cs.jaxws.version>2.3.2-1</cs.jaxws.version>
         <cs.jersey-bundle.version>1.19.4</cs.jersey-bundle.version>
-        <cs.jetty.version>9.4.26.v20200117</cs.jetty.version>
-        <cs.jetty-maven-plugin.version>9.4.26.v20200117</cs.jetty-maven-plugin.version>
+        <cs.jetty.version>9.4.27.v20200227</cs.jetty.version>
+        <cs.jetty-maven-plugin.version>9.4.27.v20200227</cs.jetty-maven-plugin.version>
         <cs.jna.version>4.0.0</cs.jna.version>
         <cs.joda-time.version>2.10.5</cs.joda-time.version>
         <cs.jpa.version>2.2.1</cs.jpa.version>