Merge pull request #451 from juangon/thorntail_jdk11

Upgrade Thorntail with JDK 11 support

Author: arjantijms

ejb/timer/src/main/webapp/WEB-INF/jboss-deployment-structure.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<jboss-deployment-structure>
+    <deployment>
+        <dependencies>
+        	<!-- com.jayway.awaitility uses sun.reflect internally, module needed in JDK 11 -->
+            <module name="jdk.unsupported"/>
+        </dependencies>
+    </deployment>
+</jboss-deployment-structure>
+

ejb/timer/src/test/java/org/javaee7/ejb/timer/AutomaticTimerBeanTest.java

@@ -7,6 +7,8 @@
 import static org.hamcrest.Matchers.is;
 import static org.javaee7.ejb.timer.WithinWindowMatcher.withinWindow;
 
+import java.io.File;
+
 import javax.inject.Inject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -35,7 +37,8 @@ public static WebArchive deploy() {
                 .addAsLibraries(Maven.resolver().loadPomFromFile("pom.xml")
                         .resolve("com.jayway.awaitility:awaitility")
                         .withTransitivity().asFile())
-                .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, AutomaticTimerBean.class);
+                .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, AutomaticTimerBean.class)
+                .addAsWebInfResource(new File("src/main/webapp/WEB-INF/jboss-deployment-structure.xml"));
     }
 
     @Test

ejb/timer/src/test/java/org/javaee7/ejb/timer/MultipleScheduleTimerBeanTest.java

@@ -9,6 +9,8 @@
 import static org.javaee7.ejb.timer.WithinWindowMatcher.withinWindow;
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
 
+import java.io.File;
+
 import javax.inject.Inject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -36,7 +38,8 @@ public static WebArchive deploy() {
                 .addAsLibraries(Maven.resolver().loadPomFromFile("pom.xml")
                         .resolve("com.jayway.awaitility:awaitility")
                         .withTransitivity().asFile())
-                .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, MultipleScheduleTimerBean.class);
+                .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, MultipleScheduleTimerBean.class)
+                .addAsWebInfResource(new File("src/main/webapp/WEB-INF/jboss-deployment-structure.xml"));
     }
 
     @Test

ejb/timer/src/test/java/org/javaee7/ejb/timer/ProgrammaticTimerBeanTest.java

@@ -8,6 +8,8 @@
 import static org.javaee7.ejb.timer.WithinWindowMatcher.withinWindow;
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
 
+import java.io.File;
+
 import javax.inject.Inject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -40,7 +42,9 @@ public static WebArchive deploy() {
                     WithinWindowMatcher.class, 
                     Ping.class, 
                     PingsListener.class, 
-                    ProgrammaticTimerBean.class);
+                    ProgrammaticTimerBean.class)
+                .addAsWebInfResource(new File("src/main/webapp/WEB-INF/jboss-deployment-structure.xml"));
+                
     }
 
     @Test

ejb/timer/src/test/java/org/javaee7/ejb/timer/SchedulesTimerBeanTest.java

@@ -9,6 +9,8 @@
 import static org.javaee7.ejb.timer.WithinWindowMatcher.withinWindow;
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
 
+import java.io.File;
+
 import javax.inject.Inject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -36,7 +38,8 @@ public static WebArchive deploy() {
                 .addAsLibraries(Maven.resolver().loadPomFromFile("pom.xml")
                         .resolve("com.jayway.awaitility:awaitility")
                         .withTransitivity().asFile())
-                .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, SchedulesTimerBean.class);
+                .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, SchedulesTimerBean.class)
+                .addAsWebInfResource(new File("src/main/webapp/WEB-INF/jboss-deployment-structure.xml"));
     }
 
     @Test

pom.xml

@@ -39,7 +39,7 @@
         <glassfish.version>4.1.1</glassfish.version>
         <liberty.version>16.0.0.4</liberty.version>
         <wildfly.version>13.0.0.Final</wildfly.version>
-        <wildfly.swarm.version>2.0.0.Final</wildfly.swarm.version>
+        <wildfly.swarm.version>2.4.0.Final</wildfly.swarm.version>
         <tomee.version>7.0.2</tomee.version>
         <tomcat.version>9.0.4</tomcat.version>
     </properties>