Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x

pom.xml

@@ -26,7 +26,7 @@
     <alpn.agent.version>2.0.10</alpn.agent.version>
     <ant.version>1.10.12</ant.version>
     <apache.httpclient.version>4.5.13</apache.httpclient.version>
-    <apache.httpcore.version>4.4.15</apache.httpcore.version>
+    <apache.httpcore.version>4.4.16</apache.httpcore.version>
     <asciidoctorj-diagram.version>2.2.3</asciidoctorj-diagram.version>
     <asciidoctorj.version>2.5.6</asciidoctorj.version>
     <asm.version>9.4</asm.version>
@@ -116,7 +116,7 @@
     <maven.clean.plugin.version>3.2.0</maven.clean.plugin.version>
     <maven.checkstyle.plugin.version>3.2.0</maven.checkstyle.plugin.version>
     <maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
-    <maven.dependency.plugin.version>3.3.0</maven.dependency.plugin.version>
+    <maven.dependency.plugin.version>3.4.0</maven.dependency.plugin.version>
     <maven.deploy.plugin.version>3.0.0</maven.deploy.plugin.version>
     <maven.enforcer.plugin.version>3.1.0</maven.enforcer.plugin.version>
     <maven.exec.plugin.version>3.1.0</maven.exec.plugin.version>

tests/jetty-home-tester/pom.xml

@@ -11,7 +11,7 @@
   <packaging>jar</packaging>
 
   <properties>
-    <bundle-symbolic-name>${project.groupId}.tests.hometester</bundle-symbolic-name>
+    <bundle-symbolic-name>${project.groupId}.hometester</bundle-symbolic-name>
   </properties>
 
   <dependencies>
@@ -28,6 +28,11 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-resolver-provider</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
+      <version>1.0.5</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-util</artifactId>

tests/test-distribution/pom.xml

@@ -25,25 +25,21 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.eclipse.jetty</groupId>
+        <groupId>org.eclipse.jetty.tests</groupId>
-        <artifactId>jetty-home</artifactId>
+        <artifactId>jetty-home-tester</artifactId>
-        <type>zip</type>
+        <scope>test</scope>
-        <exclusions>
-          <exclusion>
-            <groupId>-org.eclipse.jetty.ee10</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>-org.eclipse.jetty.ee9</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>-org.eclipse.jetty.ee8</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
+        <groupId>jakarta.inject</groupId>
+        <artifactId>jakarta.inject-api</artifactId>
+        <version>1.0.5</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-slf4j-impl</artifactId>
+        <scope>test</scope>
+      </dependency>
+        <dependency>
         <groupId>org.eclipse.jetty.tests</groupId>
         <artifactId>test-distribution-common</artifactId>
         <version>${project.version}</version>

tests/test-distribution/test-distribution-common/pom.xml

@@ -17,6 +17,8 @@
     <dependency>
       <groupId>org.eclipse.jetty.tests</groupId>
       <artifactId>jetty-home-tester</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -70,6 +72,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-slf4j-impl</artifactId>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

tests/test-distribution/test-ee10-distribution/pom.xml

@@ -48,6 +48,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-slf4j-impl</artifactId>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

tests/test-distribution/test-ee9-distribution/pom.xml

@@ -46,6 +46,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-slf4j-impl</artifactId>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>