[HUDI-5227] Bump Javalin to 4.6.7 and Jetty to 9.4.48 (apache#7211)

Co-authored-by: Rahil Chertara <rchertar@amazon.com>
fengjian428 · Apr 5, 2023 · be357b7 · be357b7
1 parent c94f33c
commit be357b7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/hudi-timeline-service/pom.xml b/hudi-timeline-service/pom.xml
@@ -104,7 +104,7 @@
     <dependency>
       <groupId>io.javalin</groupId>
       <artifactId>javalin</artifactId>
-      <version>4.6.0</version>
+      <version>${javalin.version}</version>
     </dependency>
 
     <dependency>

diff --git a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java
@@ -18,6 +18,8 @@
 
 package org.apache.hudi.timeline.service;
 
+import io.javalin.core.JavalinConfig;
+import io.javalin.jetty.JettyServer;
 import org.apache.hudi.common.config.HoodieCommonConfig;
 import org.apache.hudi.common.config.HoodieMetadataConfig;
 import org.apache.hudi.common.config.SerializableConfiguration;
@@ -263,10 +265,12 @@ private int startServiceOnPort(int port) throws IOException {
   }
 
   public int startService() throws IOException {
-    final Server server = timelineServerConf.numThreads == DEFAULT_NUM_THREADS ? new Server() : new Server(new QueuedThreadPool(timelineServerConf.numThreads));
-
+    final Server server = timelineServerConf.numThreads == DEFAULT_NUM_THREADS ? new JettyServer(new JavalinConfig()).server() :
+            new Server(new QueuedThreadPool(timelineServerConf.numThreads));
     app = Javalin.create(c -> {
-      c.compressionStrategy(io.javalin.core.compression.CompressionStrategy.NONE);
+      if (!timelineServerConf.compress) {
+        c.compressionStrategy(io.javalin.core.compression.CompressionStrategy.NONE);
+      }
       c.server(() -> server);
     });
 

diff --git a/packaging/hudi-timeline-server-bundle/pom.xml b/packaging/hudi-timeline-server-bundle/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>io.javalin</groupId>
             <artifactId>javalin</artifactId>
-            <version>2.8.0</version>
+            <version>${javalin.version}</version>
         </dependency>
 
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -171,7 +171,8 @@
     <scalatest.spark3.version>3.1.0</scalatest.spark3.version>
     <surefire-log4j.file>log4j2-surefire.properties</surefire-log4j.file>
     <thrift.version>0.12.0</thrift.version>
-    <jetty.version>9.4.33.v20201020</jetty.version>
+    <javalin.version>4.6.7</javalin.version>
+    <jetty.version>9.4.48.v20220622</jetty.version>
     <htrace.version>3.1.0-incubating</htrace.version>
     <hbase.version>2.4.9</hbase.version>
     <h2.version>1.4.199</h2.version>