Skip to content

Commit 472e6a4

Browse files
authored
[GH-5678] Upgrade Jetty to 9.4.53.v20231009 (#5663)
* Upgrade Jetty to 9.4.52.v20230823 * change version to 9.4.53.v20231009 * Fix Jetty SSLContextFactory class in the helper * rvert property
1 parent c0290ac commit 472e6a4

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

core/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,13 @@ dependencies {
7979
api("ai.h2o:h2o-persist-gcs:${h2oVersion}")
8080
api("ai.h2o:h2o-jetty-9:${h2oVersion}")
8181
api("ai.h2o:h2o-webserver-iface:${h2oVersion}")
82+
api "org.eclipse.jetty:jetty-server:${jettyVersion}"
83+
api "org.eclipse.jetty:jetty-servlets:${jettyVersion}"
84+
api "org.eclipse.jetty:jetty-jaas:${jettyVersion}"
85+
api "org.eclipse.jetty:jetty-proxy:${jettyVersion}"
86+
api "org.eclipse.jetty:jetty-servlet:${jettyVersion}"
87+
api "org.eclipse.jetty.websocket:websocket-api:${jettyVersion}"
88+
api "org.eclipse.jetty.websocket:websocket-server:${jettyVersion}"
8289
api("ai.h2o:h2o-automl:${h2oVersion}")
8390
api("ai.h2o:h2o-ext-mojo-pipeline:${h2oVersion}")
8491

core/src/main/scala/water/webserver/jetty9/SparklingWaterJettyHelper.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,9 @@ class SparklingWaterJettyHelper(
100100
if (conf.jksPass.isEmpty) {
101101
throw new RuntimeException("JKS is specified but JKS password is missing!")
102102
}
103-
val sslFactory = new SslContextFactory(conf.jks.get)
103+
val sslFactory = new SslContextFactory.Server()
104104
sslFactory.setKeyStorePassword(conf.jksPass.get)
105+
sslFactory.setKeyStorePath(conf.jks.get)
105106
if (conf.jksAlias.isDefined) {
106107
sslFactory.setCertAlias(conf.jksAlias.get)
107108
}

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ spotlessModern=true
3737
testH2OBranch=rel-3.44.0
3838
makeBooklet=false
3939
testingBaseImage=harbor.h2o.ai/opsh2oai/h2o-3-hadoop-cdh-6.3:84
40+
jettyVersion=9.4.53.v20231009

0 commit comments

Comments
 (0)