From 5db1a77e81ba9bb88ce16299bfc5c0afe5fb48b4 Mon Sep 17 00:00:00 2001
From: Falko Modler <famod@users.noreply.github.com>
Date: Sat, 6 Nov 2021 00:55:19 +0100
Subject: [PATCH] Don't run rest-client TCK Timeout*Tests on Java 18

---
 tcks/microprofile-rest-client/pom.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tcks/microprofile-rest-client/pom.xml b/tcks/microprofile-rest-client/pom.xml
index a4b1d7351fd04..9b64505f58df4 100644
--- a/tcks/microprofile-rest-client/pom.xml
+++ b/tcks/microprofile-rest-client/pom.xml
@@ -227,5 +227,28 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>jdk18-workarounds</id>
+            <activation>
+                <jdk>[18,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <!-- "unbind" the JDK16-17 workaround which is based on jdk.net.usePlainSocketImpl
+                                  because that property has been removed in Java 18: https://bugs.openjdk.java.net/browse/JDK-8253119
+                                  see also: https://github.com/quarkusio/quarkus/pull/19559#issuecomment-932987301 -->
+                            <execution>
+                                <id>jdk16-plain-socket-workaround</id>
+                                <phase>none</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>