diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 24e87f200a7..262b414df0b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -45,6 +45,10 @@ updates:
         versions: [ ">=2.0.0" ]
       - dependency-name: "jakarta.servlet.jsp.jstl:*"
         versions: [ ">=2.0.0" ]
+      - dependency-name: "org.jboss.weld.servlet:*"
+        versions: [ ">=4.0.0" ]
+      - dependency-name: "com.sun.xml.ws:jaxws*"
+        versions: [ ">=3.0.0" ]
 
 #  - package-ecosystem: "maven"
 #    directory: "/"
diff --git a/Jenkinsfile b/Jenkinsfile
index bc747e8b6cc..a3ae5133ae3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,19 +37,6 @@ pipeline {
           }
         }
 
-        // TODO: Remove once JDK17 (non-ea) has been released
-        stage("Build / Test - JDK16") {
-          agent { node { label 'linux' } }
-          steps {
-            container( 'jetty-build' ) {
-              timeout( time: 120, unit: 'MINUTES' ) {
-                mavenBuild( "jdk16", "clean install", "maven3")
-                recordIssues id: "jdk16", name: "Static Analysis jdk16", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), spotBugs(), pmdParser()]
-              }
-            }
-          }
-        }
-
         stage("Build / Test - JDK17") {
           agent { node { label 'linux' } }
           steps {
diff --git a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestSecurityAnnotationConversions.java b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestSecurityAnnotationConversions.java
index 2a6b492b363..2efb321105e 100644
--- a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestSecurityAnnotationConversions.java
+++ b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestSecurityAnnotationConversions.java
@@ -65,12 +65,16 @@ public class TestSecurityAnnotationConversions
     {
     }
 
-    @ServletSecurity(value = @HttpConstraint(value = EmptyRoleSemantic.PERMIT, transportGuarantee = TransportGuarantee.CONFIDENTIAL, rolesAllowed =
-        {
-            "tom", "dick", "harry"
-        }), httpMethodConstraints = {
-        @HttpMethodConstraint(value = "GET", transportGuarantee = TransportGuarantee.CONFIDENTIAL)
-    })
+    @ServletSecurity(
+        value = @HttpConstraint(
+            value = EmptyRoleSemantic.PERMIT,
+            transportGuarantee = TransportGuarantee.CONFIDENTIAL,
+            rolesAllowed = {
+                "tom", "dick", "harry"
+            }),
+        httpMethodConstraints = {
+            @HttpMethodConstraint(value = "GET", transportGuarantee = TransportGuarantee.CONFIDENTIAL)
+        })
     public static class Method2Servlet extends HttpServlet
     {
     }
diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml
index 08ca1aadd39..a4f09ec42b6 100644
--- a/jetty-bom/pom.xml
+++ b/jetty-bom/pom.xml
@@ -17,7 +17,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>
-        <version>1.2.5</version>
+        <version>1.2.7</version>
         <configuration>
           <outputDirectory>${project.build.directory}</outputDirectory>
           <flattenedPomFilename>flattened-pom.xml</flattenedPomFilename>
diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml
index e5240076393..12982f7efab 100644
--- a/jetty-jaas/pom.xml
+++ b/jetty-jaas/pom.xml
@@ -12,8 +12,8 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.jaas</bundle-symbolic-name>
-    <!-- 2.0.0.AM25 is breaking surefire -->
     <apacheds.version>2.0.0.AM26</apacheds.version>
+    <apache.directory.api.version>2.1.0</apache.directory.api.version>
     <spotbugs.onlyAnalyze>org.eclipse.jetty.jaas.*</spotbugs.onlyAnalyze>
   </properties>
 
@@ -119,9 +119,24 @@
     <dependency>
       <groupId>org.apache.directory.api</groupId>
       <artifactId>api-ldap-schema-data</artifactId>
-      <version>2.0.0</version>
+      <version>${apache.directory.api.version}</version>
       <scope>test</scope>      
     </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-model</artifactId>
+      <version>${apache.directory.api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-util</artifactId>
+      <version>${apache.directory.api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-asn1-api</artifactId>
+      <version>${apache.directory.api.version}</version>
+    </dependency>
     <!-- because directory server do not have yet junit5 extensions -->
     <dependency>
       <groupId>org.junit.vintage</groupId>
diff --git a/pom.xml b/pom.xml
index 7419e9b5ec8..7fffc1ed3e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <jetty.url>https://www.eclipse.org/jetty/</jetty.url>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <build-support.version>1.5</build-support.version>
-    <checkstyle.version>8.37</checkstyle.version>
+    <checkstyle.version>9.0</checkstyle.version>
     <slf4j.version>2.0.0-alpha5</slf4j.version>
     <log4j2.version>2.14.0</log4j2.version>
     <logback.version>1.3.0-alpha9</logback.version>
@@ -32,13 +32,14 @@
     <infinispan.protostream.version>4.3.4.Final</infinispan.protostream.version>
     <gson.version>2.8.8</gson.version>
     <grpc.version>1.40.1</grpc.version>
+    <google.errorprone.version>2.9.0</google.errorprone.version>
     <alpn.agent.version>2.0.10</alpn.agent.version>
     <hazelcast.version>4.2.2</hazelcast.version>
     <conscrypt.version>2.5.2</conscrypt.version>
     <asm.version>9.2</asm.version>
     <jmh.version>1.33</jmh.version>
     <jmhjar.name>benchmarks</jmhjar.name>
-    <tycho-version>2.3.0</tycho-version>
+    <tycho.version>2.3.0</tycho.version>
     <junit.version>5.8.0</junit.version>
     <maven.version>3.8.2</maven.version>
     <maven.resolver.version>1.7.2</maven.resolver.version>
@@ -55,6 +56,7 @@
     <jetty.surefire.argLine>-Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx4g -Xms2g -Xlog:gc:stderr:time,level,tags</jetty.surefire.argLine>
 
     <!-- some maven plugins versions -->
+    <maven.invoker.version>3.2.2</maven.invoker.version>
     <maven.surefire.version>3.0.0-M5</maven.surefire.version>
     <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
     <maven.dependency.plugin.version>3.2.0</maven.dependency.plugin.version>
@@ -68,7 +70,7 @@
 
     <!-- testing -->
     <it.debug>false</it.debug>
-    <jetty.test.version>5.5</jetty.test.version>
+    <jetty.test.version>5.8</jetty.test.version>
     <hamcrest.version>2.2</hamcrest.version>
     <mariadb.docker.version>10.3.6</mariadb.docker.version>
 
@@ -83,7 +85,7 @@
     <surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
     <testcontainers.version>1.16.0</testcontainers.version>
     <jna.version>5.9.0</jna.version>
-    <mariadb.version>2.7.0</mariadb.version>
+    <mariadb.version>2.7.4</mariadb.version>
   </properties>
 
   <licenses>
@@ -416,14 +418,6 @@
             </goals>
           </execution>
         </executions>
-        <!-- this has better support of gh token remove when with next release of jetty-version-maven-plugin -->
-        <dependencies>
-          <dependency>
-            <groupId>org.kohsuke</groupId>
-            <artifactId>github-api</artifactId>
-            <version>1.116</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -541,7 +535,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-invoker-plugin</artifactId>
-          <version>3.2.1</version>
+          <version>${maven.invoker.version}</version>
           <configuration>
             <mergeUserSettings>${invoker.mergeUserSettings}</mergeUserSettings>
             <writeJunitReport>true</writeJunitReport>
@@ -732,7 +726,7 @@
         <plugin>
           <groupId>com.mycila</groupId>
           <artifactId>license-maven-plugin</artifactId>
-          <version>3.0</version>
+          <version>4.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.felix</groupId>
@@ -770,7 +764,7 @@
         <plugin>
           <groupId>org.asciidoctor</groupId>
           <artifactId>asciidoctor-maven-plugin</artifactId>
-          <version>2.1.0</version>
+          <version>2.2.1</version>
           <dependencies>
             <dependency>
               <groupId>org.asciidoctor</groupId>
@@ -1214,7 +1208,7 @@
       <dependency>
         <groupId>com.google.inject</groupId>
         <artifactId>guice</artifactId>
-        <version>4.2.2</version>
+        <version>5.0.1</version>
       </dependency>
       <dependency>
         <groupId>com.google.errorprone</groupId>
@@ -1318,6 +1312,11 @@
         <artifactId>jnr-unixsocket</artifactId>
         <version>0.38.10</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.errorprone</groupId>
+        <artifactId>error_prone_annotations</artifactId>
+        <version>${google.errorprone.version}</version>
+      </dependency>
       <!-- avoid depending on a range dependency from a transitive dependency -->
       <dependency>
         <groupId>io.grpc</groupId>
@@ -1342,7 +1341,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <version>3.11</version>
+        <version>3.12.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -1377,7 +1376,7 @@
                   <path>
                     <groupId>com.google.errorprone</groupId>
                     <artifactId>error_prone_core</artifactId>
-                    <version>2.5.1</version>
+                    <version>${google.errorprone.version}</version>
                   </path>
                 </annotationProcessorPaths>
               </configuration>
@@ -1653,7 +1652,7 @@
           <plugin>
             <groupId>org.eclipse.tycho.extras</groupId>
             <artifactId>tycho-pack200a-plugin</artifactId>
-            <version>${tycho-version}</version>
+            <version>${tycho.version}</version>
             <executions>
               <execution>
                 <id>pack200-normalize</id>
@@ -1682,7 +1681,7 @@
           <plugin>
             <groupId>org.eclipse.tycho.extras</groupId>
             <artifactId>tycho-pack200b-plugin</artifactId>
-            <version>${tycho-version}</version>
+            <version>${tycho.version}</version>
             <executions>
               <execution>
                 <id>pack200-pack</id>