From 2597148f51fd5b830aabc636b18dd98b2a811cea Mon Sep 17 00:00:00 2001
From: Falko Modler <famod@users.noreply.github.com>
Date: Mon, 4 Mar 2024 21:35:39 +0100
Subject: [PATCH] Remove jdk*-workarounds from rest-client TCK

---
 tcks/microprofile-rest-client/pom.xml | 78 ---------------------------
 1 file changed, 78 deletions(-)

diff --git a/tcks/microprofile-rest-client/pom.xml b/tcks/microprofile-rest-client/pom.xml
index 7885a03f17a25..cdbc0759e4735 100644
--- a/tcks/microprofile-rest-client/pom.xml
+++ b/tcks/microprofile-rest-client/pom.xml
@@ -181,82 +181,4 @@
             </exclusions>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>jdk16-workarounds</id>
-            <activation>
-                <jdk>[16,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>default-test</id>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <excludes>
-                                        <!-- the following tests are run in a separate surefire execution
-                                        by setting certain JDK system properties during launch -->
-                                        <exclude>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutBuilderIndependentOfMPConfigTest</exclude>
-                                        <exclude>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutTest</exclude>
-                                        <exclude>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutViaMPConfigTest</exclude>
-                                        <exclude>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutViaMPConfigWithConfigKeyTest</exclude>
-                                    </excludes>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>jdk16-plain-socket-workaround</id>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <!-- Temporary workaround to prevent org.eclipse.microprofile.rest.client.tck.timeout.Timeout* tests
-                                        from failing because of a different exception type being thrown in Java 13+
-                                        during socket connections -->
-                                        <jdk.net.usePlainSocketImpl>true</jdk.net.usePlainSocketImpl>
-                                    </systemPropertyVariables>
-                                    <includes>
-                                        <include>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutBuilderIndependentOfMPConfigTest</include>
-                                        <include>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutTest</include>
-                                        <include>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutViaMPConfigTest</include>
-                                        <include>org.eclipse.microprofile.rest.client.tck.timeout.TimeoutViaMPConfigWithConfigKeyTest</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </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>