Merge branch 'jetty-12.0.x' into jetty-12.1.x

build/build-resources/pom.xml

@@ -18,7 +18,7 @@
     <maven.javadoc.plugin.version>3.4.0</maven.javadoc.plugin.version>
     <maven.javadoc.skip>true</maven.javadoc.skip>
     <maven.remote-resources.plugin.version>3.2.0</maven.remote-resources.plugin.version>
-    <maven.surefire.plugin.version>3.3.1</maven.surefire.plugin.version>
+    <maven.surefire.plugin.version>3.5.2</maven.surefire.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <skipTests>true</skipTests>
   </properties>

jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/Environment.java

@@ -88,7 +88,7 @@ public interface Environment extends Attributes
 
         public Named(String name)
         {
-            this (name, null);
+            this(name, null);
         }
 
         public Named(String name, ClassLoader classLoader)

jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java

@@ -46,7 +46,7 @@ public class WebSocketComponents extends ContainerLifeCycle
     public WebSocketComponents(WebSocketExtensionRegistry extensionRegistry, DecoratedObjectFactory objectFactory,
                                ByteBufferPool bufferPool, InflaterPool inflaterPool, DeflaterPool deflaterPool)
     {
-        this (extensionRegistry, objectFactory, bufferPool, inflaterPool, deflaterPool, null);
+        this(extensionRegistry, objectFactory, bufferPool, inflaterPool, deflaterPool, null);
     }
 
     public WebSocketComponents(WebSocketExtensionRegistry extensionRegistry, DecoratedObjectFactory objectFactory,

jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/AsyncContextEvent.java

@@ -35,7 +35,7 @@ public class AsyncContextEvent extends AsyncEvent implements Runnable
 
     public AsyncContextEvent(ContextHandler.APIContext context, AsyncContextState asyncContext, HttpChannelState state, Request baseRequest, ServletRequest request, ServletResponse response)
     {
-        this (context, asyncContext, state, baseRequest, request, response, null);
+        this(context, asyncContext, state, baseRequest, request, response, null);
     }
 
     public AsyncContextEvent(ContextHandler.APIContext context, AsyncContextState asyncContext, HttpChannelState state, Request baseRequest, ServletRequest request, ServletResponse response, HttpURI baseURI)

jetty-integrations/jetty-gcloud/pom.xml

@@ -17,8 +17,8 @@
   </modules>
 
   <properties>
-    <gcloud.version>2.19.0</gcloud.version>
-    <protobuf.version>3.25.2</protobuf.version>
+    <gcloud.version>2.24.1</gcloud.version>
+    <protobuf.version>3.25.5</protobuf.version>
   </properties>
 
 </project>

pom.xml

@@ -169,11 +169,11 @@
     <asm.version>9.7.1</asm.version>
     <awaitility.version>4.2.2</awaitility.version>
     <bndlib.version>7.0.0</bndlib.version>
-    <bouncycastle.version>1.78.1</bouncycastle.version>
+    <bouncycastle.version>1.79</bouncycastle.version>
     <build-helper.maven.plugin.version>3.6.0</build-helper.maven.plugin.version>
     <build-support.version>1.5</build-support.version>
-    <buildnumber.maven.plugin.version>3.2.0</buildnumber.maven.plugin.version>
-    <checkstyle.version>10.17.0</checkstyle.version>
+    <buildnumber.maven.plugin.version>3.2.1</buildnumber.maven.plugin.version>
+    <checkstyle.version>10.20.1</checkstyle.version>
     <commons-codec.version>1.17.1</commons-codec.version>
     <commons-io.version>2.16.1</commons-io.version>
     <commons-lang3.version>3.14.0</commons-lang3.version>
@@ -283,11 +283,11 @@
     <felix.version>7.0.5</felix.version>
     <findbugs.jsr305.version>3.0.2</findbugs.jsr305.version>
     <flatten.maven.plugin.version>1.6.0</flatten.maven.plugin.version>
-    <google.errorprone.version>2.28.0</google.errorprone.version>
+    <google.errorprone.version>2.35.1</google.errorprone.version>
     <groovy.version>4.0.6</groovy.version>
-    <grpc.version>1.65.0</grpc.version>
+    <grpc.version>1.68.1</grpc.version>
     <gson.version>2.11.0</gson.version>
-    <guava.version>33.2.1-jre</guava.version>
+    <guava.version>33.3.1-jre</guava.version>
     <guice.version>7.0.0</guice.version>
     <hamcrest.version>3.0</hamcrest.version>
     <hazelcast.version>5.5.0</hazelcast.version>
@@ -299,7 +299,7 @@
     <injection.bundle.version>1.2</injection.bundle.version>
     <invoker.mergeUserSettings>false</invoker.mergeUserSettings>
     <it.debug>false</it.debug>
-    <jackson.version>2.18.0</jackson.version>
+    <jackson.version>2.18.1</jackson.version>
     <jacoco.maven.plugin.version>0.8.12</jacoco.maven.plugin.version>
     <javadoc.verbose>false</javadoc.verbose>
     <jboss-logmanager.version>3.0.6.Final</jboss-logmanager.version>
@@ -337,40 +337,40 @@
     <license.maven.plugin.version>4.5</license.maven.plugin.version>
     <localRepoPath>${project.build.directory}/local-repo</localRepoPath>
     <log4j2.version>2.24.1</log4j2.version>
-    <logback.version>1.5.6</logback.version>
+    <logback.version>1.5.12</logback.version>
     <lucene.version>9.9.2</lucene.version>
     <mariadb.docker.version>10.3.6</mariadb.docker.version>
-    <mariadb.version>3.4.1</mariadb.version>
+    <mariadb.version>3.5.0</mariadb.version>
     <maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.version>
     <maven-build-cache.version>1.2.0</maven-build-cache.version>
     <maven-plugin.plugin.version>3.13.1</maven-plugin.plugin.version>
     <maven.antrun.plugin.version>3.1.0</maven.antrun.plugin.version>
     <maven.assembly.plugin.version>3.7.1</maven.assembly.plugin.version>
     <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
-    <maven.checkstyle.plugin.version>3.4.0</maven.checkstyle.plugin.version>
+    <maven.checkstyle.plugin.version>3.6.0</maven.checkstyle.plugin.version>
     <maven.clean.plugin.version>3.4.0</maven.clean.plugin.version>
     <maven.compiler.createMissingPackageInfoClass>false</maven.compiler.createMissingPackageInfoClass>
     <maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
-    <maven.dependency.plugin.version>3.7.1</maven.dependency.plugin.version>
-    <maven.deploy.plugin.version>3.1.2</maven.deploy.plugin.version>
-    <maven.deps.version>3.9.8</maven.deps.version>
+    <maven.dependency.plugin.version>3.8.1</maven.dependency.plugin.version>
+    <maven.deploy.plugin.version>3.1.3</maven.deploy.plugin.version>
+    <maven.deps.version>3.9.9</maven.deps.version>
     <maven.enforcer.plugin.version>3.5.0</maven.enforcer.plugin.version>
-    <maven.exec.plugin.version>3.3.0</maven.exec.plugin.version>
-    <maven.gpg.plugin.version>3.2.4</maven.gpg.plugin.version>
-    <maven.install.plugin.version>3.1.2</maven.install.plugin.version>
-    <maven.invoker.plugin.version>3.7.0</maven.invoker.plugin.version>
+    <maven.exec.plugin.version>3.5.0</maven.exec.plugin.version>
+    <maven.gpg.plugin.version>3.2.7</maven.gpg.plugin.version>
+    <maven.install.plugin.version>3.1.3</maven.install.plugin.version>
+    <maven.invoker.plugin.version>3.8.1</maven.invoker.plugin.version>
     <maven.jar.plugin.version>3.4.2</maven.jar.plugin.version>
-    <maven.javadoc.plugin.version>3.7.0</maven.javadoc.plugin.version>
-    <maven.plugin-tools.version>3.13.1</maven.plugin-tools.version>
+    <maven.javadoc.plugin.version>3.11.1</maven.javadoc.plugin.version>
+    <maven.plugin-tools.version>3.15.1</maven.plugin-tools.version>
     <maven.release.plugin.version>3.1.0</maven.release.plugin.version>
     <maven.remote-resources-plugin.version>3.2.0</maven.remote-resources-plugin.version>
-    <maven.resolver.version>1.9.20</maven.resolver.version>
+    <maven.resolver.version>1.9.22</maven.resolver.version>
     <maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
     <maven.shade.plugin.version>3.6.0</maven.shade.plugin.version>
     <maven.source.plugin.version>3.3.1</maven.source.plugin.version>
-    <!-- do not upgrade as jpms issue with ee11 annotations -->
-    <maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version>
-    <maven.version>3.9.0</maven.version>
+    <!-- do not upgrade as jpms issue with ee10 annotations -->
+    <maven.surefire.plugin.version>3.3.0</maven.surefire.plugin.version>
+    <maven.version>3.9.9</maven.version>
     <maven.war.plugin.version>3.4.0</maven.war.plugin.version>
     <mina.core.version>2.2.3</mina.core.version>
     <mongo.docker.version>5.0.26</mongo.docker.version>
@@ -408,7 +408,7 @@
     <sisu.plexus.version>0.9.0.M3</sisu.plexus.version>
     <slf4j.version>2.0.16</slf4j.version>
     <spifly.version>1.3.7</spifly.version>
-    <spotbugs.maven.plugin.version>4.8.6.0</spotbugs.maven.plugin.version>
+    <spotbugs.maven.plugin.version>4.8.6.5</spotbugs.maven.plugin.version>
     <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
     <surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
     <swissbox.version>1.8.3</swissbox.version>
@@ -542,6 +542,11 @@
         <artifactId>grpc-core</artifactId>
         <version>${grpc.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.smallrye.common</groupId>
+        <artifactId>smallrye-common-cpu</artifactId>
+        <version>2.8.0</version>
+      </dependency>
       <dependency>
         <groupId>net.java.dev.jna</groupId>
         <artifactId>jna</artifactId>
@@ -679,12 +684,6 @@
         <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-api</artifactId>
         <version>${maven.plugin-tools.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.resolver</groupId>
@@ -696,6 +695,11 @@
         <artifactId>maven-resolver-supplier</artifactId>
         <version>${maven.resolver.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.mina</groupId>
+        <artifactId>mina-core</artifactId>
+        <version>${mina.core.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.awaitility</groupId>
         <artifactId>awaitility</artifactId>