You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by yh...@apache.org on 2024/05/21 14:18:48 UTC

(beam) branch master updated: Upgrade jetty to latest 9.x for dataflow legacy worker (#31351)

This is an automated email from the ASF dual-hosted git repository.

yhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new f4119f564fb Upgrade jetty to latest 9.x for dataflow legacy worker (#31351)
f4119f564fb is described below

commit f4119f564fb19b5df01c6e9701c463783c914964
Author: Yi Hu <ya...@google.com>
AuthorDate: Tue May 21 10:18:42 2024 -0400

    Upgrade jetty to latest 9.x for dataflow legacy worker (#31351)
---
 runners/google-cloud-dataflow-java/worker/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runners/google-cloud-dataflow-java/worker/build.gradle b/runners/google-cloud-dataflow-java/worker/build.gradle
index 124c11026df..b7e6e981eff 100644
--- a/runners/google-cloud-dataflow-java/worker/build.gradle
+++ b/runners/google-cloud-dataflow-java/worker/build.gradle
@@ -131,7 +131,7 @@ applyJavaNature(
             dependencies {
                 // We have to include jetty-server/jetty-servlet and all of its transitive dependencies
                 // which includes several org.eclipse.jetty artifacts + servlet-api
-                include(dependency("org.eclipse.jetty:.*:9.2.10.v20150310"))
+                include(dependency("org.eclipse.jetty:.*:9.4.54.v20240208"))
                 include(dependency("javax.servlet:javax.servlet-api:3.1.0"))
             }
             relocate("org.eclipse.jetty", getWorkerRelocatedPath("org.eclipse.jetty"))
@@ -200,8 +200,8 @@ dependencies {
     compileOnly "org.conscrypt:conscrypt-openjdk-uber:2.5.1"
 
     implementation "javax.servlet:javax.servlet-api:3.1.0"
-    implementation "org.eclipse.jetty:jetty-server:9.2.10.v20150310"
-    implementation "org.eclipse.jetty:jetty-servlet:9.2.10.v20150310"
+    implementation "org.eclipse.jetty:jetty-server:9.4.54.v20240208"
+    implementation "org.eclipse.jetty:jetty-servlet:9.4.54.v20240208"
     implementation library.java.avro
     implementation library.java.jackson_annotations
     implementation library.java.jackson_core