From 47d30450873d43c51117bb511e1aea408e64c808 Mon Sep 17 00:00:00 2001 From: Ahmed Abualsaud Date: Wed, 12 Feb 2025 11:47:29 -0500 Subject: [PATCH] Upgrade jetty to latest 12.* for legacy worker --- 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 ab7411ce2eb7..9e7df28acdf2 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.4.54.v20240208")) + include(dependency("org.eclipse.jetty:.*:12.0.16")) 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.4.54.v20240208" - implementation "org.eclipse.jetty:jetty-servlet:9.4.54.v20240208" + implementation "org.eclipse.jetty:jetty-server:12.0.16" + implementation "org.eclipse.jetty:jetty-servlet:12.0.16" implementation library.java.avro implementation library.java.jackson_annotations implementation library.java.jackson_core