From ec1c5314e32a64783041f13183b9733532545b6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 00:10:08 +0000
Subject: [PATCH 1/6] Bump maven.surefire.plugin.version from 3.0.0-M5 to
 3.0.0-M8

Bumps `maven.surefire.plugin.version` from 3.0.0-M5 to 3.0.0-M8.

Updates `maven-failsafe-plugin` from 3.0.0-M5 to 3.0.0-M8
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M5...surefire-3.0.0-M8)

Updates `maven-surefire-plugin` from 3.0.0-M5 to 3.0.0-M8
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M5...surefire-3.0.0-M8)

Updates `surefire-junit47` from 3.0.0-M5 to 3.0.0-M8

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.surefire:surefire-junit47
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build-resources/pom.xml | 2 +-
 pom.xml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-resources/pom.xml b/build-resources/pom.xml
index 3c216581d60b..609422170bd2 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/pom.xml b/pom.xml
index 8871310138c4..3b7e5da626c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,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>

From 9330f7f31c0681ee3a43e3b8a137f2f1f9392492 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 19:12:02 +0000
Subject: [PATCH 2/6] Bump maven.surefire.plugin.version from 3.0.0-M5 to
 3.0.0-M8

Bumps `maven.surefire.plugin.version` from 3.0.0-M5 to 3.0.0-M8.

Updates `maven-failsafe-plugin` from 3.0.0-M5 to 3.0.0-M8
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M5...surefire-3.0.0-M8)

Updates `maven-surefire-plugin` from 3.0.0-M5 to 3.0.0-M8
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M5...surefire-3.0.0-M8)

Updates `surefire-junit47` from 3.0.0-M5 to 3.0.0-M8

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.maven.surefire:surefire-junit47
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build-resources/pom.xml | 2 +-
 pom.xml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-resources/pom.xml b/build-resources/pom.xml
index 3c216581d60b..609422170bd2 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/pom.xml b/pom.xml
index 6b8c05f51726..b71655b0881a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,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>

From 40a15bee005df496070b31708f28ea1ca87f5d90 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 1 Feb 2023 14:19:06 -0600
Subject: [PATCH 3/6] surefire config to add-reads for jetty-slf4j-impl

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 jetty-util/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index 6fb1b10f4fda..24f13b2bbb42 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>

From 2244e5f5ae13d85da9689ddb9d2b2ba3b730cd9c Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 1 Feb 2023 14:58:40 -0600
Subject: [PATCH 4/6] More surefire config for `--add-reads` to
 `org.eclipse.jetty.logging`

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 jetty-http/pom.xml   |  9 +++++++++
 jetty-io/pom.xml     | 13 +++++++++++++
 jetty-server/pom.xml |  4 +++-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index 370df19f0643..4953bd409e29 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-io/pom.xml b/jetty-io/pom.xml
index 66ff7a677312..e3d0306c6122 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-server/pom.xml b/jetty-server/pom.xml
index 9d80fa4c4fb7..add53486c081 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>

From 6601b90c296b71609c12f57769e71115f9a83c3d Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 1 Feb 2023 16:54:11 -0600
Subject: [PATCH 5/6] More surefire config for `--add-reads` to
 `org.eclipse.jetty.logging`

---
 jetty-annotations/pom.xml        |  4 +++-
 jetty-client/pom.xml             |  1 +
 jetty-deploy/pom.xml             |  5 ++++-
 jetty-fcgi/fcgi-server/pom.xml   | 14 ++++++++++++++
 jetty-http2/http2-client/pom.xml |  1 +
 jetty-http2/http2-server/pom.xml |  5 ++++-
 jetty-proxy/pom.xml              | 14 ++++++++++++++
 jetty-servlet/pom.xml            |  1 +
 jetty-servlets/pom.xml           | 11 ++++++++++-
 jetty-xml/pom.xml                |  9 +++++++++
 10 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index cdbf126af3b4..bcdc430dda73 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 db0b7f699040..8edfa61fe657 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 9c5b2f8c5dc6..52d1c205d397 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 351562bf7d0e..86acfb048dc9 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-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml
index 88e31557bf25..92efbfe3428c 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 01d84b86c074..a71f8599a965 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-proxy/pom.xml b/jetty-proxy/pom.xml
index f706d20c1d8e..d615390905de 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-servlet/pom.xml b/jetty-servlet/pom.xml
index ad640c25d17e..3f9aecf9730d 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 5c032ab49353..9e2089d18ac2 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-xml/pom.xml b/jetty-xml/pom.xml
index f804760974f0..808453336628 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>

From ebc1bb0b95d9a7aaadbde8fa4931a493c672b801 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 2 Feb 2023 11:27:25 +1000
Subject: [PATCH 6/6] fix jpms issue with foreig module not anymore in jdk19

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 jetty-quic/quic-server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-quic/quic-server/pom.xml b/jetty-quic/quic-server/pom.xml
index b237b7e3c23d..ce405fccf6ac 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>