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

Merge remote-tracking branch 'origin/4.14' 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2020-08-28 12:13:22 +05:30
parent 11e7de7d87 0501575efa
commit 9b6983f0e2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/main/java/org/apache/cloudstack/ServerDaemon.java
View File

@ -219,7 +219,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);

4
pom.xml
View File

@ -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>5.5.0</cs.jna.version>
<cs.joda-time.version>2.10.5</cs.joda-time.version>
<cs.jpa.version>2.2.1</cs.jpa.version>