Merge pull request #12061 from jetty/merge/jetty-12.0.x/update-from-11

Merge Jetty 11 into Jetty 12.0

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.2.5</maven.surefire.plugin.version>
+    <maven.surefire.plugin.version>3.3.1</maven.surefire.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <skipTests>true</skipTests>
   </properties>
@@ -41,7 +41,7 @@
       <plugin>
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>
-        <version>2.41.1</version>
+        <version>2.43.0</version>
         <configuration>
           <pom>
             <includes>

pom.xml

@@ -8,7 +8,7 @@
   <packaging>pom</packaging>
   <name>Jetty :: Project</name>
   <description>The Eclipse Jetty Project</description>
-  <url>https://eclipse.dev/jetty</url>
+  <url>https://jetty.org</url>
   <inceptionYear>1995</inceptionYear>
 
   <organization>