diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 8defb633..41fba4f6 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -58,7 +58,7 @@ jobs:
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Set up JDK
-        uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
+        uses: actions/setup-java@77dd5b2ce225ea11469928ac317850245a74ae78 # v6.2.0
         with:
           distribution: ${{ matrix.jdk }}
           java-version: ${{ matrix.java }}
diff --git a/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE11Sdk.java b/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE11Sdk.java
index dc59efc6..8557170c 100644
--- a/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE11Sdk.java
+++ b/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE11Sdk.java
@@ -23,7 +23,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Implementation of the SDK abstraction by the existing GAE SDK distribution, which is composed of
@@ -87,7 +89,7 @@ public String getQuickStartClasspath() {
         new File(getSdkRoot(), "lib/tools/quickstart/quickstartgenerator-jetty121-ee11.jar");
 
     File jettyDir = new File(getSdkRoot(), JETTY121_HOME_LIB_PATH);
-    for (File f : jettyDir.listFiles()) {
+    for (File f : listFiles(jettyDir)) {
       if (!f.isDirectory()
           && !(f.getName().contains("cdi-")
               || f.getName().contains("-alpn-")
@@ -110,32 +112,71 @@ public String getQuickStartClasspath() {
     }
     // Add the API jar, in case it is needed (b/120480580).
     list.add(getSdkRoot() + "/lib/impl/appengine-api.jar");
-    list.add(new File(jettyDir, "jakarta.servlet-api-6.1.0.jar").getAbsolutePath()); // ee11 apis
 
-    // Note: Do not put the Apache JSP files in the classpath. If needed, they should be part of
-    // the application itself under WEB-INF/lib.
-    for (String subdir : new String[] {"ee11-annotations"}) {
-      for (File f : new File(jettyDir, subdir).listFiles()) {
-        list.add(f.getAbsolutePath());
-      }
+    File servletApi = new File(jettyDir, "jakarta.servlet-api-6.1.0.jar");
+    if (!servletApi.exists()) {
+      servletApi = new File(jettyDir, "ee11/support/jakarta.servlet.jakarta.servlet-api-6.1.0.jar");
     }
-    for (String subdir : new String[] {"annotations"}) {
-      for (File f : new File(jettyDir, subdir).listFiles()) {
-        list.add(f.getAbsolutePath());
-      }
+    if (!servletApi.exists()) {
+      servletApi = getJetty121Jar("jakarta.servlet-api-6.1");
     }
-    for (String subdir : new String[] {"ee11-jaspi"}) {
-      for (File f : new File(jettyDir, subdir).listFiles()) {
-        list.add(f.getAbsolutePath());
+    list.add(servletApi.getAbsolutePath()); // ee11 apis
+
+    File ee11Dir = new File(jettyDir, "ee11");
+    if (ee11Dir.isDirectory()) {
+      // Jetty 12.1.15+ layout: EE11 jars are in lib/ee11 and lib/ee11/support
+      for (File f : listFiles(ee11Dir)) {
+        if (!f.isDirectory()
+            && !(f.getName().contains("apache-jsp")
+                || f.getName().contains("-cdi-")
+                || f.getName().contains("-alpn-")
+                || f.getName().contains("-demo-")
+                || f.getName().contains("-websocket-")
+                || f.getName().contains("-gcloud-")
+                || f.getName().contains("-infinispan-")
+                || f.getName().contains("-hazelcast-")
+                || f.getName().contains("-ethereum-"))) {
+          list.add(f.getAbsolutePath());
+        }
+      }
+      File ee11SupportDir = new File(ee11Dir, "support");
+      if (ee11SupportDir.isDirectory()) {
+        for (File f : listFiles(ee11SupportDir)) {
+          if (!f.isDirectory()
+              && (f.getName().contains("jakarta.annotation")
+                  || f.getName().contains("jakarta.authentication"))) {
+            list.add(f.getAbsolutePath());
+          }
+        }
+      }
+      File supportDir = new File(jettyDir, "support");
+      if (supportDir.isDirectory()) {
+        for (File f : listFiles(supportDir)) {
+          if (!f.isDirectory() && (f.getName().contains("asm-") || f.getName().contains("slf4j-api"))) {
+            list.add(f.getAbsolutePath());
+          }
+        }
+      }
+    } else {
+      // Note: Do not put the Apache JSP files in the classpath. If needed, they should be part of
+      // the application itself under WEB-INF/lib.
+      for (String subdir : new String[] {"ee11-annotations", "annotations", "ee11-jaspi"}) {
+        File sub = new File(jettyDir, subdir);
+        if (sub.isDirectory()) {
+          for (File f : listFiles(sub)) {
+            list.add(f.getAbsolutePath());
+          }
+        }
+      }
+      File logDir = new File(jettyDir, "logging");
+      if (logDir.isDirectory()) {
+        for (File f : listFiles(logDir)) {
+          list.add(f.getAbsolutePath());
+        }
       }
     }
 
     list.add(quickstart.getAbsolutePath());
-    // Add Jars for logging.
-    for (File f : new File(jettyDir, "logging").listFiles()) {
-      list.add(f.getAbsolutePath());
-    }
-
     return Joiner.on(System.getProperty("path.separator")).join(list);
   }
 
@@ -145,7 +186,8 @@ public File getResourcesDirectory() {
   }
 
   private List<File> getImplLibFiles() {
-    List<File> lf = getJetty121Jars("");
+    Set<File> lf = new LinkedHashSet<>();
+    lf.addAll(getJetty121Jars(""));
     lf.addAll(getJetty121JspJars());
     lf.addAll(getJetty121Jars("logging"));
     // We also want the devserver to be able to handle annotated servlet, via ASM:
@@ -153,6 +195,10 @@ private List<File> getImplLibFiles() {
     lf.addAll(getJetty121Jars("ee11-annotations"));
     lf.addAll(getJetty121Jars("ee11-apache-jsp"));
     lf.addAll(getJetty121Jars("ee11-glassfish-jstl"));
+    // Jetty 12.1.15+ layout support:
+    lf.addAll(getJetty121Jars("ee11"));
+    lf.addAll(getJetty121Jars("ee11/support"));
+    lf.addAll(getJetty121Jars("support"));
 
     lf.addAll(getLibs(sdkRoot, "impl"));
     lf.add(new File(sdkRoot, "lib/impl/jetty121/appengine-local-runtime-jetty121-ee11.jar"));
@@ -160,11 +206,20 @@ private List<File> getImplLibFiles() {
     // local dev console JSPs. Thus, we include the Apache JSTL jar from ee10-glassfish-jstl.
     // See https://github.com/eclipse-ee4j/wasp/issues/77 for more details, but we are facing it.
     File jettyHomeLib = new File(sdkRoot, JETTY121_HOME_LIB_PATH);
-    lf.add(
+    File apacheJstl =
         new File(
             jettyHomeLib,
-            "ee10-glassfish-jstl/org.glassfish.web.jakarta.servlet.jsp.jstl-3.0.1.jar"));
-    return Collections.unmodifiableList(lf);
+            "ee10-glassfish-jstl/org.glassfish.web.jakarta.servlet.jsp.jstl-3.0.1.jar");
+    if (!apacheJstl.exists()) {
+      apacheJstl =
+          new File(
+              jettyHomeLib,
+              "ee10/support/org.glassfish.web.jakarta.servlet.jsp.jstl-3.0.1.jar");
+    }
+    if (apacheJstl.exists()) {
+      lf.add(apacheJstl);
+    }
+    return Collections.unmodifiableList(new ArrayList<>(lf));
   }
 
   /**
@@ -176,32 +231,17 @@ public List<URL> getSharedJspLibs() {
     return Collections.unmodifiableList(toURLs(getSharedJspLibFiles()));
   }
 
-  @Override
-  protected File getJetty121Jar(String fileNamePattern) {
-    File path = new File(sdkRoot, JETTY121_HOME_LIB_PATH + File.separator);
-
-    if (!path.exists()) {
-      throw new IllegalArgumentException("Unable to find " + path.getAbsolutePath());
-    }
-    for (File f : listFiles(path)) {
-      if (f.getName().endsWith(".jar")) {
-        // All but CDI jar. All the tests are still passing without CDI that should not be exposed
-        // in our runtime (private Jetty dependency we do not want to expose to the customer).
-        if (f.getName().contains(fileNamePattern)) {
-          return f;
-        }
-      }
-    }
-    throw new IllegalArgumentException(
-        "Unable to find " + fileNamePattern + " at " + path.getAbsolutePath());
-  }
-
   @Override
   protected List<File> getJetty121Jars(String subDir) {
-    File path = new File(sdkRoot, JETTY121_HOME_LIB_PATH + File.separator + subDir);
+    File path = subDir.isEmpty()
+        ? new File(sdkRoot, JETTY121_HOME_LIB_PATH)
+        : new File(sdkRoot, JETTY121_HOME_LIB_PATH + File.separator + subDir);
 
     if (!path.exists()) {
-      throw new IllegalArgumentException("Unable to find " + path.getAbsolutePath());
+      if (subDir.isEmpty()) {
+        throw new IllegalArgumentException("Unable to find " + path.getAbsolutePath());
+      }
+      return Collections.emptyList();
     }
     List<File> jars = new ArrayList<>();
     for (File f : listFiles(path)) {
@@ -227,6 +267,7 @@ protected List<File> getJetty121Jars(String subDir) {
             || f.getName().contains("ee9") // we want ee11 only. jakarta apis should be in shared
             || f.getName().contains("ee10") // we want ee11 only. jakarta apis should be in shared
             || f.getName().contains("jetty-jakarta-servlet-api") // no old jakarta APIs
+            || (subDir.equals("ee11") && f.getName().contains("apache-jsp")) // apache-jsp comes from nolog in ee11-apache-jsp
         )) {
           jars.add(f);
         }
@@ -237,25 +278,55 @@ protected List<File> getJetty121Jars(String subDir) {
 
   @Override
   List<File> getJetty121JspJars() {
-
-    List<File> lf = getJetty121Jars("ee11-apache-jsp");
-    lf.addAll(getJetty121Jars("ee11-glassfish-jstl"));
+    Set<File> lf = new LinkedHashSet<>();
+    File ee11Dir = new File(sdkRoot, JETTY121_HOME_LIB_PATH + File.separator + "ee11");
+    if (ee11Dir.isDirectory()) {
+      for (File f : listFiles(ee11Dir)) {
+        if (f.getName().endsWith(".jar") && f.getName().contains("glassfish-jstl")) {
+          lf.add(f);
+        }
+      }
+      File supportDir = new File(ee11Dir, "support");
+      if (supportDir.isDirectory()) {
+        for (File f : listFiles(supportDir)) {
+          if (f.getName().endsWith(".jar")
+              && (f.getName().contains("apache-el")
+                  || f.getName().contains("apache-jsp")
+                  || f.getName().contains("jstl")
+                  || f.getName().contains("jsp-api")
+                  || f.getName().contains("jakarta.el")
+                  || f.getName().contains("wasp"))) {
+            lf.add(f);
+          }
+        }
+      }
+      lf.addAll(getJetty121Jars("ee11-apache-jsp"));
+    } else {
+      lf.addAll(getJetty121Jars("ee11-apache-jsp"));
+      lf.addAll(getJetty121Jars("ee11-glassfish-jstl"));
+    }
     lf.add(getJetty121Jar("ee11-servlet-"));
     lf.add(
         new File(
             sdkRoot,
             "lib/shared/jetty12/appengine-local-runtime-shared.jar")); // contains DTD and XSD
                                                                        // schemas
-    return lf;
+    return new ArrayList<>(lf);
   }
 
   List<File> getJetty121SharedLibFiles() {
-    List<File> sharedLibs;
-    sharedLibs = new ArrayList<>();
+    List<File> sharedLibs = new ArrayList<>();
     sharedLibs.add(new File(sdkRoot, "lib/shared/jetty12/appengine-local-runtime-shared.jar"));
     File jettyHomeLib = new File(sdkRoot, JETTY121_HOME_LIB_PATH);
 
-    sharedLibs.add(new File(jettyHomeLib, "jakarta.servlet-api-6.1.0.jar")); // contains schemas.
+    File servletApi = new File(jettyHomeLib, "jakarta.servlet-api-6.1.0.jar");
+    if (!servletApi.exists()) {
+      servletApi = new File(jettyHomeLib, "ee11/support/jakarta.servlet.jakarta.servlet-api-6.1.0.jar");
+    }
+    if (!servletApi.exists()) {
+      servletApi = getJetty121Jar("jakarta.servlet-api-6.1");
+    }
+    sharedLibs.add(servletApi); // contains schemas.
     // We want to match this file: "jetty-util-9.3.8.v20160314.jar"
     // but without hardcoding the Jetty version which is changing from time to time.
     class JettyVersionFilter implements FileFilter {
diff --git a/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE8Sdk.java b/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE8Sdk.java
index fca51e66..43654a01 100644
--- a/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE8Sdk.java
+++ b/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE8Sdk.java
@@ -23,7 +23,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Implementation of the SDK abstraction by the existing GAE SDK distribution, which is composed of
@@ -95,7 +97,7 @@ public String getQuickStartClasspath() {
         new File(getSdkRoot(), "lib/tools/quickstart/quickstartgenerator-jetty121-ee8.jar");
 
     File jettyDir = new File(getSdkRoot(), JETTY121_HOME_LIB_PATH);
-    for (File f : jettyDir.listFiles()) {
+    for (File f : listFiles(jettyDir)) {
       if (!f.isDirectory()
           && !(f.getName().contains("cdi-")
               || f.getName().contains("-alpn-")
@@ -123,18 +125,60 @@ public String getQuickStartClasspath() {
     // Note: Do not put the Apache JSP files in the classpath. If needed, they should be part of
     // the application itself under WEB-INF/lib.
 
-    for (String subdir : new String[] {"ee8-annotations"}) { // ? "ee8-jaspi" for Jetty12
-      for (File f : new File(jettyDir, subdir).listFiles()) {
-        list.add(f.getAbsolutePath());
+    File ee8Dir = new File(jettyDir, "ee8");
+    if (ee8Dir.isDirectory()) {
+      // Jetty 12.1.15+ layout: EE8 jars are in lib/ee8 and lib/ee8/support
+      for (File f : listFiles(ee8Dir)) {
+        if (!f.isDirectory()
+            && !(f.getName().contains("apache-jsp")
+                || f.getName().contains("-cdi-")
+                || f.getName().contains("-alpn-")
+                || f.getName().contains("-demo-")
+                || f.getName().contains("-websocket-")
+                || f.getName().contains("-gcloud-")
+                || f.getName().contains("-infinispan-")
+                || f.getName().contains("-hazelcast-")
+                || f.getName().contains("-ethereum-"))) {
+          list.add(f.getAbsolutePath());
+        }
+      }
+      File ee8SupportDir = new File(ee8Dir, "support");
+      if (ee8SupportDir.isDirectory()) {
+        for (File f : listFiles(ee8SupportDir)) {
+          if (!f.isDirectory()
+              && (f.getName().contains("jakarta.annotation")
+                  || f.getName().contains("jakarta.security.auth.message"))) {
+            list.add(f.getAbsolutePath());
+          }
+        }
+      }
+      File supportDir = new File(jettyDir, "support");
+      if (supportDir.isDirectory()) {
+        for (File f : listFiles(supportDir)) {
+          if (!f.isDirectory()
+              && (f.getName().contains("asm-") || f.getName().contains("slf4j-api"))) {
+            list.add(f.getAbsolutePath());
+          }
+        }
+      }
+    } else {
+      for (String subdir : new String[] {"ee8-annotations"}) { // ? "ee8-jaspi" for Jetty12
+        File sub = new File(jettyDir, subdir);
+        if (sub.isDirectory()) {
+          for (File f : listFiles(sub)) {
+            list.add(f.getAbsolutePath());
+          }
+        }
+      }
+      File logDir = new File(jettyDir, "logging");
+      if (logDir.isDirectory()) {
+        for (File f : listFiles(logDir)) {
+          list.add(f.getAbsolutePath());
+        }
       }
     }
 
     list.add(quickstart.getAbsolutePath());
-    // Add Jars for logging.
-    for (File f : new File(jettyDir, "logging").listFiles()) {
-      list.add(f.getAbsolutePath());
-    }
-
     return Joiner.on(System.getProperty("path.separator")).join(list);
   }
 
@@ -144,17 +188,22 @@ public File getResourcesDirectory() {
   }
 
   private List<File> getImplLibFiles() {
-    List<File> lf = getJetty121Jars("");
+    Set<File> lf = new LinkedHashSet<>();
+    lf.addAll(getJetty121Jars(""));
     lf.addAll(getJetty121JspJars());
     lf.addAll(getJetty121Jars("logging"));
     // We also want the devserver to be able to handle annotated servlet, via ASM:
     lf.addAll(getJetty121Jars("ee8-annotations"));
     lf.addAll(getJetty121Jars("ee8-apache-jsp"));
     lf.addAll(getJetty121Jars("ee8-glassfish-jstl"));
+    // Jetty 12.1.15+ layout support:
+    lf.addAll(getJetty121Jars("ee8"));
+    lf.addAll(getJetty121Jars("ee8/support"));
+    lf.addAll(getJetty121Jars("support"));
 
     lf.addAll(getLibs(sdkRoot, "impl"));
     lf.add(new File(sdkRoot, "lib/impl/jetty121/appengine-local-runtime-jetty121.jar"));
-    return Collections.unmodifiableList(lf);
+    return Collections.unmodifiableList(new ArrayList<>(lf));
   }
 
   /**
@@ -166,29 +215,48 @@ public List<URL> getSharedJspLibs() {
   }
 
   protected File getJetty121Jar(String fileNamePattern) {
-    File path = new File(sdkRoot, JETTY121_HOME_LIB_PATH + File.separator);
+    File path = new File(sdkRoot, JETTY121_HOME_LIB_PATH);
 
     if (!path.exists()) {
       throw new IllegalArgumentException("Unable to find " + path.getAbsolutePath());
     }
     for (File f : listFiles(path)) {
-      if (f.getName().endsWith(".jar")) {
-        // All but CDI jar. All the tests are still passing without CDI that should not be exposed
-        // in our runtime (private Jetty dependency we do not want to expose to the customer).
-        if (f.getName().contains(fileNamePattern)) {
-          return f;
-        }
+      if (!f.isDirectory() && f.getName().endsWith(".jar") && f.getName().contains(fileNamePattern)) {
+        return f;
       }
     }
+    File found = findJarInSubdirs(path, fileNamePattern);
+    if (found != null) {
+      return found;
+    }
     throw new IllegalArgumentException(
         "Unable to find " + fileNamePattern + " at " + path.getAbsolutePath());
   }
 
+  private static File findJarInSubdirs(File dir, String fileNamePattern) {
+    for (File f : listFiles(dir)) {
+      if (f.isDirectory()) {
+        File found = findJarInSubdirs(f, fileNamePattern);
+        if (found != null) {
+          return found;
+        }
+      } else if (f.getName().endsWith(".jar") && f.getName().contains(fileNamePattern)) {
+        return f;
+      }
+    }
+    return null;
+  }
+
   protected List<File> getJetty121Jars(String subDir) {
-    File path = new File(sdkRoot, JETTY121_HOME_LIB_PATH + File.separator + subDir);
+    File path = subDir.isEmpty()
+        ? new File(sdkRoot, JETTY121_HOME_LIB_PATH)
+        : new File(sdkRoot, JETTY121_HOME_LIB_PATH + File.separator + subDir);
 
     if (!path.exists()) {
-      throw new IllegalArgumentException("Unable to find " + path.getAbsolutePath());
+      if (subDir.isEmpty()) {
+        throw new IllegalArgumentException("Unable to find " + path.getAbsolutePath());
+      }
+      return Collections.emptyList();
     }
     List<File> jars = new ArrayList<>();
     for (File f : listFiles(path)) {
@@ -212,6 +280,7 @@ protected List<File> getJetty121Jars(String subDir) {
             || f.getName().contains("ee10")
             || f.getName().contains("ee11")
             || f.getName().contains("jetty-jakarta-servlet-api") // No jakarta for EE8
+            || (subDir.equals("ee8") && f.getName().contains("apache-jsp")) // apache-jsp comes from nolog in ee8-apache-jsp
         )) {
           jars.add(f);
         }
@@ -221,15 +290,36 @@ protected List<File> getJetty121Jars(String subDir) {
   }
 
   List<File> getJetty121JspJars() {
-
-    List<File> lf = getJetty121Jars("ee8-apache-jsp");
-    lf.addAll(getJetty121Jars("ee8-glassfish-jstl"));
+    Set<File> lf = new LinkedHashSet<>();
+    File ee8Dir = new File(sdkRoot, JETTY121_HOME_LIB_PATH + File.separator + "ee8");
+    if (ee8Dir.isDirectory()) {
+      for (File f : listFiles(ee8Dir)) {
+        if (f.getName().endsWith(".jar") && f.getName().contains("glassfish-jstl")) {
+          lf.add(f);
+        }
+      }
+      File supportDir = new File(ee8Dir, "support");
+      if (supportDir.isDirectory()) {
+        for (File f : listFiles(supportDir)) {
+          if (f.getName().endsWith(".jar")
+              && (f.getName().contains("apache-el")
+                  || f.getName().contains("apache-jsp")
+                  || f.getName().contains("jstl"))) {
+            lf.add(f);
+          }
+        }
+      }
+      lf.addAll(getJetty121Jars("ee8-apache-jsp"));
+    } else {
+      lf.addAll(getJetty121Jars("ee8-apache-jsp"));
+      lf.addAll(getJetty121Jars("ee8-glassfish-jstl"));
+    }
     lf.add(getJetty121Jar("ee8-servlet-"));
     lf.add(new File(
             sdkRoot,
             "lib/shared/jetty12/appengine-local-runtime-shared.jar")); // contains DTD and XSD
                                                                        // schemas
-    return lf;
+    return new ArrayList<>(lf);
   }
 
   List<File> getJetty121SharedLibFiles() {
@@ -237,7 +327,14 @@ List<File> getJetty121SharedLibFiles() {
     sharedLibs.add(new File(sdkRoot, "lib/shared/jetty12/appengine-local-runtime-shared.jar"));
     File jettyHomeLib = new File(sdkRoot, JETTY121_HOME_LIB_PATH);
 
-    sharedLibs.add(new File(jettyHomeLib, "jetty-servlet-api-4.0.9.jar")); // this is javax.servlet
+    File servletApi = new File(jettyHomeLib, "jetty-servlet-api-4.0.9.jar");
+    if (!servletApi.exists()) {
+      servletApi = new File(jettyHomeLib, "ee8/jetty-servlet-api-4.0.9.jar");
+    }
+    if (!servletApi.exists()) {
+      servletApi = getJetty121Jar("jetty-servlet-api-");
+    }
+    sharedLibs.add(servletApi); // this is javax.servlet
 
     // We want to match this file: "jetty-util-9.3.8.v20160314.jar"
     // but without hardcoding the Jetty version which is changing from time to time.
diff --git a/pom.xml b/pom.xml
index 2ba1323e..5da37352 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,8 +69,8 @@
     <auto-service.version>1.1.1</auto-service.version>
     <auto-value.version>1.11.1</auto-value.version>
     <grpc.version>1.85.1</grpc.version>
-    <jetty12.version>12.0.40</jetty12.version>
-    <jetty121.version>12.1.14</jetty121.version>
+    <jetty12.version>12.0.41</jetty12.version>
+    <jetty121.version>12.1.15</jetty121.version>
     <slf4j.version>2.0.20</slf4j.version>
     <protoc.version>4.36.2</protoc.version>
     <surefire.unsafe.arg></surefire.unsafe.arg>
@@ -552,12 +552,12 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>33.7.2-jre</version>
+        <version>33.8.0-jre</version>
       </dependency>
       <dependency>
         <groupId>com.google.errorprone</groupId>
         <artifactId>error_prone_annotations</artifactId>
-        <version>2.51.0</version>
+        <version>2.52.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
@@ -654,7 +654,7 @@
       <dependency>
         <groupId>org.jsoup</groupId>
         <artifactId>jsoup</artifactId>
-        <version>1.23.2</version>
+        <version>1.24.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.lucene</groupId>
@@ -694,7 +694,7 @@
       <dependency>
         <groupId>joda-time</groupId>
         <artifactId>joda-time</artifactId>
-        <version>2.15.0</version>
+        <version>2.15.1</version>
       </dependency>
       <dependency>
         <groupId>org.json</groupId>
@@ -710,7 +710,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava-testlib</artifactId>
-        <version>33.7.2-jre</version>
+        <version>33.8.0-jre</version>
         <scope>test</scope>
       </dependency>
       <dependency>