From ca19b143a9de1c222b517028afc118482f7c093b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 04:15:39 +0000
Subject: [PATCH] Bump maven.surefire.plugin.version from 3.0.0-M5 to 3.0.0-M8
 (#9255)

---
 build-resources/pom.xml          |  2 +-
 jetty-annotations/pom.xml        |  4 +++-
 jetty-client/pom.xml             |  1 +
 jetty-deploy/pom.xml             |  5 ++++-
 jetty-fcgi/fcgi-server/pom.xml   | 14 ++++++++++++++
 jetty-http/pom.xml               |  9 +++++++++
 jetty-http2/http2-client/pom.xml |  1 +
 jetty-http2/http2-server/pom.xml |  5 ++++-
 jetty-io/pom.xml                 | 13 +++++++++++++
 jetty-proxy/pom.xml              | 14 ++++++++++++++
 jetty-quic/quic-server/pom.xml   |  2 +-
 jetty-server/pom.xml             |  4 +++-
 jetty-servlet/pom.xml            |  1 +
 jetty-servlets/pom.xml           | 11 ++++++++++-
 jetty-util/pom.xml               |  3 +++
 jetty-xml/pom.xml                |  9 +++++++++
 pom.xml                          |  2 +-
 17 files changed, 92 insertions(+), 8 deletions(-)

diff --git a/build-resources/pom.xml b/build-resources/pom.xml
index 3c216581d60..609422170bd 100644
--- a/build-resources/pom.xml
+++ b/build-resources/pom.xml
@@ -17,7 +17,7 @@
     <maven.deploy.plugin.version>3.0.0-M2</maven.deploy.plugin.version>
     <maven.javadoc.plugin.version>3.4.0</maven.javadoc.plugin.version>
     <maven.remote-resources.plugin.version>3.0.0</maven.remote-resources.plugin.version>
-    <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
+    <maven.surefire.plugin.version>3.0.0-M8</maven.surefire.plugin.version>
     <maven.deploy.skip>true</maven.deploy.skip>
     <maven.javadoc.skip>true</maven.javadoc.skip>
   </properties>
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index cdbf126af3b..bcdc430dda7 100644
--- a/jetty-annotations/pom.xml
+++ b/jetty-annotations/pom.xml
@@ -20,7 +20,9 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>
-            @{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.annotations/org.eclipse.jetty.annotations.resources=org.eclipse.jetty.plus
+            @{argLine} ${jetty.surefire.argLine}
+            --add-opens org.eclipse.jetty.annotations/org.eclipse.jetty.annotations.resources=org.eclipse.jetty.plus
+            --add-reads org.eclipse.jetty.annotations=org.eclipse.jetty.logging
           </argLine>
         </configuration>
       </plugin>
diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index db0b7f69904..8edfa61fe65 100644
--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -23,6 +23,7 @@
             @{argLine} ${jetty.surefire.argLine}
             --add-modules java.security.jgss
             --add-modules org.eclipse.jetty.jmx
+            --add-reads org.eclipse.jetty.client=org.eclipse.jetty.logging
           </argLine>
         </configuration>
       </plugin>
diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml
index 9c5b2f8c5dc..52d1c205d39 100644
--- a/jetty-deploy/pom.xml
+++ b/jetty-deploy/pom.xml
@@ -21,7 +21,10 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>
-            @{argLine} ${jetty.surefire.argLine} --add-modules org.eclipse.jetty.jmx --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http,jetty.servlet.api
+            @{argLine} ${jetty.surefire.argLine}
+            --add-modules org.eclipse.jetty.jmx
+            --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http,jetty.servlet.api
+            --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.logging
           </argLine>
         </configuration>
       </plugin>
diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml
index 351562bf7d0..86acfb048dc 100644
--- a/jetty-fcgi/fcgi-server/pom.xml
+++ b/jetty-fcgi/fcgi-server/pom.xml
@@ -14,6 +14,20 @@
     <bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name>
   </properties>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>
+            @{argLine} ${jetty.surefire.argLine}
+            --add-reads org.eclipse.jetty.fcgi.server=org.eclipse.jetty.logging
+          </argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index 370df19f064..4953bd409e2 100644
--- a/jetty-http/pom.xml
+++ b/jetty-http/pom.xml
@@ -98,6 +98,15 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>
+            @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.http=org.eclipse.jetty.logging
+          </argLine>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml
index 88e31557bf2..92efbfe3428 100644
--- a/jetty-http2/http2-client/pom.xml
+++ b/jetty-http2/http2-client/pom.xml
@@ -22,6 +22,7 @@
           <argLine>
             @{argLine} ${jetty.surefire.argLine}
             --add-reads org.eclipse.jetty.http2.client=org.eclipse.jetty.http2.hpack
+            --add-reads org.eclipse.jetty.http2.client=org.eclipse.jetty.logging
           </argLine>
         </configuration>
       </plugin>
diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml
index 01d84b86c07..a71f8599a96 100644
--- a/jetty-http2/http2-server/pom.xml
+++ b/jetty-http2/http2-server/pom.xml
@@ -21,7 +21,10 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>
-            @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.http2.server=jetty.servlet.api --add-modules jetty.servlet.api
+            @{argLine} ${jetty.surefire.argLine}
+            --add-modules jetty.servlet.api
+            --add-reads org.eclipse.jetty.http2.server=jetty.servlet.api
+            --add-reads org.eclipse.jetty.http2.server=org.eclipse.jetty.logging
           </argLine>
         </configuration>
       </plugin>
diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml
index 66ff7a67731..e3d0306c612 100644
--- a/jetty-io/pom.xml
+++ b/jetty-io/pom.xml
@@ -37,4 +37,17 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>
+            @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.io=org.eclipse.jetty.logging
+          </argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml
index f706d20c1d8..d615390905d 100644
--- a/jetty-proxy/pom.xml
+++ b/jetty-proxy/pom.xml
@@ -15,6 +15,20 @@
     <spotbugs.onlyAnalyze>org.eclipse.jetty.proxy.*</spotbugs.onlyAnalyze>
   </properties>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>
+            @{argLine} ${jetty.surefire.argLine}
+            --add-reads org.eclipse.jetty.proxy=org.eclipse.jetty.logging
+          </argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/jetty-quic/quic-server/pom.xml b/jetty-quic/quic-server/pom.xml
index b237b7e3c23..ce405fccf6a 100644
--- a/jetty-quic/quic-server/pom.xml
+++ b/jetty-quic/quic-server/pom.xml
@@ -42,7 +42,7 @@
     <profile>
       <id>jdk17</id>
       <activation>
-        <jdk>[17,)</jdk>
+        <jdk>17</jdk>
       </activation>
       <dependencies>
         <dependency>
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index 9d80fa4c4fb..add53486c08 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -21,7 +21,9 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>
-            @{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED
+            @{argLine} ${jetty.surefire.argLine}
+            --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED
+            --add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging
           </argLine>
         </configuration>
       </plugin>
diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
index ad640c25d17..3f9aecf9730 100644
--- a/jetty-servlet/pom.xml
+++ b/jetty-servlet/pom.xml
@@ -24,6 +24,7 @@
           <argLine>
             @{argLine} ${jetty.surefire.argLine}
             --add-modules org.eclipse.jetty.util.ajax
+            --add-reads org.eclipse.jetty.servlet=org.eclipse.jetty.logging
           </argLine>
         </configuration>
       </plugin>
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index 5c032ab4935..9e2089d18ac 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -22,7 +22,16 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>
-            @{argLine} ${jetty.surefire.argLine} --add-modules jetty.servlet.api --add-modules org.eclipse.jetty.util --add-modules org.eclipse.jetty.io --add-modules org.eclipse.jetty.http --add-modules org.eclipse.jetty.server --add-reads org.eclipse.jetty.servlets=java.management --add-reads org.eclipse.jetty.servlets=org.eclipse.jetty.jmx
+            @{argLine} ${jetty.surefire.argLine}
+            --add-modules jetty.servlet.api
+            --add-modules org.eclipse.jetty.util
+            --add-modules org.eclipse.jetty.io
+            --add-modules org.eclipse.jetty.http
+            --add-modules org.eclipse.jetty.server
+            --add-modules org.eclipse.jetty.jmx
+            --add-reads org.eclipse.jetty.servlets=java.management
+            --add-reads org.eclipse.jetty.servlets=org.eclipse.jetty.jmx
+            --add-reads org.eclipse.jetty.servlets=org.eclipse.jetty.logging
           </argLine>
         </configuration>
       </plugin>
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index 6fb1b10f4fd..24f13b2bbb4 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -65,6 +65,9 @@
           <systemPropertyVariables>
             <mavenRepoPath>${settings.localRepository}</mavenRepoPath>
           </systemPropertyVariables>
+          <argLine>
+            @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.util=org.eclipse.jetty.logging
+          </argLine>
         </configuration>
       </plugin>
     </plugins>
diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml
index f804760974f..80845333662 100644
--- a/jetty-xml/pom.xml
+++ b/jetty-xml/pom.xml
@@ -25,6 +25,15 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>
+            @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.xml=org.eclipse.jetty.logging
+          </argLine>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/pom.xml b/pom.xml
index 783c02b413b..aa41d545e05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@
     <maven.remote-resources-plugin.version>3.0.0</maven.remote-resources-plugin.version>
     <maven.resources.plugin.version>3.3.0</maven.resources.plugin.version>
     <maven.shade.plugin.version>3.4.1</maven.shade.plugin.version>
-    <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
+    <maven.surefire.plugin.version>3.0.0-M8</maven.surefire.plugin.version>
     <maven.source.plugin.version>3.2.1</maven.source.plugin.version>
     <maven.war.plugin.version>3.3.2</maven.war.plugin.version>
     <spotbugs.maven.plugin.version>4.7.2.0</spotbugs.maven.plugin.version>