From a234c7183a500d3981369c9341c186cc55a17ad9 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Mon, 8 Nov 2021 19:50:31 +0100
Subject: [PATCH] Issue #6728 - QUIC and HTTP/3

- Fixed missing <release>17</release> element.
- Fixed --add-opens option in Surefire to run the tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
---
 jetty-bom/pom.xml                                           | 2 +-
 jetty-quic/quic-client/pom.xml                              | 2 +-
 .../quic-quiche/quic-quiche-foreign-incubator/pom.xml       | 6 +++++-
 jetty-quic/quic-server/pom.xml                              | 2 +-
 pom.xml                                                     | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml
index b2d4c03c7bd..d67a46536e5 100644
--- a/jetty-bom/pom.xml
+++ b/jetty-bom/pom.xml
@@ -465,7 +465,7 @@
         <dependencies>
           <dependency>
             <groupId>org.eclipse.jetty.quic</groupId>
-            <artifactId>quic-quiche-panama-jdk</artifactId>
+            <artifactId>quic-quiche-foreign-incubator</artifactId>
             <version>10.0.8-SNAPSHOT</version>
           </dependency>
         </dependencies>
diff --git a/jetty-quic/quic-client/pom.xml b/jetty-quic/quic-client/pom.xml
index f27f9840648..9a998e5c38c 100644
--- a/jetty-quic/quic-client/pom.xml
+++ b/jetty-quic/quic-client/pom.xml
@@ -58,7 +58,7 @@
       <dependencies>
         <dependency>
           <groupId>org.eclipse.jetty.quic</groupId>
-          <artifactId>quic-quiche-panama-jdk</artifactId>
+          <artifactId>quic-quiche-foreign-incubator</artifactId>
         </dependency>
       </dependencies>
     </profile>
diff --git a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml
index 0339f8fa40e..915b9a0ee8e 100644
--- a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml
+++ b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml
@@ -29,6 +29,7 @@
         <configuration>
           <source>17</source>
           <target>17</target>
+          <release>17</release>
           <compilerArgs>
             <arg>--add-modules</arg>
             <arg>jdk.incubator.foreign</arg>
@@ -39,7 +40,10 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>
-            @{argLine} ${jetty.surefire.argLine} --enable-native-access org.eclipse.jetty.quic.quiche.foreign.incubator
+            @{argLine}
+            ${jetty.surefire.argLine}
+            --add-opens org.eclipse.jetty.quic.quiche.foreign.incubator/org.eclipse.jetty.quic.quiche.foreign.incubator=ALL-UNNAMED
+            --enable-native-access org.eclipse.jetty.quic.quiche.foreign.incubator
           </argLine>
         </configuration>
       </plugin>
diff --git a/jetty-quic/quic-server/pom.xml b/jetty-quic/quic-server/pom.xml
index b2452369736..4b54ffb12c2 100644
--- a/jetty-quic/quic-server/pom.xml
+++ b/jetty-quic/quic-server/pom.xml
@@ -47,7 +47,7 @@
       <dependencies>
         <dependency>
           <groupId>org.eclipse.jetty.quic</groupId>
-          <artifactId>quic-quiche-panama-jdk</artifactId>
+          <artifactId>quic-quiche-foreign-incubator</artifactId>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 76775d1032b..6fc9a6df040 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1691,7 +1691,7 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.quic</groupId>
-        <artifactId>quic-quiche-panama-jdk</artifactId>
+        <artifactId>quic-quiche-foreign-incubator</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>