diff --git a/core/build.gradle b/core/build.gradle index c267040bcc..a8ba6041db 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -79,6 +79,13 @@ dependencies { api("ai.h2o:h2o-persist-gcs:${h2oVersion}") api("ai.h2o:h2o-jetty-9:${h2oVersion}") api("ai.h2o:h2o-webserver-iface:${h2oVersion}") + api "org.eclipse.jetty:jetty-server:${jettyVersion}" + api "org.eclipse.jetty:jetty-servlets:${jettyVersion}" + api "org.eclipse.jetty:jetty-jaas:${jettyVersion}" + api "org.eclipse.jetty:jetty-proxy:${jettyVersion}" + api "org.eclipse.jetty:jetty-servlet:${jettyVersion}" + api "org.eclipse.jetty.websocket:websocket-api:${jettyVersion}" + api "org.eclipse.jetty.websocket:websocket-server:${jettyVersion}" api("ai.h2o:h2o-automl:${h2oVersion}") api("ai.h2o:h2o-ext-mojo-pipeline:${h2oVersion}") diff --git a/core/src/main/scala/water/webserver/jetty9/SparklingWaterJettyHelper.scala b/core/src/main/scala/water/webserver/jetty9/SparklingWaterJettyHelper.scala index 7400399024..0d8e6c27f5 100644 --- a/core/src/main/scala/water/webserver/jetty9/SparklingWaterJettyHelper.scala +++ b/core/src/main/scala/water/webserver/jetty9/SparklingWaterJettyHelper.scala @@ -100,8 +100,9 @@ class SparklingWaterJettyHelper( if (conf.jksPass.isEmpty) { throw new RuntimeException("JKS is specified but JKS password is missing!") } - val sslFactory = new SslContextFactory(conf.jks.get) + val sslFactory = new SslContextFactory.Server() sslFactory.setKeyStorePassword(conf.jksPass.get) + sslFactory.setKeyStorePath(conf.jks.get) if (conf.jksAlias.isDefined) { sslFactory.setCertAlias(conf.jksAlias.get) } diff --git a/gradle.properties b/gradle.properties index d7c8da1185..0a6c3f3af1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,3 +37,4 @@ spotlessModern=true testH2OBranch=rel-3.44.0 makeBooklet=false testingBaseImage=harbor.h2o.ai/opsh2oai/h2o-3-hadoop-cdh-6.3:84 +jettyVersion=9.4.53.v20231009