Skip to content

Commit 9b6983f

Browse files
committed
Merge remote-tracking branch 'origin/4.14'
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2 parents 11e7de7 + 0501575 commit 9b6983f

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

client/src/main/java/org/apache/cloudstack/ServerDaemon.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ private void createHttpsConnector(final HttpConfiguration httpConfig) {
219219
// Configure SSL
220220
if (httpsEnable && !Strings.isNullOrEmpty(keystoreFile) && new File(keystoreFile).exists()) {
221221
// SSL Context
222-
final SslContextFactory sslContextFactory = new SslContextFactory();
222+
final SslContextFactory sslContextFactory = new SslContextFactory.Server();
223223

224224
// Define keystore path and passwords
225225
sslContextFactory.setKeyStorePath(keystoreFile);

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@
144144
<cs.jaxb.version>2.3.0</cs.jaxb.version>
145145
<cs.jaxws.version>2.3.2-1</cs.jaxws.version>
146146
<cs.jersey-bundle.version>1.19.4</cs.jersey-bundle.version>
147-
<cs.jetty.version>9.4.26.v20200117</cs.jetty.version>
148-
<cs.jetty-maven-plugin.version>9.4.26.v20200117</cs.jetty-maven-plugin.version>
147+
<cs.jetty.version>9.4.27.v20200227</cs.jetty.version>
148+
<cs.jetty-maven-plugin.version>9.4.27.v20200227</cs.jetty-maven-plugin.version>
149149
<cs.jna.version>5.5.0</cs.jna.version>
150150
<cs.joda-time.version>2.10.5</cs.joda-time.version>
151151
<cs.jpa.version>2.2.1</cs.jpa.version>

0 commit comments

Comments
 (0)