[RESTEASY-2886] Add the JDK module options required for Java 16+. Upg…

…rade the version of Jetty used for the MicroProfile TCK and modify the timeout for Java 16+. https://issues.redhat.com/browse/RESTEASY-2886
resteasy · May 24, 2021 · da6aaed · da6aaed
1 parent 03e61fd
commit da6aaed
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -170,6 +170,20 @@
                 </plugins>
             </build>
       </profile>
+      <profile>
+          <id>modular.jvm</id>
+          <activation>
+              <jdk>[9,)</jdk>
+          </activation>
+          <properties>
+              <modular.jdk.args>
+                  --add-exports=java.base/sun.nio.ch=ALL-UNNAMED
+                  --add-modules=java.se
+                  --add-opens=java.base/java.util=ALL-UNNAMED
+                  --add-opens=java.base/java.security=ALL-UNNAMED
+              </modular.jdk.args>
+          </properties>
+      </profile>
       <profile>
           <id>github-actions</id>
           <activation>

diff --git a/testsuite/microprofile-tck/pom.xml b/testsuite/microprofile-tck/pom.xml
@@ -16,8 +16,9 @@
 
   <properties>
     <skip.mp.tck>false</skip.mp.tck>
-    <jetty9.version>9.2.28.v20190418</jetty9.version>
+    <jetty9.version>9.2.30.v20200428</jetty9.version>
     <jetty.version>${jetty9.version}</jetty.version>
+    <tck.timeout.offset>30</tck.timeout.offset>
   </properties>
 
   <dependencies>
@@ -210,7 +211,7 @@
         <configuration>
           <skip>${skip.mp.tck}</skip>
           <systemPropertyVariables>
-               <org.eclipse.microprofile.rest.client.tck.timeoutCushion>30</org.eclipse.microprofile.rest.client.tck.timeoutCushion>
+               <org.eclipse.microprofile.rest.client.tck.timeoutCushion>${tck.timeout.offset}</org.eclipse.microprofile.rest.client.tck.timeoutCushion>
           </systemPropertyVariables>
         </configuration>
         <executions>
@@ -247,5 +248,21 @@
         <skip.mp.tck>true</skip.mp.tck>
       </properties>
     </profile>
+    <profile>
+      <id>skip-mp-tck.modular.jvm</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <properties>
+        <modular.jdk.args>
+          --add-exports=java.base/sun.nio.ch=ALL-UNNAMED
+          --add-modules=java.se
+          --add-opens=java.base/java.util=ALL-UNNAMED
+          --add-opens=java.base/java.security=ALL-UNNAMED
+          --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
+        </modular.jdk.args>
+        <tck.timeout.offset>90</tck.timeout.offset>
+      </properties>
+    </profile>
   </profiles>
 </project>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -248,20 +248,6 @@
             </properties>
         </profile>
 
-        <!-- https://issues.jboss.org/browse/MODULES-372 - JDK 11 - module not found java.se -->
-        <profile>
-            <id>modular-jdk</id>
-            <activation>
-                <jdk>[9,)</jdk>
-            </activation>
-            <properties>
-                <modular.jdk.args>--add-exports=java.base/sun.nio.ch=ALL-UNNAMED
-                    --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
-                    --add-exports=jdk.unsupported/sun.reflect=ALL-UNNAMED
-                    --add-modules=java.se</modular.jdk.args>
-            </properties>
-        </profile>
-
         <profile>
             <id>ipv6</id>
             <activation>