This is an automated email from the ASF dual-hosted git repository.
Abacn 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 69bdf5f2917 Update Jetty to 9.4.58.v20250814 and exclude shaded Jetty
pom metadata in Dataflow worker (#40389)
69bdf5f2917 is described below
commit 69bdf5f29174adebe19006e1397acd6681ffce9d
Author: Ashwin S <[email protected]>
AuthorDate: Fri Oct 2 15:26:51 2026 -0400
Update Jetty to 9.4.58.v20250814 and exclude shaded Jetty pom metadata in
Dataflow worker (#40389)
---
runners/google-cloud-dataflow-java/worker/build.gradle | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/runners/google-cloud-dataflow-java/worker/build.gradle
b/runners/google-cloud-dataflow-java/worker/build.gradle
index 2ca5d77a6f0..a343cac2817 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.57.v20241219"))
+ include(dependency("org.eclipse.jetty:.*:9.4.58.v20250814"))
include(dependency("javax.servlet:javax.servlet-api:3.1.0"))
}
relocate("org.eclipse.jetty",
getWorkerRelocatedPath("org.eclipse.jetty"))
@@ -149,6 +149,7 @@ applyJavaNature(
from "$buildDir/original_sources_to_package"
exclude "META-INF/LICENSE.txt"
+ exclude "META-INF/maven/org.eclipse.jetty/**"
exclude "about.html"
})
/******************************************************************************/
@@ -221,8 +222,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.57.v20241219"
- implementation "org.eclipse.jetty:jetty-servlet:9.4.57.v20241219"
+ implementation "org.eclipse.jetty:jetty-server:9.4.58.v20250814"
+ implementation "org.eclipse.jetty:jetty-servlet:9.4.58.v20250814"
implementation library.java.avro
implementation library.java.jackson_annotations
implementation library.java.jackson_core
