[GH-15706] Upgrade Jetty Server in Standalone Main Jar (#15726)

* [GH-15706] Upgrade Jetty Server in Standalone Main Jar

* Update Jetty9HelperTest

* Downgrade Jetty version

* setRelativeRedirectAllowed via reflection

* Formatting

build.gradle

@@ -85,7 +85,6 @@ ext {
       project(':h2o-webserver-iface'),
       project(':h2o-jetty-8'),
       project(':h2o-jetty-9'),
-      project(':h2o-jetty-9-ext'),
       project(':h2o-jetty-9-minimal'),
       project(':h2o-ext-jython-cfunc'),
       project(':h2o-hive'),
@@ -133,7 +132,6 @@ ext {
       project(':h2o-webserver-iface'),
       project(':h2o-jetty-8'),
       project(':h2o-jetty-9'),
-      project(':h2o-jetty-9-ext'),
       project(':h2o-jetty-9-minimal'),
       project(':h2o-ext-jython-cfunc'),
       project(':h2o-hive'),

gradle.properties

@@ -52,16 +52,17 @@ httpClientVersion=4.5.2
 defaultParquetVersion=1.12.3
 
 # Default Hadoop client version
-defaultHadoopVersion=3.3.5
+defaultHadoopVersion=3.3.6
 defaultHdfsDependency=hadoop-hdfs-client
 
 defaultWebserverModule=h2o-jetty-9
-# default module to be included in assemblies
-defaultExtWebserverModule=h2o-jetty-9-ext
 # jetty 8 version is used by Hadoop 2.x builds
 jetty8version=8.2.0.v20160908
-# jetty 9 version is used in the main standalone assembly
+# jetty 9 version is used for compilation of h2o-jetty-9 module and serves as base jetty hadoop version for hadoop 3.0 
+# packages. Each hadoop package can upgrade its jetty version.
 jetty9version=9.4.11.v20180605
+# jetty 9 version is used in the main standalone assembly
+jetty9MainVersion=9.4.51.v20230217
 # jetty-minimal 9 version is used in the minimal standalone assembly
 jetty9MinimalVersion=9.4.51.v20230217
 servletApiVersion=3.1.0

h2o-assemblies/main/build.gradle

@@ -9,7 +9,6 @@ apply from: '../standalone_assembly.gradle'
 dependencies {
     api project(":h2o-app")
     api project(":h2o-logging-impl-log4j2")
-    runtimeOnly project(":${defaultExtWebserverModule}")
     api project(":h2o-web")
     api project(":h2o-avro-parser")
     api project(":h2o-persist-gcs")
@@ -35,6 +34,15 @@ dependencies {
         exclude group: "org.apache.zookeeper"
         exclude group: "org.eclipse.jetty"
     }
+
+    // Upgrade dependencies of h2o-jetty-9
+    api "org.eclipse.jetty:jetty-server:${jetty9MainVersion}"
+    api "org.eclipse.jetty:jetty-servlets:${jetty9MainVersion}"
+    api "org.eclipse.jetty:jetty-jaas:${jetty9MainVersion}"
+    api "org.eclipse.jetty:jetty-proxy:${jetty9MainVersion}"
+    api "org.eclipse.jetty:jetty-servlet:${jetty9MainVersion}"
+    api "org.eclipse.jetty.websocket:websocket-api:${jetty9MainVersion}"
+    api "org.eclipse.jetty.websocket:websocket-server:${jetty9MainVersion}"
 
     // Need to a newer org.apache.hadoop.hive.shims.ShimLoader to make older hive JDBC drivers work on Hadoop 3.
     implementation 'org.apache.hive.shims:hive-shims-common:2.3.9'