From 3c6c83da07aba72211eba2aaa085829e327f6ce5 Mon Sep 17 00:00:00 2001
From: Ludovic Orban <lorban@bitronix.be>
Date: Mon, 17 Oct 2022 10:10:19 +0200
Subject: [PATCH]  #8695: make sure the Foreign binding is used for testing
 when running on JDK 17 and not any older nor a more recent version.

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
---
 jetty-quic/quic-client/pom.xml                | 26 ++++---------------
 .../quic-quiche-foreign-incubator/pom.xml     |  2 +-
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/jetty-quic/quic-client/pom.xml b/jetty-quic/quic-client/pom.xml
index b45a0477fd4..65bd5544120 100644
--- a/jetty-quic/quic-client/pom.xml
+++ b/jetty-quic/quic-client/pom.xml
@@ -53,8 +53,12 @@
     <profile>
       <id>jdk17</id>
       <activation>
-        <jdk>[17,)</jdk>
+        <jdk>17</jdk>
       </activation>
+      <!--
+      This profile makes sure the Foreign binding is used for tests when running exactly on JDK 17.
+      Older and newer JDKs will revert to the JNA binding.
+      -->
       <dependencies>
         <dependency>
           <groupId>org.eclipse.jetty.quic</groupId>
@@ -79,25 +83,5 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <!-- Don't use the Foreign binding if the JDK version != 17. -->
-      <id>jdk18+</id>
-      <activation>
-        <jdk>[18,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>
-                @{argLine}
-                ${jetty.surefire.argLine}
-              </argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>
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 058e8528806..af188f03d4b 100644
--- a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml
+++ b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml
@@ -77,7 +77,7 @@
        changed both its API (18) and its name (19), so tests are disabled on JDKs over 17.
        Eventually, new Foreign modules for JDKs 18 and 19 should be added.
        -->
-      <id>jdk18+</id>
+      <id>jdk18</id>
       <activation>
         <jdk>[18,)</jdk>
       </activation>