From 7fb2ae1d8555b47d2d6dcb4ee5adf1d44a7ca200 Mon Sep 17 00:00:00 2001
From: Matt Gill <matthew.gill@live.co.uk>
Date: Thu, 14 Dec 2017 17:05:50 +0000
Subject: [PATCH 01/30] Added bean-discovery-mode for empty beans.xml

---
 .../bean/discovery/empty/CdiEmptyTest.java    | 44 +++++++++++++++++++
 .../src/test/resources/empty-beans.xml        |  0
 2 files changed, 44 insertions(+)
 create mode 100644 cdi/bean-discovery-modes/src/test/java/org/javaee8/cdi/bean/discovery/empty/CdiEmptyTest.java
 create mode 100644 cdi/bean-discovery-modes/src/test/resources/empty-beans.xml

diff --git a/cdi/bean-discovery-modes/src/test/java/org/javaee8/cdi/bean/discovery/empty/CdiEmptyTest.java b/cdi/bean-discovery-modes/src/test/java/org/javaee8/cdi/bean/discovery/empty/CdiEmptyTest.java
new file mode 100644
index 00000000..66e3c648
--- /dev/null
+++ b/cdi/bean-discovery-modes/src/test/java/org/javaee8/cdi/bean/discovery/empty/CdiEmptyTest.java
@@ -0,0 +1,44 @@
+package org.javaee8.cdi.bean.discovery.empty;
+
+import static org.junit.Assert.assertFalse;
+
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+
+import org.javaee8.cdi.bean.discovery.disabled.CdiDisabledBean;
+import org.javaee8.cdi.bean.discovery.enabled.CdiEnabledBean;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(Arquillian.class)
+public class CdiEmptyTest {
+
+    @Deployment
+    public static Archive<?> deploy() {
+        return ShrinkWrap.create(WebArchive.class).addClasses(CdiDisabledBean.class, CdiEnabledBean.class)
+        .addAsWebInfResource("empty-beans.xml", "beans.xml");
+    }
+
+    @Inject
+    BeanManager beanManager;
+
+    /**
+     * Should work the same as 'all'.
+     */
+    @Test
+    public void should_beans_be_injected() throws Exception {
+        Set<Bean<?>> disabledBeans = beanManager.getBeans(CdiDisabledBean.class);
+        assertFalse("Instances of disabled bean expected.", disabledBeans.isEmpty());
+
+        Set<Bean<?>> enabledBeans = beanManager.getBeans(CdiEnabledBean.class);
+        assertFalse("Instances of enabled bean expected.", enabledBeans.isEmpty());
+    }
+}
diff --git a/cdi/bean-discovery-modes/src/test/resources/empty-beans.xml b/cdi/bean-discovery-modes/src/test/resources/empty-beans.xml
new file mode 100644
index 00000000..e69de29b

From e4ae2533671249a2629b6f6aefad94cea0fe4756 Mon Sep 17 00:00:00 2001
From: Matt Gill <matthew.gill@live.co.uk>
Date: Mon, 8 Jan 2018 10:56:57 +0000
Subject: [PATCH 02/30] Added Micro container.

---
 pom.xml | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/pom.xml b/pom.xml
index 6c369bf4..312baca7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -419,6 +419,57 @@
             </build>
         </profile>
 
+        <profile>
+            <id>payara-micro-managed</id>
+            <dependencies>
+                <!-- The Arquillian connector -->
+                <dependency>
+                    <groupId>fish.payara.arquillian</groupId>
+                    <artifactId>arquillian-payara-micro-4-managed</artifactId> 
+                    <version>1.0.Beta2</version> 
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <!-- Download Payara Micro and copy to target directory -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>process-test-classes</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>fish.payara.extras</groupId>
+                                            <artifactId>payara-micro</artifactId>
+                                            <version>${payara.version}</version>
+                                            <overWrite>false</overWrite>
+                                            <outputDirectory>${session.executionRootDirectory}/target/</outputDirectory>
+                                            <destFileName>payara-micro-${payara.version}.jar</destFileName>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <!-- Configure Payara Micro Runtime -->
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <environmentVariables>
+                                <MICRO_JAR>${session.executionRootDirectory}/target/payara-micro-${payara.version}.jar</MICRO_JAR>
+                            </environmentVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
         <profile>
             <id>payara-embedded</id>
             <dependencies>

From abdf7398ca2917c61bd5b9a8dd3b3fe2dc51a8f8 Mon Sep 17 00:00:00 2001
From: Matt Gill <matthew.gill@live.co.uk>
Date: Thu, 8 Feb 2018 11:13:49 +0000
Subject: [PATCH 03/30] Added HTTP2 test.

---
 servlet/http2/pom.xml                         |  84 ++++++++++++++++
 .../org/javaee8/servlet/http2/Servlet.java    |  40 ++++++++
 servlet/http2/src/main/webapp/WEB-INF/web.xml |   6 ++
 .../src/main/webapp/images/payara-logo.jpg    | Bin 0 -> 6231 bytes
 .../org/javaee8/servlet/http2/Http2Test.java  |  93 ++++++++++++++++++
 servlet/pom.xml                               |   3 +-
 6 files changed, 225 insertions(+), 1 deletion(-)
 create mode 100644 servlet/http2/pom.xml
 create mode 100644 servlet/http2/src/main/java/org/javaee8/servlet/http2/Servlet.java
 create mode 100644 servlet/http2/src/main/webapp/WEB-INF/web.xml
 create mode 100644 servlet/http2/src/main/webapp/images/payara-logo.jpg
 create mode 100644 servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java

diff --git a/servlet/http2/pom.xml b/servlet/http2/pom.xml
new file mode 100644
index 00000000..d1d3d28b
--- /dev/null
+++ b/servlet/http2/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.javaee8</groupId>
+        <artifactId>servlet</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>servlet-http2</artifactId>
+    <packaging>war</packaging>
+
+    <name>Java EE 8 Samples: Servlet - http2</name>
+    
+    <properties>
+        <alpn-version>8.1.11.v20170118</alpn-version>
+        <jetty-version>9.4.8.v20171121</jetty-version>
+    </properties>
+    
+    <dependencies>
+        <!-- Jetty HTTP2 client -->
+        <dependency>
+            <groupId>org.eclipse.jetty.http2</groupId>
+            <artifactId>http2-client</artifactId>
+            <version>${jetty-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.http2</groupId>
+            <artifactId>http2-common</artifactId>
+            <version>${jetty-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.http2</groupId>
+            <artifactId>http2-http-client-transport</artifactId>
+            <version>${jetty-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-alpn-openjdk8-client</artifactId>
+            <version>${jetty-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-alpn-java-client</artifactId>
+            <version>${jetty-version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.0.2</version>
+                <executions>
+                    <execution>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>get</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <groupId>org.mortbay.jetty.alpn</groupId>
+                    <artifactId>alpn-boot</artifactId>
+                    <version>${alpn-version}</version>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- Configure the use of ALPN in the test -->
+                    <argLine>-Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn-version}/alpn-boot-${alpn-version}.jar</argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>
diff --git a/servlet/http2/src/main/java/org/javaee8/servlet/http2/Servlet.java b/servlet/http2/src/main/java/org/javaee8/servlet/http2/Servlet.java
new file mode 100644
index 00000000..7427750e
--- /dev/null
+++ b/servlet/http2/src/main/java/org/javaee8/servlet/http2/Servlet.java
@@ -0,0 +1,40 @@
+package org.javaee8.servlet.http2;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.PushBuilder;
+import javax.ws.rs.core.MediaType;
+
+@WebServlet("/test")
+public class Servlet extends HttpServlet {
+
+    private static final long serialVersionUID = -3439982021784932020L;
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        response.setContentType(MediaType.TEXT_HTML_TYPE.withCharset(UTF_8.name()).toString());
+        response.setStatus(200);
+
+        PushBuilder builder = request.newPushBuilder();
+
+        // If server push isn't supported, return that in the result.
+        if (builder == null) {
+            response.addHeader("protocol", "HTTP 1.1");
+            response.getWriter().append("<p>The image below was sent normally using HTTP 1.1.</p>");
+        } else {
+            response.addHeader("protocol", "HTTP 2.0");
+            response.getWriter().append("<p>The image below was pushed using HTTP 2.0.</p>");
+            builder.path("images/payara-logo.jpg").push();
+        }
+        response.getWriter().append("<img src=\"images/payara-logo.jpg\" />");
+    }
+
+}
diff --git a/servlet/http2/src/main/webapp/WEB-INF/web.xml b/servlet/http2/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000..ccc69f21
--- /dev/null
+++ b/servlet/http2/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+    <welcome-file-list>
+        <welcome-file>test</welcome-file>
+    </welcome-file-list>
+</web-app>
diff --git a/servlet/http2/src/main/webapp/images/payara-logo.jpg b/servlet/http2/src/main/webapp/images/payara-logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7c22eae068733470083436f4a27bf9de854edb8d
GIT binary patch
literal 6231
zcmd5<XH-*7w>}Uc5$OU_0t6|7fPxTuizpD3fE1A`MUh^l3(}=Z=twtGL_ttG1VoVD
z6bLQ!CY>N%ntb@`_m=zJb=SH-?ppUbXPv2M_RN0v-ZOJDd@=>ls3{|r0U{zIK=t$i
zPDTMGfQ*EcjFg0ojFb!vCWDaEkdvP|LrzacO+j;>o{8x^JtHFv8xIEyD;JcJ5he)Z
z;=Ra!iJzH6NLYwZn1_#_@8=*yU@({*LVk{%{2U((BMaaE8YlGtEd)3K4nRb-05L5Q
zh?eN2319<=0Aga$>2&`D7(z-$L~@20blR*&0}z3TL8p@klYq&<r+rSlgHD$NrlsQ)
zLEMI%GjpcDaP``w04^=_z}T0?jB!~F4BVn(N(sH^nUu9lKIz=CXv9r_I~|Mu??Qe_
z`&mo-H_^XqM*s@YsT^7mEua9D^FjXKKtbvfC;Dzy++93(PT24Qa1YbJD77d-KpepS
z1N+`1E$2Tp6tcEoRFt<80W+9QsY;A$a)rTTPk?-i4&vXSN?cxZEHQlbu4WK%;|644
z3-zrfI%Q$H3G+53W5i#qTj}{W=I~>mo89;VRAtA5fN9#j{jPdu43C}Ipmg11!Ft;^
z-hb`eYv%Ke{q<BY#;M0j0#n)cPo;?rb$-onRJM7i$D&5={H{-@W4K|ne|;YoTI^`;
z!|?D*M32A~H%e&`>N7#eS7PbAzowF8LD>)C>a|vjSD4akZoS<P{rC>Q?D#zeFD2a7
zV0?IEam+bte(83I_5A}EK>|MG$outZ{gW)R>6vS1BaxOBeOis`>WG{4G{wcOtQV{(
ztXKdECjhpN`K_x6(I6Q?DQ{?kGvnC$*SbP_jd9w!2Od~ix$Nm?(#u^GeqqjEzu-hD
zU2<(v#oD3+A+){Erer_oZ1KUbGb$Aeq#as>8NMD7ql9^$QU3TE;nYL(7ktzOotpM}
zy!BbhaOtxct7Q#tT1M$LaG+B|61iHX$x6y=!fP=XqK$-uk0Euc0tB%&foJbRRNvM`
zo9DPsFRrcg;#yRk4l%HhqDq6q4~F?g<>m15%e%R+6Z<5O+7UPe*IcIF(7f^mTB^;=
z&RbK<Bk$#6cbEqjo+E0vIsF6~Z738T=9Z7}XXn1mHAVBKG-U6`H^tY+=Tij!BA*I6
zHTYc8pKMc&ygKvv<zeU-v(DuZEaI)(`8$r3vS-bfeJ7^}NVQY-FQ#mE?I8umjP`2d
zj8L0MSvBfzB9i^#mK>#2xA)bf7rc!yR5?iIV>rV7Z#wAYx)8Ogwp$`jydc%82+SZ6
z#Pg2UvI?Qba7M<c%FcK<>jW9gB+(6Lzwz<i7~NX$l&W{ou32Af$AOlcJybyjBtJDf
z?<UVD)&zyY#x@JC5K_X!XUj)fEb=U)3ksYD5;j(vb}srmicXy&S`?@Fv|Gy&YAsly
z=1j>W<GQ>A_59G97Cz$_0}-|QWs>riu`$1hA#(Xi3=}CFNNzpCA;;4c*KgLvsk!*p
zo+lA*CoNrCVBn>40_Y{pFnk4{{>)R?$xs)baYvaJn;Tz`s)dI)`Pw6VHEC$ziv4bX
ze-S|~p82>SJBIU-JF0ovp&oi|vklLnV~>5l69=LnlDXd7BF|F0Be%N(c=Yx(od9cK
zE`iVrAGuguDx~nIEOA-V;LFLAbbWZcn6-X2Hy`var|E9yR(tl=7};h}k6l@PMf%4^
z;Ss@&<tNyPP->Gbb%_s?ZI4)E?0+v5!oP0aHSac`l?|D;i4$^`EUC+v@bhw-W!2~h
zhwnxEPcT&f6m=>K`?2+DaW{HThC7ahr9z#HYd5|AiK(pX0BLHq`}<OrGNELfS^1y=
z__-1xjWCBkO7oB9PYFuLN|c7CEPm0laT&gbd~oapF8SbP&Nad9n(xi3$R8JJg209&
z;H#Iya5NskqmVep6JR8WK{p*As^b>VFqZ1KJvMv-ED?ck%@@fkY&_XInmqvqK*#wO
zUydf9oB)z1zz$-&Yq<3-?3uB*yqkkUK1DN?kEI;fuwl4mV&R@;AV1O805*Y1u(9hI
zGMPF{5?vfu5}RABLT@f^gW6+^8dY%`!XRG#^!ZLRZ_-Zsd)7jX1`l<HbQR3Sso1$Q
z6)ER7Ay<B=f6c8C`i8Sws<>GF8MI<6?t1kjX0f5o=ksQepW-hdjBB*#+ZzY>rUeyl
zmwLR7KA7vx*zT$FhM}pQj#xh?^YQ0X{bl`s<qR*k=z6M`JtwzH8=u)*e&9N1%MB1{
zT|pC2x1Mh}#WK~OG@L>#eX2E~+B<N$2)By7yZ$me&-uroxde5vw@SSmCpe=rGSPTu
zN!Pg=br8|<hE1^VV`Mri2eX8MEnH_7HLvzlI$O%mlQdfXemOa0l*?nli@o8Sd+H`4
zwSfr*wcxB6C201|fc@Na3wACP98$!O$7dUf$*GVq`@loiR+}^$@Bu2?=2aaVY;uhc
zRkYil#0qHSe@}lh{gM@pg$;@9(qK(})OGKFXc_Ep%ud~9(-)vF+08WlfeEUG4V`+z
z-{2v*C*2AEoH}d!CN8NW6~V2o?CJuQI_0#R^jn+VSaz4KLiQb|rD8S#a1Ji&)9uC&
z(W{vj<MJ%@bf5kRP=AY0L?c|n<I&FjEoiM3o+@l+7^wR2*vof=1IrR9ponPWra|<e
zt$5O_;=!|TE;J5Lh>sNYS+h}Y#z1z*JEZWdGA2X^#GdE6$+VW9ZWJlbSQ?w#US>pw
zg&>prtn+7O%~SI5+_tZ3zn}X+wiLCQ-;Q>2WjX=)lb5ASCRLM0&)`|rC+6Q%o8O6D
zjcP@_N-L)tuzvM<Ebt9>u;t4rRD!i}0i@FYemsjh2>%8b-_T2<mm!&voJam(;KB8%
zxYbde*Z~=1BX=H=vYMtn2aj$Nlz-4}Zf<6gd&5nN_^#t_wD@_+eWDK}QK64ygdJZ-
zhf?ckU0XZ;>XL>6k2{YX#i+XbcHE6{hY#8A6vZ2#v7_*rbDLp-BPwsZqsoLiP)&Ph
zqPZwVFC5>DvE=s_G_4xGaiil{6dRu9_+x~6@_0!2;*ZNGzz-XRA7V`SLw++44osa%
z%7zE(1So^m8+r3A_Ssie>e*J8)60}?*`5G#l=54657yhuD^GN@rp6E8@mPuP4&I7K
zJt}*v*{w;iJtN@{oo02orP=invecEg4@P6GMH_@<zeIRW(!Z6King{5*dPVZ2L&@j
z<sMg=t#tDYe$hHGSk?=_keH76Vfqb5fGq|d&7o}!w|E=hy-|OXYsHY@e^k@rW~LA@
z=0!)R_0tw0dgUltNo@c-q;$D?aHkyg3Ab{UO+N7i2%zMkT?~w*KiwZ-b1>|9x^uVu
z{V9Vn{s=sqn?3ynenW-AC7o6mqsP^G%JHpu>19oeN9atSx1Vb&fK<J@cF#y$p<~SY
z2#_JWYcQYrN_+>AZ(OvEcT8b!bqw!{h{Fy(41~#<{Lt)93RsZYqf*>P7_jdt+?Q%v
zjUvnQN0d(q)-(+h-ZqEYmuQ?r#p!(P4^aqTaIXVtPX%_F%6BFikhR`^=0G=oNvt2I
zeU1XyzPvkrB(HkWNb2dTr%f`#w5-=~7N@lME#$dZP56ESa{|dPP|}z?Rynl$1vh(_
z^%yZJr|Q(>#WuNZXl^j&m70*%g6l@v9;CX|_jTN3uM_mGsU?DN`dHwD7)FBQrVp?(
zV<0UiYG?5mXVLBZQX~Rl!pD<TgDi$?6-ASpavjN$XEs<i*g3(23{4WU0=_vl_)Es>
z#<$j9$vSbR8A+8zHMt=Ct~!d^r^JUoRTuA;8%&3nmpxvOYMpSr!*;+CJ3*t$2Z4|*
z!ue#seW|r_uDd^0@G_=u{MP#Q?8zFe8JCq0YQ&=phK~6e7#vgB!Y6}E<(r*Hh4Or6
zQga@OAeU?I2`SZ%(A*{T!g~!|A}=`*twpFVkKuF1Uq^ljWAhPnIRV5NqQ$P90OkA9
zPinM6<)u3+Apps9WjWP7HzANm#F-(U8i~~8soME-9MFd<&DJF4O^-w+9XWu>el$er
zMnz!UkP;;WHkHLd)vy#Q{9fc48^9V!_2(h@SF}l-z&Y0T%A?nm)D6{602`LDG%k%c
zOyI_zr7YZ&PRGn9#V#?_Gk66q6a5K=^SvI>OLE3IxD?D?%zeH^t4>_I24Sf2wydvg
z!(w|1*IUnS;Ymu`++oyQJ}=Jt;M2r)-B_!R4hc46P}|Xn$0EVkG?*1j4CyR0xh$z9
za5=t#x7p2Uo5h^!+Y-@;)26BORxkL)#fV>f$`g_1A}VXnMo+F-#3lEr7NO?h{g71U
zx}<R=1DDZ|&Drgdn3WC5N&+TbM&$mSxDC0Harm1c0<H|Hq#@vkeINA&b~xwAq2rm+
zVDSeXKPmYWKAo&QQN0~4brMm};f<Oq*JzZ_Q{-fq&+yLJeMps6@NxJsM`<mlYcH$M
zZGi_Dc(NVP(Kx)HxXjk&8yiZXOuKJiA!X{VR2@=PO9!8FW!Z*^hVkdwjcGbC^^J#O
z;_nJMd6blKY~=Q=Z<;!;(=*^tZ>gssNyCpqZamvk9=&PEloS{vjm-_Vfeu<{YXo>%
z$+KX#p_D)Ap~{%~ihNi;VC0}(l8H`|xGDHfnyicxiP$j1;wA-?4hyL!vj*!s!YW$O
zcyFbU?AVE*I{$wnXvRyQ<VunrnR3f>sU`y8$OBHP+C1jvYtc*V4?Y2m^W!Xo2=8C$
z_@rU>VfCj0<tJX$Fpcpqxm?92d60GLJNP)QtV_MKXgluFXeS+1R77luy$!k8DLT?N
zd^UZ74Wu}OoTJgo?DJ|7$*_383r(3U?f){UpX$2Z4hDS#HNKhbC9Uerzc}hd1<gv3
zDnU5pMNN+>1>5)g@`=;`_WOS)v<p_OOO5y&Vav(KDX;RjRk3SoN)le+bDM|-ubH4=
z5)vq8nurMO+vr~Seu9sXR6VX?jO0t=XC+kmX2(KX=FT_rZY8xRi_zfJ1;v=2782X=
zv*meuVJ|$vJa&d2#3Z^Q0-C?qH3kcPE^N}1e$1peP#8N=n@M51lkO8p?vly8;nXUW
z`o+wyVpSRyO|k^Pd-&K}=nyoo0nkq9PQMXxHyvK>wsv)65EAvgK53wIh{0@U_`@+`
z02q*hef@*vzdodPYo%TU;R=q@@&oCj!ksI?VR0#9zkMH;*9L)b3%=+Wt$Sd?MoGJE
z_&|z1(P(#hcxTT*ZXvdFUKJs}V4^j3RM(C@h&29y8-EsaZRFq$bl>f&gq1(U)(wbi
zOeM#havrpVc7a0slmhx`o9J1MFI&v287SPyYu2lp!l?%s^7{Lpo>mW*Yo6ZBw_Sdi
z|JtKmu<v};e*6cpK56x;eE=KMp|C{)QWp1?#enT)?RDxtS+6Rx=-?fMWzU};^E;ze
zhab|`OA(`|bS5m?ulCzEtb3>XRFeIG2pkYot;LOMd)4$BS}{-P4&G|J;HXz!Pu+#t
zj=$oRNCx?&!zg0`_CS5fiC3rS<8V;%jQ>sv=BA0Z_nzhdmJ!j`iry_M96(vg>~dMN
z9-YnM2qgFXWz#_(9TcSc$(|iaI1~pPt7}pPhO*}q)z$_(;3h|eSWJ91e$%=_Yjo{f
z1-bOyGzt-kAf{dnM8@j$nE4OL?yRvnNeC`BZLYyT@sFa!y*!-DU%cky(jj3*Yfdf-
z*WJJCDB-__K;Ew8w-Ap+SQCx7^u#<SAlx1FC!d!w#v30Zky_&!hLn;n^Uh1fuP{dj
zo|xQ}kJ0(1=b3d(E=Kiem1mKwJzDdA9l#CR4d;GwZi>eG*CeibK5BJp^1$9y&rI2Y
z4`@)J#kb^;bHD_03_vW3qaF-U8JVfB^*5L5b?20q8(3M!qd=>b{_GFK`6SBz?IwSw
z?3R`c7DbX<w09KL-w@z*4%2liu%T@}7MPVLTu#&J58VaTSe6f&6eSF<=!%u=4qTya
zrm)bHYCQqQJb}Qy`{K86f9=Nf5AM0$MHl+(^b-}BJF+i}?mT|siS{R<`{$<d$Ie0C
z93mrttNs!H?8;`h=$OfOp;ZcpoR#D3hKnz-G>!@SqKOqZGboE}1zm;)Rk+_D+}~7v
zKx?<Qv||0Ph$_`>G04H;j;VMHlkn3>MX|~2pZwV1h`^dTabu%wA<4(mdKs=y1pBV5
zw8?0+lW0VFUlOf}^I`RNAMTGZ3?tzn;!<8u^R*H{@ip!VUU`yVI<a)jK7DHn&oyeh
z-A^o07UM?3kxHR<I#-I%bd3^rhCX>^!`2+Sh9YBw1PVt9$#1qQS2ay)6FOK;3`f0(
z?Cwl1SSG@AYf=@ywosG(co;qhsQtreeiyjpd-OVLMFLDeYT7dk4P7z_6_Zh~@JN-)
zs}Hr_Lgej+*4+|Trs{$U$e7sg^bXwMO?##-9LP51O6jzLxNIt@=h#wpCve}!_q|T3
zp0Y;axt0Zy2^issT8x#LQUSiv%zkgGqqAGzb^(OV_0QP4g}^&L7o8%fmRdi5si1kV
zXx2FeH>j(&^eT4DXn_rhz?}wU*jJS9y)Bj*W`{7G!K{1y7_T)Udzp1-d{^a*V&LY3
zqI-8s4mw88vMKb{f^O^b?%P16s<sz<t9-4*xBoPyzhzkDJ@nba9u?4y&RULr&T;LP
zP)GVaR_&4Pblt}kGM@?OZ1%i#nCMZR+Ix>Ax(vxV*8Ze!eb3+XZ~_AFdfJ73`@VT=
z)Y1G7-o}z(`w|wfE`a*t3BLUb4Q&mBToK$eAoo@x#Ou~~x^Qj>X_?3rv!@w)8;Rk3
zU-R*L&l~MWM;eRqs;(wHZdL+SKCYc}I{4h<1%SC}Q;8{x*c$ijkj@WCBPO-)-67D{
zf0_Ynw^5(NARd;KmeOm=vxb;{#!rYjRcI^pv(u?c?n`)tBP@l==#x5_tk(K_`ueVo
zhfO~XcxJi?jM2Dj{?`EaN7-o#+6U=p=gOy+auILUeO{gGl9lC?@FlBYJAz-osyukD
zY3i}R;ua}bDqdebd@iqf`__H!p~cQz83~9ju#*YykD)A{t&oB(b|y2Sjlk^GaZ_6s
zXou|^>())8w#%RuvTs9kK{|*s(=nn5k%We1_ikN1b}aL*JEvnhx;J|RVeSNe5OzUC
z*CH~{cde;clWx#U`Wjrpm0FDP3dMAR`1wllQ0h_Z!tLxxPRlfvg6Q)cbV$VW-?#Vw
zNDxMc1`i4w&)u;8INj;9GsJf$=XFTt)xA2dg5)*ufP2s3Y!>7~XDmL}+4{bu@2ezc
zaFNZc`&`cBuU*QIVvtN0C5eL%MZPDU07%u(yqEaKMWaJ-6^cjXXVSoPyu^*D`&s=C
ziR!qeBGh{25eu0g`584Pi$KO36n1D{N|qJ?q@oBW;jsGeJnMHI3su<v(E5Mhq;P`&
E7l(m^D*ylh

literal 0
HcmV?d00001

diff --git a/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java b/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java
new file mode 100644
index 00000000..e88ec4c1
--- /dev/null
+++ b/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java
@@ -0,0 +1,93 @@
+package org.javaee8.servlet.http2;
+
+import static org.eclipse.jetty.http.HttpVersion.HTTP_2;
+import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.net.URL;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+
+import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.api.ContentResponse;
+import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.http2.client.HTTP2Client;
+import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(Arquillian.class)
+public class Http2Test {
+
+    private HttpClient httpClient;
+
+    @Deployment
+    public static WebArchive createDeployment() {
+        return create(WebArchive.class)
+                .addPackages(true, "org.javaee8.servlet.http2")
+                .addAsWebResource(new File("src/main/webapp/images/payara-logo.jpg"), "images/payara-logo.jpg")
+                .addAsWebInfResource(new File("src/main/webapp/WEB-INF/web.xml"));
+    }
+
+    @Test
+    @RunAsClient
+    public void testHttp2ControlGroup() {
+        String url = "https://javaee.github.io/";
+        testUrl(url);
+    }
+
+    @Test
+    @RunAsClient
+    public void testServerHttp2(@ArquillianResource URL base) {
+        String url = String.format("https://%s:%d%s", base.getHost(), 8181, base.getPath());
+        testUrl(url);
+    }
+
+    private void testUrl(String url) {
+        System.out.println("Testing url: " + url);
+        ContentResponse response = null;
+        try {
+            response = httpClient.GET(url);
+        } catch (InterruptedException ex) {
+            fail("Request was interruped with exception: " + ex.getMessage());
+        } catch (ExecutionException ex) {
+            fail("Exception whilst executing request: " + ex.getMessage());
+        } catch (TimeoutException ex) {
+            fail("Request timed out with exception: " + ex.getMessage());
+        }
+
+        assertFalse("Error getting the response.", response == null);
+
+        HttpVersion protocol = response.getVersion();
+
+        assertTrue(String.format("The page was delivered over %s instead of HTTP 2.", protocol.asString()),
+                protocol.equals(HTTP_2));
+    }
+
+    @Before
+    public void setup() throws Exception {
+        //System.setProperty("org.eclipse.jetty.client.LEVEL", "DEBUG");
+        SslContextFactory sslContextFactory = new SslContextFactory(true);
+        HTTP2Client http2Client = new HTTP2Client();
+        HttpClientTransportOverHTTP2 http2Transport = new HttpClientTransportOverHTTP2(http2Client);
+        httpClient = new HttpClient(http2Transport, sslContextFactory);
+        httpClient.start();
+    }
+
+    @After
+    public void cleanUp() throws Exception {
+        httpClient.stop();
+    }
+
+}
diff --git a/servlet/pom.xml b/servlet/pom.xml
index df42a5ef..ee512e78 100644
--- a/servlet/pom.xml
+++ b/servlet/pom.xml
@@ -13,7 +13,8 @@
     <name>Java EE 8 Samples: Servlet</name>
 
     <modules>
-        	<module>mapping</module>
+        <module>http2</module>
+        <module>mapping</module>
     </modules>
 
     <dependencies>

From 4febf9df67e325e7f1b6688c88de93143ec8f869 Mon Sep 17 00:00:00 2001
From: Matt Gill <matthew.gill@live.co.uk>
Date: Thu, 15 Mar 2018 10:23:12 +0000
Subject: [PATCH 04/30] Updated jetty alpn.

---
 servlet/http2/pom.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/servlet/http2/pom.xml b/servlet/http2/pom.xml
index d1d3d28b..f1c8f636 100644
--- a/servlet/http2/pom.xml
+++ b/servlet/http2/pom.xml
@@ -14,7 +14,7 @@
     <name>Java EE 8 Samples: Servlet - http2</name>
     
     <properties>
-        <alpn-version>8.1.11.v20170118</alpn-version>
+        <alpn-version>8.1.12.v20180117</alpn-version>
         <jetty-version>9.4.8.v20171121</jetty-version>
     </properties>
     
@@ -32,12 +32,6 @@
             <version>${jetty-version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty.http2</groupId>
-            <artifactId>http2-http-client-transport</artifactId>
-            <version>${jetty-version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-alpn-openjdk8-client</artifactId>

From b75a6638bdca0d4adbbe0b80e609dd3a432dd9a2 Mon Sep 17 00:00:00 2001
From: Matt Gill <matthew.gill@live.co.uk>
Date: Thu, 15 Mar 2018 10:23:25 +0000
Subject: [PATCH 05/30] Converted to new web client.

---
 .../org/javaee8/servlet/http2/Http2Test.java  |  62 +++-------
 .../org/javaee8/servlet/http2/WebClient.java  | 107 ++++++++++++++++++
 2 files changed, 122 insertions(+), 47 deletions(-)
 create mode 100644 servlet/http2/src/test/java/org/javaee8/servlet/http2/WebClient.java

diff --git a/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java b/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java
index e88ec4c1..9929c362 100644
--- a/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java
+++ b/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java
@@ -1,22 +1,15 @@
 package org.javaee8.servlet.http2;
 
-import static org.eclipse.jetty.http.HttpVersion.HTTP_2;
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
+import java.util.logging.Level;
 
-import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.api.ContentResponse;
-import org.eclipse.jetty.http.HttpVersion;
-import org.eclipse.jetty.http2.client.HTTP2Client;
-import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
@@ -30,64 +23,39 @@
 @RunWith(Arquillian.class)
 public class Http2Test {
 
-    private HttpClient httpClient;
+    private WebClient client;
 
     @Deployment
     public static WebArchive createDeployment() {
-        return create(WebArchive.class)
-                .addPackages(true, "org.javaee8.servlet.http2")
+        return create(WebArchive.class).addPackages(true, "org.javaee8.servlet.http2")
                 .addAsWebResource(new File("src/main/webapp/images/payara-logo.jpg"), "images/payara-logo.jpg")
                 .addAsWebInfResource(new File("src/main/webapp/WEB-INF/web.xml"));
     }
 
     @Test
     @RunAsClient
-    public void testHttp2ControlGroup() {
-        String url = "https://javaee.github.io/";
-        testUrl(url);
+    public void testHttp2ControlGroup()
+            throws InterruptedException, ExecutionException, TimeoutException, URISyntaxException {
+        String url = "https://http2.akamai.com/";
+        assertNotNull(client.getResponse(url));
     }
 
     @Test
     @RunAsClient
-    public void testServerHttp2(@ArquillianResource URL base) {
-        String url = String.format("https://%s:%d%s", base.getHost(), 8181, base.getPath());
-        testUrl(url);
-    }
-
-    private void testUrl(String url) {
-        System.out.println("Testing url: " + url);
-        ContentResponse response = null;
-        try {
-            response = httpClient.GET(url);
-        } catch (InterruptedException ex) {
-            fail("Request was interruped with exception: " + ex.getMessage());
-        } catch (ExecutionException ex) {
-            fail("Exception whilst executing request: " + ex.getMessage());
-        } catch (TimeoutException ex) {
-            fail("Request timed out with exception: " + ex.getMessage());
-        }
-
-        assertFalse("Error getting the response.", response == null);
-
-        HttpVersion protocol = response.getVersion();
-
-        assertTrue(String.format("The page was delivered over %s instead of HTTP 2.", protocol.asString()),
-                protocol.equals(HTTP_2));
+    public void testServerHttp2(@ArquillianResource URL url)
+            throws InterruptedException, ExecutionException, TimeoutException, URISyntaxException {
+        assertNotNull(client.getResponse(url.toString()));
     }
 
     @Before
     public void setup() throws Exception {
-        //System.setProperty("org.eclipse.jetty.client.LEVEL", "DEBUG");
-        SslContextFactory sslContextFactory = new SslContextFactory(true);
-        HTTP2Client http2Client = new HTTP2Client();
-        HttpClientTransportOverHTTP2 http2Transport = new HttpClientTransportOverHTTP2(http2Client);
-        httpClient = new HttpClient(http2Transport, sslContextFactory);
-        httpClient.start();
+        client = new WebClient(Level.INFO);
+        client.start();
     }
 
     @After
     public void cleanUp() throws Exception {
-        httpClient.stop();
+        client.stop();
     }
 
 }
diff --git a/servlet/http2/src/test/java/org/javaee8/servlet/http2/WebClient.java b/servlet/http2/src/test/java/org/javaee8/servlet/http2/WebClient.java
new file mode 100644
index 00000000..8cc4c336
--- /dev/null
+++ b/servlet/http2/src/test/java/org/javaee8/servlet/http2/WebClient.java
@@ -0,0 +1,107 @@
+package org.javaee8.servlet.http2;
+
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.logging.Level;
+
+import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.http.HttpURI;
+import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.http.MetaData;
+import org.eclipse.jetty.http2.api.Session;
+import org.eclipse.jetty.http2.api.Stream;
+import org.eclipse.jetty.http2.api.server.ServerSessionListener;
+import org.eclipse.jetty.http2.client.HTTP2Client;
+import org.eclipse.jetty.http2.frames.DataFrame;
+import org.eclipse.jetty.http2.frames.HeadersFrame;
+import org.eclipse.jetty.util.Callback;
+import org.eclipse.jetty.util.FuturePromise;
+import org.eclipse.jetty.util.Jetty;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
+
+public class WebClient {
+
+    private HTTP2Client client;
+    private SslContextFactory sslContextFactory;
+
+    public WebClient() {
+        this(Level.INFO);
+    }
+
+    public WebClient(Level logLevel) {
+        System.setProperty("org.eclipse.jetty.client.LEVEL", logLevel.getName());
+    }
+
+    //private Pattern urlMatcher = Pattern.compile("^(?<protocol>http[s]?):\\/\\/(?<host>[\\w.]+)(?:(?=:):(?<port>9000)|\\/)");
+
+    public String getResponse(String url)
+            throws URISyntaxException, InterruptedException, ExecutionException, TimeoutException {
+        URI uri = new URI(url);
+
+        String host = uri.getHost();
+        int port = uri.getPort();
+        if (port == -1) {
+            port = 443;
+        }
+        String scheme = uri.getScheme();
+
+        FuturePromise<Session> sessionPromise = new FuturePromise<>();
+        if (scheme.contains("https")) {
+            client.connect(sslContextFactory, new InetSocketAddress(host, port), new ServerSessionListener.Adapter(),
+                    sessionPromise);
+        } else {
+            client.connect(new InetSocketAddress(host, port), new ServerSessionListener.Adapter(), sessionPromise);
+        }
+
+        Session session = sessionPromise.get(5, TimeUnit.SECONDS);
+
+        HttpFields requestFields = new HttpFields();
+        requestFields.put("User-Agent", client.getClass().getName() + "/" + Jetty.VERSION);
+        requestFields.put("Host", host + ":" + port);
+
+        MetaData.Request request = new MetaData.Request("GET", new HttpURI(url), HttpVersion.HTTP_2, requestFields);
+
+        HeadersFrame headersFrame = new HeadersFrame(request, null, true);
+
+        CountDownLatch latch = new CountDownLatch(1);
+        final StringBuilder response = new StringBuilder();
+        Stream.Listener responseListener = new Stream.Listener.Adapter() {
+            @Override
+            public void onData(Stream stream, DataFrame frame, Callback callback) {
+                byte[] bytes = new byte[frame.getData().remaining()];
+                frame.getData().get(bytes);
+                response.append(new String(bytes));
+                latch.countDown();
+                callback.succeeded();
+            }
+        };
+
+        session.newStream(headersFrame, new FuturePromise<>(), responseListener);
+
+        if (!latch.await(1, TimeUnit.SECONDS)) {
+            throw new RuntimeException("The request timed out.");
+        }
+        return response.toString();
+    }
+
+    public void start() throws Exception {
+        client = new HTTP2Client();
+
+        // Configure SSL for test
+        sslContextFactory = new SslContextFactory(true);
+        client.addBean(sslContextFactory);
+
+        // Start client
+        client.start();
+    }
+
+    public void stop() throws Exception {
+        client.stop();
+    }
+
+}
\ No newline at end of file

From bd1632bdf23ff56fd780207b60e398cf898dd610 Mon Sep 17 00:00:00 2001
From: Matt Gill <matthew.gill@live.co.uk>
Date: Thu, 15 Mar 2018 11:49:23 +0000
Subject: [PATCH 06/30] Updated HTTP 2.0 to HTTP/2.

---
 .../src/main/java/org/javaee8/servlet/http2/Servlet.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/servlet/http2/src/main/java/org/javaee8/servlet/http2/Servlet.java b/servlet/http2/src/main/java/org/javaee8/servlet/http2/Servlet.java
index 7427750e..f8cf4746 100644
--- a/servlet/http2/src/main/java/org/javaee8/servlet/http2/Servlet.java
+++ b/servlet/http2/src/main/java/org/javaee8/servlet/http2/Servlet.java
@@ -30,8 +30,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
             response.addHeader("protocol", "HTTP 1.1");
             response.getWriter().append("<p>The image below was sent normally using HTTP 1.1.</p>");
         } else {
-            response.addHeader("protocol", "HTTP 2.0");
-            response.getWriter().append("<p>The image below was pushed using HTTP 2.0.</p>");
+            response.addHeader("protocol", "HTTP/2");
+            response.getWriter().append("<p>The image below was pushed using HTTP/2.</p>");
             builder.path("images/payara-logo.jpg").push();
         }
         response.getWriter().append("<img src=\"images/payara-logo.jpg\" />");

From 2d24e0b8f0c0b598c4caf2a816177c7864e7da9e Mon Sep 17 00:00:00 2001
From: Matt Gill <matthew.gill@live.co.uk>
Date: Thu, 15 Mar 2018 11:49:41 +0000
Subject: [PATCH 07/30] Converted to using Jersey Client connector.

---
 .../org/javaee8/servlet/http2/Http2Test.java  |  31 ++-
 .../javaee8/servlet/http2/JettyConnector.java | 179 ++++++++++++++++++
 .../org/javaee8/servlet/http2/WebClient.java  | 107 -----------
 3 files changed, 202 insertions(+), 115 deletions(-)
 create mode 100644 servlet/http2/src/test/java/org/javaee8/servlet/http2/JettyConnector.java
 delete mode 100644 servlet/http2/src/test/java/org/javaee8/servlet/http2/WebClient.java

diff --git a/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java b/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java
index 9929c362..b3577ec1 100644
--- a/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java
+++ b/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java
@@ -1,6 +1,7 @@
 package org.javaee8.servlet.http2;
 
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
@@ -8,8 +9,12 @@
 import java.net.URL;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
-import java.util.logging.Level;
 
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Response;
+
+import org.glassfish.jersey.client.ClientConfig;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
@@ -23,7 +28,7 @@
 @RunWith(Arquillian.class)
 public class Http2Test {
 
-    private WebClient client;
+    private Client jaxrsClient;
 
     @Deployment
     public static WebArchive createDeployment() {
@@ -36,26 +41,36 @@ public static WebArchive createDeployment() {
     @RunAsClient
     public void testHttp2ControlGroup()
             throws InterruptedException, ExecutionException, TimeoutException, URISyntaxException {
-        String url = "https://http2.akamai.com/";
-        assertNotNull(client.getResponse(url));
+        testUrl("https://http2.akamai.com/");
     }
 
     @Test
     @RunAsClient
     public void testServerHttp2(@ArquillianResource URL url)
             throws InterruptedException, ExecutionException, TimeoutException, URISyntaxException {
-        assertNotNull(client.getResponse(url.toString()));
+        Response response = testUrl(url.toURI().toString());
+        assertEquals(
+                "Request wasn't over HTTP/2."
+                        + " Either the wrong servlet was returned, or the server doesn't support HTTP/2.",
+                response.getHeaderString("protocol"), "HTTP/2");
+    }
+
+    private Response testUrl(String url) {
+        Response response = jaxrsClient.target(url).request().get();
+        assertNotNull(response);
+        return response;
     }
 
     @Before
     public void setup() throws Exception {
-        client = new WebClient(Level.INFO);
-        client.start();
+        ClientConfig config = new ClientConfig();
+        config.connectorProvider(JettyConnector::new);
+        jaxrsClient = ClientBuilder.newClient(config);
     }
 
     @After
     public void cleanUp() throws Exception {
-        client.stop();
+        jaxrsClient.close();
     }
 
 }
diff --git a/servlet/http2/src/test/java/org/javaee8/servlet/http2/JettyConnector.java b/servlet/http2/src/test/java/org/javaee8/servlet/http2/JettyConnector.java
new file mode 100644
index 00000000..d7e89b8b
--- /dev/null
+++ b/servlet/http2/src/test/java/org/javaee8/servlet/http2/JettyConnector.java
@@ -0,0 +1,179 @@
+package org.javaee8.servlet.http2;
+
+import java.io.ByteArrayInputStream;
+import java.net.InetSocketAddress;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.logging.Level;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.core.Configuration;
+
+import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.http.HttpURI;
+import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.http.MetaData.Request;
+import org.eclipse.jetty.http2.api.Session;
+import org.eclipse.jetty.http2.api.Stream;
+import org.eclipse.jetty.http2.api.server.ServerSessionListener;
+import org.eclipse.jetty.http2.client.HTTP2Client;
+import org.eclipse.jetty.http2.frames.DataFrame;
+import org.eclipse.jetty.http2.frames.HeadersFrame;
+import org.eclipse.jetty.util.Callback;
+import org.eclipse.jetty.util.FuturePromise;
+import org.eclipse.jetty.util.Jetty;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
+import org.glassfish.jersey.client.ClientRequest;
+import org.glassfish.jersey.client.ClientResponse;
+import org.glassfish.jersey.client.spi.AsyncConnectorCallback;
+import org.glassfish.jersey.client.spi.Connector;
+import org.glassfish.jersey.message.internal.Statuses;
+
+public class JettyConnector implements Connector {
+
+    private HTTP2Client client;
+    private SslContextFactory sslContextFactory;
+
+    /**
+     * Needed for the JAX-RS connector creation.
+     */
+    public JettyConnector(final Client jaxrsClient, final Configuration config) {
+        this();
+    }
+
+    public JettyConnector() {
+        this(Level.INFO);
+    }
+
+    public JettyConnector(Level logLevel) {
+        System.setProperty("org.eclipse.jetty.client.LEVEL", logLevel.getName());
+        client = new HTTP2Client();
+
+        // Configure SSL for test. Ignore insecure certificates
+        sslContextFactory = new SslContextFactory(true);
+        client.addBean(sslContextFactory);
+
+        // Start client
+        try {
+            client.start();
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to start client.");
+        }
+    }
+
+    @Override
+    public ClientResponse apply(ClientRequest request) {
+
+        String host = request.getUri().getHost();
+        int port = request.getUri().getPort();
+        if (port == -1) {
+            port = 443;
+        }
+        boolean secure = request.getUri().getScheme().equals("https");
+
+        // Get the session
+        Session session = createSession(host, port, secure);
+
+        // Create HTTP headers
+        HttpFields headers = new HttpFields();
+        request.getStringHeaders().forEach((key, value) -> {
+            headers.put(key, value);
+        });
+        headers.put("User-Agent", getName());
+        headers.put("Host", host + ":" + port);
+
+        // Create the request
+        Request jettyRequest = new Request(request.getMethod(), new HttpURI(request.getUri()), HttpVersion.HTTP_2,
+                headers);
+
+        // Stored metadata
+        int status = 200;
+        StringBuilder entityStream = new StringBuilder();
+        Map<String, String> responseHeaders = new HashMap<>();
+
+        // Response listener
+        CountDownLatch latch = new CountDownLatch(1);
+        Stream.Listener responseListener = new Stream.Listener.Adapter() {
+            @Override
+            public void onHeaders(Stream stream, HeadersFrame frame) {
+                frame.getMetaData().getFields().forEach(field -> {
+                    responseHeaders.put(field.getName(), field.getValue());
+                });
+            }
+
+            @Override
+            public void onData(Stream stream, DataFrame frame, Callback callback) {
+                byte[] bytes = new byte[frame.getData().remaining()];
+                frame.getData().get(bytes);
+                entityStream.append(new String(bytes));
+                if (frame.isEndStream()) {
+                    latch.countDown();
+                    callback.succeeded();
+                }
+            }
+        };
+
+        // Make the connection
+        session.newStream(new HeadersFrame(jettyRequest, null, true), new FuturePromise<>(), responseListener);
+
+        // Wait for response
+        try {
+            if (!latch.await(5, TimeUnit.SECONDS)) {
+                throw new RuntimeException("The request timed out. This usually means HTTP/2 isn't supported.");
+            }
+        } catch (InterruptedException e) {
+            throw new RuntimeException("Request interrupted.");
+        }
+
+        // Build response from metadata
+        ClientResponse response = new ClientResponse(Statuses.from(status), request);
+        response.setEntityStream(new ByteArrayInputStream(entityStream.toString().getBytes()));
+        responseHeaders.forEach((key, value) -> {
+            response.header(key, value);
+        });
+        return response;
+    }
+
+    @Override
+    public Future<?> apply(ClientRequest request, AsyncConnectorCallback callback) {
+        throw new UnsupportedOperationException("Unimplemented method.");
+    }
+
+    @Override
+    public String getName() {
+        return client.getClass().getName() + "/" + Jetty.VERSION;
+    }
+
+    @Override
+    public void close() {
+        try {
+            client.stop();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private Session createSession(String host, int port, boolean secure) {
+        FuturePromise<Session> sessionPromise = new FuturePromise<>();
+        if (secure) {
+            client.connect(sslContextFactory, new InetSocketAddress(host, port), new ServerSessionListener.Adapter(),
+                    sessionPromise);
+        } else {
+            client.connect(new InetSocketAddress(host, port), new ServerSessionListener.Adapter(), sessionPromise);
+        }
+
+        Session session = null;
+        try {
+            session = sessionPromise.get(5, TimeUnit.SECONDS);
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            e.printStackTrace();
+        }
+        return session;
+    }
+
+}
\ No newline at end of file
diff --git a/servlet/http2/src/test/java/org/javaee8/servlet/http2/WebClient.java b/servlet/http2/src/test/java/org/javaee8/servlet/http2/WebClient.java
deleted file mode 100644
index 8cc4c336..00000000
--- a/servlet/http2/src/test/java/org/javaee8/servlet/http2/WebClient.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.javaee8.servlet.http2;
-
-import java.net.InetSocketAddress;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.logging.Level;
-
-import org.eclipse.jetty.http.HttpFields;
-import org.eclipse.jetty.http.HttpURI;
-import org.eclipse.jetty.http.HttpVersion;
-import org.eclipse.jetty.http.MetaData;
-import org.eclipse.jetty.http2.api.Session;
-import org.eclipse.jetty.http2.api.Stream;
-import org.eclipse.jetty.http2.api.server.ServerSessionListener;
-import org.eclipse.jetty.http2.client.HTTP2Client;
-import org.eclipse.jetty.http2.frames.DataFrame;
-import org.eclipse.jetty.http2.frames.HeadersFrame;
-import org.eclipse.jetty.util.Callback;
-import org.eclipse.jetty.util.FuturePromise;
-import org.eclipse.jetty.util.Jetty;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
-
-public class WebClient {
-
-    private HTTP2Client client;
-    private SslContextFactory sslContextFactory;
-
-    public WebClient() {
-        this(Level.INFO);
-    }
-
-    public WebClient(Level logLevel) {
-        System.setProperty("org.eclipse.jetty.client.LEVEL", logLevel.getName());
-    }
-
-    //private Pattern urlMatcher = Pattern.compile("^(?<protocol>http[s]?):\\/\\/(?<host>[\\w.]+)(?:(?=:):(?<port>9000)|\\/)");
-
-    public String getResponse(String url)
-            throws URISyntaxException, InterruptedException, ExecutionException, TimeoutException {
-        URI uri = new URI(url);
-
-        String host = uri.getHost();
-        int port = uri.getPort();
-        if (port == -1) {
-            port = 443;
-        }
-        String scheme = uri.getScheme();
-
-        FuturePromise<Session> sessionPromise = new FuturePromise<>();
-        if (scheme.contains("https")) {
-            client.connect(sslContextFactory, new InetSocketAddress(host, port), new ServerSessionListener.Adapter(),
-                    sessionPromise);
-        } else {
-            client.connect(new InetSocketAddress(host, port), new ServerSessionListener.Adapter(), sessionPromise);
-        }
-
-        Session session = sessionPromise.get(5, TimeUnit.SECONDS);
-
-        HttpFields requestFields = new HttpFields();
-        requestFields.put("User-Agent", client.getClass().getName() + "/" + Jetty.VERSION);
-        requestFields.put("Host", host + ":" + port);
-
-        MetaData.Request request = new MetaData.Request("GET", new HttpURI(url), HttpVersion.HTTP_2, requestFields);
-
-        HeadersFrame headersFrame = new HeadersFrame(request, null, true);
-
-        CountDownLatch latch = new CountDownLatch(1);
-        final StringBuilder response = new StringBuilder();
-        Stream.Listener responseListener = new Stream.Listener.Adapter() {
-            @Override
-            public void onData(Stream stream, DataFrame frame, Callback callback) {
-                byte[] bytes = new byte[frame.getData().remaining()];
-                frame.getData().get(bytes);
-                response.append(new String(bytes));
-                latch.countDown();
-                callback.succeeded();
-            }
-        };
-
-        session.newStream(headersFrame, new FuturePromise<>(), responseListener);
-
-        if (!latch.await(1, TimeUnit.SECONDS)) {
-            throw new RuntimeException("The request timed out.");
-        }
-        return response.toString();
-    }
-
-    public void start() throws Exception {
-        client = new HTTP2Client();
-
-        // Configure SSL for test
-        sslContextFactory = new SslContextFactory(true);
-        client.addBean(sslContextFactory);
-
-        // Start client
-        client.start();
-    }
-
-    public void stop() throws Exception {
-        client.stop();
-    }
-
-}
\ No newline at end of file

From a29d8dd0bc8835914c1f926671177d010cc4db5a Mon Sep 17 00:00:00 2001
From: Matt Gill <matthew.gill@live.co.uk>
Date: Thu, 15 Mar 2018 11:49:52 +0000
Subject: [PATCH 08/30] Updated ALPN version to use dynamic profiles.

---
 servlet/http2/pom.xml | 341 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 311 insertions(+), 30 deletions(-)

diff --git a/servlet/http2/pom.xml b/servlet/http2/pom.xml
index f1c8f636..6f6e0f11 100644
--- a/servlet/http2/pom.xml
+++ b/servlet/http2/pom.xml
@@ -14,7 +14,6 @@
     <name>Java EE 8 Samples: Servlet - http2</name>
     
     <properties>
-        <alpn-version>8.1.12.v20180117</alpn-version>
         <jetty-version>9.4.8.v20171121</jetty-version>
     </properties>
     
@@ -45,34 +44,316 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.0.2</version>
-                <executions>
-                    <execution>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>get</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <groupId>org.mortbay.jetty.alpn</groupId>
-                    <artifactId>alpn-boot</artifactId>
-                    <version>${alpn-version}</version>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <!-- Configure the use of ALPN in the test -->
-                    <argLine>-Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn-version}/alpn-boot-${alpn-version}.jar</argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+
+    <!-- ALPN profiles are needed to ensure that the correct ALPN version is used -->
+    <profiles>
+        <profile>
+            <id>alpn-when-jdk8</id>
+            <activation>
+                <jdk>1.8</jdk>
+            </activation>
+            <properties>
+                <bootclasspathPrefix>
+                    ${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn.version}/alpn-boot-${alpn.version}.jar
+                </bootclasspathPrefix>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <argLine>-Xbootclasspath/p:${bootclasspathPrefix}</argLine>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.mortbay.jetty.alpn</groupId>
+                                <artifactId>alpn-boot</artifactId>
+                                <version>${alpn.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_05</id>
+            <activation>
+                <jdk>1.8.0_05</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.0.v20141016</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_11</id>
+            <activation>
+                <jdk>1.8.0_11</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.0.v20141016</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_20</id>
+            <activation>
+                <jdk>1.8.0_20</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.0.v20141016</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_25</id>
+            <activation>
+                <jdk>1.8.0_25</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.2.v20141202</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_31</id>
+            <activation>
+                <jdk>1.8.0_31</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.3.v20150130</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_40</id>
+            <activation>
+                <jdk>1.8.0_40</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.3.v20150130</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_45</id>
+            <activation>
+                <jdk>1.8.0_45</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.3.v20150130</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_51</id>
+            <activation>
+                <jdk>1.8.0_51</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.4.v20150727</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_60</id>
+            <activation>
+                <jdk>1.8.0_60</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.5.v20150921</alpn.version>
+            </properties>
+        </profile>
+            <profile>
+            <id>alpn-when-jdk8_65</id>
+            <activation>
+                <jdk>1.8.0_65</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.6.v20151105</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_66</id>
+            <activation>
+                <jdk>1.8.0_66</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.6.v20151105</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_71</id>
+            <activation>
+                <jdk>1.8.0_71</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.7.v20160121</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_72</id>
+            <activation>
+                <jdk>1.8.0_72</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.7.v20160121</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_73</id>
+            <activation>
+                <jdk>1.8.0_73</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.7.v20160121</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_74</id>
+            <activation>
+                <jdk>1.8.0_74</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.7.v20160121</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_77</id>
+            <activation>
+                <jdk>1.8.0_77</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.7.v20160121</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_91</id>
+            <activation>
+                <jdk>1.8.0_91</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.7.v20160121</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_92</id>
+            <activation>
+                <jdk>1.8.0_92</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.8.v20160420</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_101</id>
+            <activation>
+                <jdk>1.8.0_101</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.8.v20160420</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_102</id>
+            <activation>
+                <jdk>1.8.0_102</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.9.v20160720</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_111</id>
+            <activation>
+                <jdk>1.8.0_111</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.9.v20160720</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_112</id>
+            <activation>
+                <jdk>1.8.0_112</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.9.v20160720</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_121</id>
+            <activation>
+                <jdk>1.8.0_121</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.11.v20170118</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_131</id>
+            <activation>
+                <jdk>1.8.0_131</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.11.v20170118</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_141</id>
+            <activation>
+                <jdk>1.8.0_141</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.11.v20170118</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_144</id>
+            <activation>
+                <jdk>1.8.0_144</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.11.v20170118</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_151</id>
+            <activation>
+                <jdk>1.8.0_151</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.11.v20170118</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_152</id>
+            <activation>
+                <jdk>1.8.0_152</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.11.v20170118</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_161</id>
+            <activation>
+                <jdk>1.8.0_161</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.12.v20180117</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_162</id>
+            <activation>
+                <jdk>1.8.0_162</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.12.v20180117</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_163</id>
+            <activation>
+                <jdk>1.8.0_163</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.12.v20180117</alpn.version>
+            </properties>
+        </profile>
+    </profiles>
     
 </project>

From 9996843502039ffa7a2b43c72187fb4e505dc9c9 Mon Sep 17 00:00:00 2001
From: arjantijms <arjan.tijms@gmail.com>
Date: Tue, 10 Jul 2018 14:30:18 +0200
Subject: [PATCH 09/30] Update to Payara 5.182

---
 pom.xml                                      |  6 +++---
 servlet/http2/pom.xml                        | 18 ++++++++++++++++++
 test-utils/src/main/resources/arquillian.xml |  2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 25d52b31..cfc23c5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,10 +25,10 @@
 
         <!-- Application Server versions (these are downloaded and installed 
             in these versions by Maven for the CI profiles) -->
-        <payara.version>5.Beta2</payara.version>
-        <payara.micro.version>5.Beta3-m1</payara.micro.version> 
+        <payara.version>5.182</payara.version>
+        <payara.micro.version>5.182</payara.micro.version> 
         <glassfish.version>4.1.1</glassfish.version>
-        <tomcat.version>9.0.4</tomcat.version>
+        <tomcat.version>9.0.10</tomcat.version>
     </properties>
 
     <repositories>
diff --git a/servlet/http2/pom.xml b/servlet/http2/pom.xml
index 6f6e0f11..696ee854 100644
--- a/servlet/http2/pom.xml
+++ b/servlet/http2/pom.xml
@@ -354,6 +354,24 @@
                 <alpn.version>8.1.12.v20180117</alpn.version>
             </properties>
         </profile>
+        <profile>
+            <id>alpn-when-jdk8_172</id>
+            <activation>
+                <jdk>1.8.0_172</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.12.v20180117</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_173</id>
+            <activation>
+                <jdk>1.8.0_173</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.12.v20180117</alpn.version>
+            </properties>
+        </profile>
     </profiles>
     
 </project>
diff --git a/test-utils/src/main/resources/arquillian.xml b/test-utils/src/main/resources/arquillian.xml
index 68b93843..bcd5d74e 100644
--- a/test-utils/src/main/resources/arquillian.xml
+++ b/test-utils/src/main/resources/arquillian.xml
@@ -7,7 +7,7 @@
     
      <container qualifier="payara">
         <configuration>
-            <property name="domain">payaradomain</property>
+            <property name="domain">production</property>
         </configuration>
      </container>
 

From 262b14237a731d5490d259f7a19748227a1098a4 Mon Sep 17 00:00:00 2001
From: arjantijms <arjan.tijms@gmail.com>
Date: Tue, 10 Jul 2018 14:31:39 +0200
Subject: [PATCH 10/30] Added test for decorating a dynamically added CDI bean

---
 cdi/dynamic-bean-decorated/pom.xml            | 12 ++++++
 .../dynamic/bean/decorated/CdiExtension.java  | 24 +++++++++++
 .../cdi/dynamic/bean/decorated/MyBean.java    | 10 +++++
 .../dynamic/bean/decorated/MyBeanImpl.java    | 29 +++++++++++++
 .../javax.enterprise.inject.spi.Extension     |  1 +
 .../bean/decorated/DynamicBeanTest.java       | 41 +++++++++++++++++++
 .../dynamic/bean/decorated/MyDecorator.java   | 21 ++++++++++
 .../src/test/resources/beans.xml              |  8 ++++
 8 files changed, 146 insertions(+)
 create mode 100644 cdi/dynamic-bean-decorated/pom.xml
 create mode 100644 cdi/dynamic-bean-decorated/src/main/java/org/javaee8/cdi/dynamic/bean/decorated/CdiExtension.java
 create mode 100644 cdi/dynamic-bean-decorated/src/main/java/org/javaee8/cdi/dynamic/bean/decorated/MyBean.java
 create mode 100644 cdi/dynamic-bean-decorated/src/main/java/org/javaee8/cdi/dynamic/bean/decorated/MyBeanImpl.java
 create mode 100644 cdi/dynamic-bean-decorated/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
 create mode 100644 cdi/dynamic-bean-decorated/src/test/java/org/javaee8/cdi/dynamic/bean/decorated/DynamicBeanTest.java
 create mode 100644 cdi/dynamic-bean-decorated/src/test/java/org/javaee8/cdi/dynamic/bean/decorated/MyDecorator.java
 create mode 100644 cdi/dynamic-bean-decorated/src/test/resources/beans.xml

diff --git a/cdi/dynamic-bean-decorated/pom.xml b/cdi/dynamic-bean-decorated/pom.xml
new file mode 100644
index 00000000..33fbd1c4
--- /dev/null
+++ b/cdi/dynamic-bean-decorated/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.javaee8</groupId>
+        <artifactId>cdi</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>dynamic-bean-decorated</artifactId>
+    <name>Java EE 8 Samples: CDI - Dynamic Bean Decorated</name>
+</project>
diff --git a/cdi/dynamic-bean-decorated/src/main/java/org/javaee8/cdi/dynamic/bean/decorated/CdiExtension.java b/cdi/dynamic-bean-decorated/src/main/java/org/javaee8/cdi/dynamic/bean/decorated/CdiExtension.java
new file mode 100644
index 00000000..9a1517e1
--- /dev/null
+++ b/cdi/dynamic-bean-decorated/src/main/java/org/javaee8/cdi/dynamic/bean/decorated/CdiExtension.java
@@ -0,0 +1,24 @@
+package org.javaee8.cdi.dynamic.bean.decorated;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+
+/**
+ * 
+ * @author Arjan Tijms
+ *
+ */
+public class CdiExtension implements Extension {
+
+    public void afterBean(final @Observes AfterBeanDiscovery afterBeanDiscovery) {
+        afterBeanDiscovery
+            .addBean()
+            .scope(ApplicationScoped.class)
+            .types(MyBean.class)
+            .id("Created by " + CdiExtension.class)
+            .createWith(e -> new MyBeanImpl("Hi!"));
+    }
+    
+}
diff --git a/cdi/dynamic-bean-decorated/src/main/java/org/javaee8/cdi/dynamic/bean/decorated/MyBean.java b/cdi/dynamic-bean-decorated/src/main/java/org/javaee8/cdi/dynamic/bean/decorated/MyBean.java
new file mode 100644
index 00000000..51b6a17c
--- /dev/null
+++ b/cdi/dynamic-bean-decorated/src/main/java/org/javaee8/cdi/dynamic/bean/decorated/MyBean.java
@@ -0,0 +1,10 @@
+package org.javaee8.cdi.dynamic.bean.decorated;
+
+/**
+ * 
+ * @author Arjan Tijms
+ *
+ */
+public interface MyBean {
+    String sayHi();
+}
diff --git a/cdi/dynamic-bean-decorated/src/main/java/org/javaee8/cdi/dynamic/bean/decorated/MyBeanImpl.java b/cdi/dynamic-bean-decorated/src/main/java/org/javaee8/cdi/dynamic/bean/decorated/MyBeanImpl.java
new file mode 100644
index 00000000..7fb6d32e
--- /dev/null
+++ b/cdi/dynamic-bean-decorated/src/main/java/org/javaee8/cdi/dynamic/bean/decorated/MyBeanImpl.java
@@ -0,0 +1,29 @@
+package org.javaee8.cdi.dynamic.bean.decorated;
+
+import javax.enterprise.inject.Typed;
+
+/**
+ * 
+ * @author Arjan Tijms
+ *
+ */
+// Typed: Extra guard so that MyBeanImpl has no types of itself, but extension archive is not scanned
+//        so not strictly needed.
+@Typed
+public class MyBeanImpl implements MyBean {
+    
+    private final String greet;
+    
+    // Note: There's no default ctor, so CDI cannot directly inject an instance of this
+    //       bean.
+    
+    public MyBeanImpl(String greet) {
+        this.greet = greet;
+    }
+
+    @Override
+    public String sayHi() {
+        return greet;
+    }
+
+}
diff --git a/cdi/dynamic-bean-decorated/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/cdi/dynamic-bean-decorated/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
new file mode 100644
index 00000000..9c4a3530
--- /dev/null
+++ b/cdi/dynamic-bean-decorated/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -0,0 +1 @@
+org.javaee8.cdi.dynamic.bean.decorated.CdiExtension
\ No newline at end of file
diff --git a/cdi/dynamic-bean-decorated/src/test/java/org/javaee8/cdi/dynamic/bean/decorated/DynamicBeanTest.java b/cdi/dynamic-bean-decorated/src/test/java/org/javaee8/cdi/dynamic/bean/decorated/DynamicBeanTest.java
new file mode 100644
index 00000000..8fc3b192
--- /dev/null
+++ b/cdi/dynamic-bean-decorated/src/test/java/org/javaee8/cdi/dynamic/bean/decorated/DynamicBeanTest.java
@@ -0,0 +1,41 @@
+package org.javaee8.cdi.dynamic.bean.decorated;
+
+import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
+import static org.junit.Assert.assertEquals;
+
+import javax.inject.Inject;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ *
+ * @author Arjan Tijms
+ *
+ */
+@RunWith(Arquillian.class)
+public class DynamicBeanTest {
+
+    @Deployment
+    public static WebArchive deploy() {
+        return create(WebArchive.class)
+                .addAsLibraries(
+                    create(JavaArchive.class)
+                        .addClasses(CdiExtension.class, MyBean.class, MyBeanImpl.class)
+                        .addAsResource("META-INF/services/javax.enterprise.inject.spi.Extension"))
+                .addClass(MyDecorator.class)
+                .addAsManifestResource("beans.xml");
+    }
+
+    @Inject
+    private MyBean myBean;
+
+    @Test
+    public void test() {
+        assertEquals("Hi! decorated", myBean.sayHi());
+    }
+}
diff --git a/cdi/dynamic-bean-decorated/src/test/java/org/javaee8/cdi/dynamic/bean/decorated/MyDecorator.java b/cdi/dynamic-bean-decorated/src/test/java/org/javaee8/cdi/dynamic/bean/decorated/MyDecorator.java
new file mode 100644
index 00000000..3251afcf
--- /dev/null
+++ b/cdi/dynamic-bean-decorated/src/test/java/org/javaee8/cdi/dynamic/bean/decorated/MyDecorator.java
@@ -0,0 +1,21 @@
+package org.javaee8.cdi.dynamic.bean.decorated;
+
+import javax.annotation.Priority;
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+@Decorator
+@Priority(100)
+public class MyDecorator implements MyBean {
+
+    @Inject
+    @Delegate
+    MyBean mybean;
+
+    @Override
+    public String sayHi() {
+        return mybean.sayHi() + " decorated";
+    }
+
+}
diff --git a/cdi/dynamic-bean-decorated/src/test/resources/beans.xml b/cdi/dynamic-bean-decorated/src/test/resources/beans.xml
new file mode 100644
index 00000000..d306e5f6
--- /dev/null
+++ b/cdi/dynamic-bean-decorated/src/test/resources/beans.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+	   bean-discovery-mode="all">
+
+</beans>

From 7073125a0c023731cec9b598ba384c2ab015a96d Mon Sep 17 00:00:00 2001
From: Matt Gill <matthew.gill@live.co.uk>
Date: Fri, 20 Jul 2018 17:18:06 +0100
Subject: [PATCH 11/30] Revert "Merge pull request #17 from
 MattGill98/add-payara-micro-container"

This reverts commit 44bb02c93bfc220c0e00baed796d211a495cef54, reversing
changes made to 7d6ad86e8e81565e3400c0bcc543a570f54a8250.
---
 pom.xml | 51 ---------------------------------------------------
 1 file changed, 51 deletions(-)

diff --git a/pom.xml b/pom.xml
index d88277ed..cfc23c5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -418,57 +418,6 @@
             </build>
         </profile>
 
-        <profile>
-            <id>payara-micro-managed</id>
-            <dependencies>
-                <!-- The Arquillian connector -->
-                <dependency>
-                    <groupId>fish.payara.arquillian</groupId>
-                    <artifactId>arquillian-payara-micro-4-managed</artifactId> 
-                    <version>1.0.Beta2</version> 
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <!-- Download Payara Micro and copy to target directory -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>fish.payara.extras</groupId>
-                                            <artifactId>payara-micro</artifactId>
-                                            <version>${payara.version}</version>
-                                            <overWrite>false</overWrite>
-                                            <outputDirectory>${session.executionRootDirectory}/target/</outputDirectory>
-                                            <destFileName>payara-micro-${payara.version}.jar</destFileName>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <!-- Configure Payara Micro Runtime -->
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <environmentVariables>
-                                <MICRO_JAR>${session.executionRootDirectory}/target/payara-micro-${payara.version}.jar</MICRO_JAR>
-                            </environmentVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
         <profile>
             <id>payara-embedded</id>
             <dependencies>

From e47b3955e7220e8b0b016171cc713eb602f7fede Mon Sep 17 00:00:00 2001
From: David Matejcek <dmatej@seznam.cz>
Date: Mon, 30 Jul 2018 16:12:35 +0200
Subject: [PATCH 12/30] Fixed #23 ClientConfig differs between appservers

- test was successful if run against remote servers, but failed with embedded
  The cause was that the default server's private embedded payara provider is
  incompatible with the jerseys's
- solution: configure the jersey client to be independent on server settings/impl
- also done some cleanup and comments
- the test is faster now and has timeout set (hangouts were possible)
- no asserts lost now (try/catch/stacktrace replaced with collecting junit
  exceptions from each event processing and asserting that all assertions passed
  and no exception was thrown)
---
 .../jaxrs/sseproducer/data/EventData.java     |   8 +-
 .../sseproducer/producer/SseResource.java     |  18 +--
 jaxrs/sse-producer/src/main/webapp/index.html |  10 +-
 .../jaxrs/sseproducer/SseResourceTest.java    | 129 +++++++++++-------
 4 files changed, 92 insertions(+), 73 deletions(-)

diff --git a/jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/data/EventData.java b/jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/data/EventData.java
index 64fc5713..8c208462 100644
--- a/jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/data/EventData.java
+++ b/jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/data/EventData.java
@@ -2,7 +2,6 @@
 
 import java.util.Date;
 import java.util.UUID;
-import javax.json.bind.JsonbBuilder;
 
 /**
  *
@@ -16,7 +15,7 @@ public class EventData {
 
     public EventData() {
     }
-    
+
     public EventData(String comment) {
         this.setTime(new Date());
         this.setId(UUID.randomUUID().toString());
@@ -46,9 +45,4 @@ public String getComment() {
     public void setComment(String comment) {
         this.comment = comment;
     }
-
-    @Override
-    public String toString() {
-        return JsonbBuilder.create().toJson(this);
-    }
 }
diff --git a/jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/producer/SseResource.java b/jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/producer/SseResource.java
index 63ad39ac..b82a60de 100644
--- a/jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/producer/SseResource.java
+++ b/jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/producer/SseResource.java
@@ -15,11 +15,13 @@
 import org.javaee8.jaxrs.sseproducer.data.EventData;
 
 /**
+ * Produces server side events.
+ *
  * @author Daniel Contreras
  */
 @Path("sse")
 public class SseResource {
-    
+
     @Context
     private Sse sse;
 
@@ -34,25 +36,23 @@ public void init() {
     @Path("register")
     @Produces(MediaType.SERVER_SENT_EVENTS)
     public void register(@Context SseEventSink eventSink) {
-        
-        Jsonb jsonb = JsonbBuilder.create();
 
-        eventSink.send(sse.newEvent("INIT",new EventData("event:intialized").toString()));
+        final Jsonb json = JsonbBuilder.create();
+        eventSink.send(sse.newEvent("INIT", json.toJson(new EventData("event:intialized"))));
 
         sseBroadcaster.register(eventSink);
 
         for (int i = 0; i < 5; i++) {
 
-            sseBroadcaster.broadcast(sse.newEvent("EVENT",new EventData("event:"+i).toString()));
+            sseBroadcaster.broadcast(sse.newEvent("EVENT", json.toJson(new EventData("event:" + i))));
 
             try {
-                Thread.sleep(100);
+                Thread.sleep(10);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
         }
-        
-        eventSink.send(sse.newEvent("FINISH",new EventData("event:finished").toString()));
+
+        eventSink.send(sse.newEvent("FINISH", json.toJson(new EventData("event:finished"))));
     }
-    
 }
diff --git a/jaxrs/sse-producer/src/main/webapp/index.html b/jaxrs/sse-producer/src/main/webapp/index.html
index dba826df..a7763133 100644
--- a/jaxrs/sse-producer/src/main/webapp/index.html
+++ b/jaxrs/sse-producer/src/main/webapp/index.html
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <!--
-To change this license header, choose License Headers in Project Properties.
-To change this template file, choose Tools | Templates
-and open the template in the editor.
-
 @author Daniel Contreras
 -->
 <html>
@@ -20,7 +16,7 @@
         <button onclick="start()">Start</button>
 
         <script>
-                        
+
             function start() {
 
                 var eventSource = new EventSource("rest/sse/register");
@@ -28,7 +24,7 @@
 
                 eventSource.onmessage = function (event) {
                     console.log(event)
-                    var el = document.getElementById("foo"); 
+                    var el = document.getElementById("foo");
                     el.innerHTML += event.data + "<br/>";
                     el.scrollTop += 50;
                 };
@@ -36,7 +32,7 @@
                 eventSource.addEventListener('broadcast', function (event) {
 
                     console.log(event)
-                    var el = document.getElementById("foo"); 
+                    var el = document.getElementById("foo");
                     el.innerHTML += event.data + "lt;br/&>";
                     el.scrollTop += 50;
 
diff --git a/jaxrs/sse-producer/src/test/java/org/javaee8/jaxrs/sseproducer/SseResourceTest.java b/jaxrs/sse-producer/src/test/java/org/javaee8/jaxrs/sseproducer/SseResourceTest.java
index d19a74fc..aa411b7a 100644
--- a/jaxrs/sse-producer/src/test/java/org/javaee8/jaxrs/sseproducer/SseResourceTest.java
+++ b/jaxrs/sse-producer/src/test/java/org/javaee8/jaxrs/sseproducer/SseResourceTest.java
@@ -1,14 +1,29 @@
 package org.javaee8.jaxrs.sseproducer;
 
+import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
 
-import java.io.IOException;
 import java.net.URL;
-import java.util.Arrays;
 import java.util.Date;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.function.Consumer;
+
 import javax.json.bind.Jsonb;
 import javax.json.bind.JsonbBuilder;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.sse.InboundSseEvent;
+import javax.ws.rs.sse.SseEventSource;
 
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.client.HttpUrlConnectorProvider;
+import org.hamcrest.Matchers;
 import org.javaee8.jaxrs.sseproducer.data.EventData;
 import org.javaee8.jaxrs.sseproducer.producer.SseResource;
 import org.javaee8.jaxrs.sseproducer.rest.RestApplication;
@@ -22,82 +37,96 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.sse.SseEventSource;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
 /**
+ * Test example for the Server-Sent Events with the Jersey JAX-RS implementation.
+ *
  * @author Daniel Contreras
+ * @author David Matějček
  */
 @RunWith(Arquillian.class)
 public class SseResourceTest {
 
+    private static final String[] EVENT_TYPES = {"INIT", "EVENT", "FINISH"};
+
     @ArquillianResource
     private URL base;
 
     private Client sseClient;
     private WebTarget target;
+    private SseEventSource eventSource;
 
-    SseEventSource eventSource;
-
-    @Deployment(testable = false)
+    @Deployment(testable = true)
     public static WebArchive createDeployment() {
-        return create(WebArchive.class)
-                .addClasses(RestApplication.class, SseResource.class, EventData.class, JsonbBuilder.class, Jsonb.class);
+        return create(WebArchive.class).addClasses(RestApplication.class, SseResource.class, EventData.class);
     }
 
+
+    /**
+     * Initializes the client, target and the eventSource used to create event consumers
+     */
     @Before
     public void setup() {
-        this.sseClient = ClientBuilder.newClient();
-        this.target = this.sseClient.target(base + "rest/sse/register");
-        eventSource = SseEventSource.target(target).build();
+        // this is needed to avoid a conflict with embedded server, that can have
+        // customized configuration and connector providers.
+        final ClientConfig configuration = new ClientConfig();
+        configuration.property(ClientProperties.CONNECT_TIMEOUT, 100);
+        configuration.property(ClientProperties.READ_TIMEOUT, 5000);
+        configuration.connectorProvider(new HttpUrlConnectorProvider());
+        this.sseClient = ClientBuilder.newClient(configuration);
+        this.target = this.sseClient.target(this.base + "rest/sse/register");
+        this.eventSource = SseEventSource.target(this.target).build();
         System.out.println("SSE Event source created........");
+        final Response response = this.target.request().get();
+        assertThat("GET response status - server is not ready", response.getStatus(),
+            Matchers.equalTo(Response.Status.OK.getStatusCode()));
     }
 
+
+    /**
+     * Closes all client resources.
+     */
     @After
     public void teardown() {
-        eventSource.close();
+        this.eventSource.close();
         System.out.println("Closed SSE Event source..");
-        sseClient.close();
+        this.sseClient.close();
         System.out.println("Closed JAX-RS client..");
     }
 
-    String[] types = {"INIT", "EVENT", "FINISH"};
 
-    @Test
+    /**
+     * Registers reaction on events, waits for events and checks their content.
+     *
+     * @throws Exception
+     */
+    @Test(timeout = 5000)
     @RunAsClient
-    public void testSSE() throws IOException {
-
-        Jsonb jsonb = JsonbBuilder.create();
-
-        System.out.println("SSE Client triggered in thread " + Thread.currentThread().getName());
-        try {
-            eventSource.register(
-                    (sseEvent)
-                    -> {
-                assertTrue(Arrays.asList(types).contains(sseEvent.getName()));
-                assertNotNull(sseEvent.readData());
-                EventData event = jsonb.fromJson(sseEvent.readData(), EventData.class);
-                assertThat(event.getTime(), instanceOf(Date.class));
-                assertNotNull(event.getId());
-                assertTrue(event.getComment().contains("event:"));
-                System.out.println("\nSSE Event received :: " + event.toString() +"\n");
-                
-            },
-                    (e) -> e.printStackTrace());
-
-            eventSource.open();
-            Thread.sleep(1500);
-        } catch (Exception e) {
-            System.out.println("Error on SSE Test");
-            System.out.println(e.getMessage());
+    public void testSSE() throws Exception {
+        final Queue<Throwable> asyncExceptions = new ConcurrentLinkedQueue<>();
+        final Queue<EventData> receivedEvents = new ConcurrentLinkedQueue<>();
+        // jsonb is thread safe!
+        final Jsonb jsonb = JsonbBuilder.create();
+        final Consumer<InboundSseEvent> onEvent = (sseEvent) -> {
+            assertThat("event type", sseEvent.getName(), Matchers.isOneOf(EVENT_TYPES));
+            final String data = sseEvent.readData();
+            System.out.println("Data received as string:\n" + data);
+            assertNotNull("data received as string", data);
+            final EventData event = jsonb.fromJson(data, EventData.class);
+            receivedEvents.add(event);
+            assertThat("event.time", event.getTime(), instanceOf(Date.class));
+            assertNotNull("event.id", event.getId());
+            assertThat("event.comment", event.getComment(), Matchers.containsString("event:"));
+        };
+        this.eventSource.register(onEvent, asyncExceptions::add);
+        System.out.println("Server Side Events Client registered in the test thread.");
+        // following line starts acceptation of events.
+        this.eventSource.open();
+        // don't end the test until we have all events or timeout or error comes.
+        // this is not an obvious implementation, we only need to hold the test until all events
+        // are asynchronously processed.
+        while (receivedEvents.size() <= 5 && asyncExceptions.isEmpty()) {
+            Thread.sleep(10L);
         }
-
+        assertThat("receiver exceptions", asyncExceptions, Matchers.emptyIterable());
     }
-
 }

From 1fade76be5bc25f5413fb508a08b9da3900d2978 Mon Sep 17 00:00:00 2001
From: David Matejcek <dmatej@seznam.cz>
Date: Mon, 30 Jul 2018 20:03:20 +0200
Subject: [PATCH 13/30] Fixed #25 Using dependency plugin instead of antrun
 plugin for tomcat-users.xml sharing

---
 pom.xml            | 29 ++++++++++++++---------------
 test-utils/pom.xml | 19 ++++++++++++++++---
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index cfc23c5d..4eb905ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -789,7 +789,7 @@
                         <artifactId>maven-dependency-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>unpack</id>
+                                <id>unpack-tomcat</id>
                                 <phase>process-test-classes</phase>
                                 <goals>
                                     <goal>unpack</goal>
@@ -807,25 +807,24 @@
                                     </artifactItems>
                                 </configuration>
                             </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.1</version>
-                        <executions>
                             <execution>
+                                <id>unpack-tomcat-users</id>
                                 <phase>process-test-classes</phase>
                                 <goals>
-                                    <goal>run</goal>
+                                    <goal>unpack</goal>
                                 </goals>
                                 <configuration>
-                                    <tasks>
-                                        <echo>Copying server.xml</echo>
-                                        <copy failonerror="false"
-                                            file="../../test-utils/src/main/resources/tomcat-users.xml"
-                                            tofile="${project.build.directory}/apache-tomcat-${tomcat.version}/conf/tomcat-users.xml" />
-                                    </tasks>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.javaee8</groupId>
+                                            <artifactId>test-utils</artifactId>
+                                            <version>${project.version}</version>
+                                            <type>jar</type>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>${project.build.directory}/apache-tomcat-${tomcat.version}/conf</outputDirectory>
+                                            <includes>tomcat-users.xml</includes>
+                                        </artifactItem>
+                                    </artifactItems>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/test-utils/pom.xml b/test-utils/pom.xml
index 6e182fea..60a50f84 100644
--- a/test-utils/pom.xml
+++ b/test-utils/pom.xml
@@ -8,7 +8,7 @@
         <groupId>org.javaee8</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>test-utils</artifactId>
     <name>Java EE 8 Samples: test-utils</name>
 
@@ -27,5 +27,18 @@
             <artifactId>shrinkwrap-resolver-api-maven</artifactId>
         </dependency>
     </dependencies>
-    
-</project>
\ No newline at end of file
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <!-- no need to unpack tomcat here! -->
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+      </plugins>
+    </build>
+
+</project>

From 5b959f9c05919c9240451bb2b31ea8d861e23303 Mon Sep 17 00:00:00 2001
From: David Matejcek <dmatej@seznam.cz>
Date: Mon, 30 Jul 2018 20:04:23 +0200
Subject: [PATCH 14/30] Issue #25 Updated dependency version of
 arquillian-tomcat-remote-7

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4eb905ca..b5c58238 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,7 +286,7 @@
                 </configuration>
             </plugin>
             <plugin>
-            		<groupId>org.apache.maven.plugins</groupId>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <version>3.0.0-M1</version>
                 <configuration>
@@ -717,7 +717,7 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-tomcat-remote-7</artifactId>
-                    <version>1.0.0.CR7</version>
+                    <version>1.0.1.Final</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -777,7 +777,7 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-tomcat-managed-7</artifactId>
-                    <version>1.0.0.CR7</version>
+                    <version>1.0.1.Final</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -845,8 +845,8 @@
 
 
 
-        <!-- Activate this profile to download javadoc and sources jars. 
-            run: mvn process-resources -Ddownload Notice: This feature has been removed 
+        <!-- Activate this profile to download javadoc and sources jars.
+            run: mvn process-resources -Ddownload Notice: This feature has been removed
             with plugin version 2.5, so keep this plugin configuration in a profile section. -->
         <profile>
             <id>javadocs</id>

From 8b0215b61b847ce319364b9ab747d2681b8e81bb Mon Sep 17 00:00:00 2001
From: David Matejcek <dmatej@seznam.cz>
Date: Mon, 30 Jul 2018 21:23:22 +0200
Subject: [PATCH 15/30] Fixed #27 By default select ALPN supporting 8u161 and
 newer

- tested successfuly with 8u144 and 8u181
---
 servlet/http2/pom.xml | 55 +++++--------------------------------------
 1 file changed, 6 insertions(+), 49 deletions(-)

diff --git a/servlet/http2/pom.xml b/servlet/http2/pom.xml
index 696ee854..a7e1f85b 100644
--- a/servlet/http2/pom.xml
+++ b/servlet/http2/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -12,11 +12,11 @@
     <packaging>war</packaging>
 
     <name>Java EE 8 Samples: Servlet - http2</name>
-    
+
     <properties>
         <jetty-version>9.4.8.v20171121</jetty-version>
     </properties>
-    
+
     <dependencies>
         <!-- Jetty HTTP2 client -->
         <dependency>
@@ -53,6 +53,8 @@
                 <jdk>1.8</jdk>
             </activation>
             <properties>
+                <!-- default is the newest possible, supports 8u161 to 8u181 -->
+                <alpn.version>8.1.12.v20180117</alpn.version>
                 <bootclasspathPrefix>
                     ${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn.version}/alpn-boot-${alpn.version}.jar
                 </bootclasspathPrefix>
@@ -327,51 +329,6 @@
                 <alpn.version>8.1.11.v20170118</alpn.version>
             </properties>
         </profile>
-        <profile>
-            <id>alpn-when-jdk8_161</id>
-            <activation>
-                <jdk>1.8.0_161</jdk>
-            </activation>
-            <properties>
-                <alpn.version>8.1.12.v20180117</alpn.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>alpn-when-jdk8_162</id>
-            <activation>
-                <jdk>1.8.0_162</jdk>
-            </activation>
-            <properties>
-                <alpn.version>8.1.12.v20180117</alpn.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>alpn-when-jdk8_163</id>
-            <activation>
-                <jdk>1.8.0_163</jdk>
-            </activation>
-            <properties>
-                <alpn.version>8.1.12.v20180117</alpn.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>alpn-when-jdk8_172</id>
-            <activation>
-                <jdk>1.8.0_172</jdk>
-            </activation>
-            <properties>
-                <alpn.version>8.1.12.v20180117</alpn.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>alpn-when-jdk8_173</id>
-            <activation>
-                <jdk>1.8.0_173</jdk>
-            </activation>
-            <properties>
-                <alpn.version>8.1.12.v20180117</alpn.version>
-            </properties>
-        </profile>
     </profiles>
-    
+
 </project>

From 2ee4b8fa8909297f2ff8fafb9177f090a286fe8d Mon Sep 17 00:00:00 2001
From: David Matejcek <dmatej@seznam.cz>
Date: Mon, 30 Jul 2018 21:59:26 +0200
Subject: [PATCH 16/30] Fixed #28 ConstraintViolationTest results are not
 dependent on locale any more

- default locale is set to US before the test
---
 .../javaee8/validation/ConstraintViolationTest.java  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/validation/constraints/src/test/java/org/javaee8/validation/ConstraintViolationTest.java b/validation/constraints/src/test/java/org/javaee8/validation/ConstraintViolationTest.java
index cecf04d6..ba35781a 100644
--- a/validation/constraints/src/test/java/org/javaee8/validation/ConstraintViolationTest.java
+++ b/validation/constraints/src/test/java/org/javaee8/validation/ConstraintViolationTest.java
@@ -14,6 +14,7 @@
 import javax.validation.groups.Default;
 import java.time.*;
 import java.util.Arrays;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.Set;
 
@@ -28,7 +29,14 @@
 public class ConstraintViolationTest {
 
     private Validator validator;
-    
+
+    static {
+        // prevent to use translated messages which we compare in test;
+        // translation language depends on the locale.
+        Locale.setDefault(Locale.US);
+    }
+
+
     @Deployment
     public static WebArchive deploy() {
         return create(WebArchive.class)
@@ -134,4 +142,4 @@ public void validatingAddressFailsWithViolation() {
         assertThat(violations.iterator().next().getMessage(),
                 anyOf(is("must not be empty"), is("size must be between 2 and 2")));
     }
-}
\ No newline at end of file
+}

From 7582ff25513a5a41166c77c6048e9da2cf943a42 Mon Sep 17 00:00:00 2001
From: David Matejcek <dmatej@seznam.cz>
Date: Mon, 30 Jul 2018 22:06:50 +0200
Subject: [PATCH 17/30] Issue #20 Don't hide exceptions to the test, null is
 ugly

- throws IllegalStateException if it cannot get session in 5 seconds
- (fail fast as possible)
---
 .../java/org/javaee8/servlet/http2/JettyConnector.java    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/servlet/http2/src/test/java/org/javaee8/servlet/http2/JettyConnector.java b/servlet/http2/src/test/java/org/javaee8/servlet/http2/JettyConnector.java
index d7e89b8b..05858a21 100644
--- a/servlet/http2/src/test/java/org/javaee8/servlet/http2/JettyConnector.java
+++ b/servlet/http2/src/test/java/org/javaee8/servlet/http2/JettyConnector.java
@@ -167,13 +167,11 @@ private Session createSession(String host, int port, boolean secure) {
             client.connect(new InetSocketAddress(host, port), new ServerSessionListener.Adapter(), sessionPromise);
         }
 
-        Session session = null;
         try {
-            session = sessionPromise.get(5, TimeUnit.SECONDS);
+            return sessionPromise.get(5, TimeUnit.SECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
-            e.printStackTrace();
+            throw new IllegalStateException("Cloud not get a session.", e);
         }
-        return session;
     }
 
-}
\ No newline at end of file
+}

From fb734140af3ee3cd6e7cb33b3ea37df8f6b10ca3 Mon Sep 17 00:00:00 2001
From: David Matejcek <dmatej@seznam.cz>
Date: Mon, 30 Jul 2018 22:24:50 +0200
Subject: [PATCH 18/30] Issue #20 Updated jetty

---
 servlet/http2/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servlet/http2/pom.xml b/servlet/http2/pom.xml
index a7e1f85b..c2a96b16 100644
--- a/servlet/http2/pom.xml
+++ b/servlet/http2/pom.xml
@@ -14,7 +14,7 @@
     <name>Java EE 8 Samples: Servlet - http2</name>
 
     <properties>
-        <jetty-version>9.4.8.v20171121</jetty-version>
+        <jetty-version>9.4.11.v20180605</jetty-version>
     </properties>
 
     <dependencies>

From 8acfbc6c9ad490a8bbfdbd8c701502051ad8904a Mon Sep 17 00:00:00 2001
From: David Matejcek <dmatej@seznam.cz>
Date: Mon, 30 Jul 2018 22:25:49 +0200
Subject: [PATCH 19/30] Issue #20 Updated jersey-client to 2.7

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index b5c58238..3c1af7c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -448,7 +448,7 @@
                 <dependency>
                     <groupId>org.glassfish.jersey.core</groupId>
                     <artifactId>jersey-client</artifactId>
-                    <version>2.25</version>
+                    <version>2.27</version>
                     <scope>test</scope>
                 </dependency>
 
@@ -604,7 +604,7 @@
                 <dependency>
                     <groupId>org.glassfish.jersey.core</groupId>
                     <artifactId>jersey-client</artifactId>
-                    <version>2.4</version>
+                    <version>2.7</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
@@ -652,7 +652,7 @@
                 <dependency>
                     <groupId>org.glassfish.jersey.core</groupId>
                     <artifactId>jersey-client</artifactId>
-                    <version>2.4</version>
+                    <version>2.7</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>

From ad609b5f8f301884e8aa6a022d1de522828d5965 Mon Sep 17 00:00:00 2001
From: David Matejcek <dmatej@seznam.cz>
Date: Mon, 30 Jul 2018 22:30:41 +0200
Subject: [PATCH 20/30] Issue #20 Added asserts for injected beans

- if injection is not supported by the container, shows meanungful error, not NPE
---
 .../org/javaee8/cdi/dynamic/bean/DynamicBeanTest.java    | 7 +++++--
 .../java/org/javaee8/jpa/dynamic/tx/DynamicTXTest.java   | 9 ++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/cdi/dynamic-bean/src/test/java/org/javaee8/cdi/dynamic/bean/DynamicBeanTest.java b/cdi/dynamic-bean/src/test/java/org/javaee8/cdi/dynamic/bean/DynamicBeanTest.java
index 71f16e9f..7767f82d 100644
--- a/cdi/dynamic-bean/src/test/java/org/javaee8/cdi/dynamic/bean/DynamicBeanTest.java
+++ b/cdi/dynamic-bean/src/test/java/org/javaee8/cdi/dynamic/bean/DynamicBeanTest.java
@@ -2,9 +2,11 @@
 
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 
 import javax.inject.Inject;
 
+import org.hamcrest.Matchers;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -13,13 +15,13 @@
 import org.junit.runner.RunWith;
 
 /**
- * 
+ *
  * @author Arjan Tijms
  *
  */
 @RunWith(Arquillian.class)
 public class DynamicBeanTest {
-    
+
     @Deployment
     public static WebArchive deploy() {
         return create(WebArchive.class)
@@ -35,6 +37,7 @@ public static WebArchive deploy() {
 
     @Test
     public void test() {
+        assertThat("myBean", myBean, Matchers.notNullValue());
         assertEquals("Hi!", myBean.sayHi());
     }
 }
diff --git a/jpa/dynamic-tx/src/test/java/org/javaee8/jpa/dynamic/tx/DynamicTXTest.java b/jpa/dynamic-tx/src/test/java/org/javaee8/jpa/dynamic/tx/DynamicTXTest.java
index ae5511a4..26b1b4a7 100644
--- a/jpa/dynamic-tx/src/test/java/org/javaee8/jpa/dynamic/tx/DynamicTXTest.java
+++ b/jpa/dynamic-tx/src/test/java/org/javaee8/jpa/dynamic/tx/DynamicTXTest.java
@@ -2,9 +2,11 @@
 
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 
 import javax.inject.Inject;
 
+import org.hamcrest.Matchers;
 import org.javaee8.jpa.dynamic.tx.ApplicationInit;
 import org.javaee8.jpa.dynamic.tx.Employee;
 import org.javaee8.jpa.dynamic.tx.EmployeeService;
@@ -41,11 +43,12 @@ public static WebArchive createDeployment() {
     public void testPersist() throws Exception {
         Employee employee = new Employee();
         employee.setName("reza");
-        
+
+        assertThat("employeeService", employeeService, Matchers.notNullValue());
         employeeService.persist(employee);
-        
+
         Employee persistedEmployee = employeeService.getById(employee.getId());
-        
+
         assertEquals("reza", persistedEmployee.getName());
     }
 

From 2bd3c87600cd28126d2b24805757d33ea62ddd59 Mon Sep 17 00:00:00 2001
From: David Matejcek <dmatej@seznam.cz>
Date: Mon, 30 Jul 2018 22:29:04 +0200
Subject: [PATCH 21/30] Issue #20 More stable Http2Test, cleanup

- added safety timeouts - test hangs sometimes.
- added assert for header even in the public variant
- shows the content of the war file in logs
- removed unuseful exception declarations
---
 .../org/javaee8/servlet/http2/Http2Test.java  | 75 ++++++++++++-------
 1 file changed, 46 insertions(+), 29 deletions(-)

diff --git a/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java b/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java
index b3577ec1..a1bd5513 100644
--- a/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java
+++ b/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java
@@ -1,20 +1,19 @@
 package org.javaee8.servlet.http2;
 
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
 
 import java.io.File;
-import java.net.URISyntaxException;
+import java.net.URI;
 import java.net.URL;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
 
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.Response;
 
 import org.glassfish.jersey.client.ClientConfig;
+import org.hamcrest.Matchers;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
@@ -25,40 +24,25 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+
+/**
+ * Test for the HTTP/2 and the JAX-RS client
+ */
 @RunWith(Arquillian.class)
 public class Http2Test {
 
+    @ArquillianResource
+    private URL basicUrl;
     private Client jaxrsClient;
 
+
     @Deployment
     public static WebArchive createDeployment() {
-        return create(WebArchive.class).addPackages(true, "org.javaee8.servlet.http2")
+        final WebArchive war = create(WebArchive.class).addPackages(true, "org.javaee8.servlet.http2")
                 .addAsWebResource(new File("src/main/webapp/images/payara-logo.jpg"), "images/payara-logo.jpg")
                 .addAsWebInfResource(new File("src/main/webapp/WEB-INF/web.xml"));
-    }
-
-    @Test
-    @RunAsClient
-    public void testHttp2ControlGroup()
-            throws InterruptedException, ExecutionException, TimeoutException, URISyntaxException {
-        testUrl("https://http2.akamai.com/");
-    }
-
-    @Test
-    @RunAsClient
-    public void testServerHttp2(@ArquillianResource URL url)
-            throws InterruptedException, ExecutionException, TimeoutException, URISyntaxException {
-        Response response = testUrl(url.toURI().toString());
-        assertEquals(
-                "Request wasn't over HTTP/2."
-                        + " Either the wrong servlet was returned, or the server doesn't support HTTP/2.",
-                response.getHeaderString("protocol"), "HTTP/2");
-    }
-
-    private Response testUrl(String url) {
-        Response response = jaxrsClient.target(url).request().get();
-        assertNotNull(response);
-        return response;
+        System.out.println("War file content: \n" + war.toString(true));
+        return war;
     }
 
     @Before
@@ -73,4 +57,37 @@ public void cleanUp() throws Exception {
         jaxrsClient.close();
     }
 
+
+    /**
+     * This test runs against the public website supporting HTTP/2
+     *
+     * @throws Exception
+     */
+    @Test(timeout = 10000L)
+    @RunAsClient
+    public void testHttp2ControlGroup() throws Exception {
+        Response response = testUri(new URI("https://http2.akamai.com/"));
+        assertThat("myproto header", response.getHeaderString("myproto"), Matchers.equalTo("h2"));
+    }
+
+    /**
+     * This test runs against our private website supporting HTTP/2
+     *
+     * @throws Exception
+     */
+    @Test(timeout = 10000L)
+    @RunAsClient
+    public void testServerHttp2() throws Exception {
+        Response response = testUri(basicUrl.toURI());
+        // the header 'protocol' is set in the Servlet class.
+        assertThat(
+            "Request wasn't over HTTP/2. Either the wrong servlet was returned, or the server doesn't support HTTP/2.",
+            response.getHeaderString("protocol"), Matchers.equalTo("HTTP/2"));
+    }
+
+    private Response testUri(URI uri) {
+        Response response = jaxrsClient.target(uri).request().get();
+        assertNotNull("response", response);
+        return response;
+    }
 }

From 8f67b5a9c997ea122d9b8260664924f0b0bf4029 Mon Sep 17 00:00:00 2001
From: arjantijms <arjan.tijms@gmail.com>
Date: Fri, 10 Aug 2018 00:49:40 +0200
Subject: [PATCH 22/30] Added very simple hello world JSF sample setup in EE 8
 style

---
 jsf/README.md                                 |  1 +
 jsf/extensionless-mapping/pom.xml             |  2 +
 jsf/hello-world/README.md                     |  9 +++
 jsf/hello-world/pom.xml                       | 14 ++++
 .../jsf/hello/world/ApplicationInit.java      | 19 +++++
 .../javaee8/jsf/hello/world/HelloBacking.java | 15 ++++
 jsf/hello-world/src/main/webapp/hello.xhtml   | 21 ++++++
 .../jsf/hello/world/JSFHelloWorldTest.java    | 72 +++++++++++++++++++
 jsf/pom.xml                                   |  5 +-
 9 files changed, 156 insertions(+), 2 deletions(-)
 create mode 100644 jsf/hello-world/README.md
 create mode 100644 jsf/hello-world/pom.xml
 create mode 100644 jsf/hello-world/src/main/java/org/javaee8/jsf/hello/world/ApplicationInit.java
 create mode 100644 jsf/hello-world/src/main/java/org/javaee8/jsf/hello/world/HelloBacking.java
 create mode 100755 jsf/hello-world/src/main/webapp/hello.xhtml
 create mode 100644 jsf/hello-world/src/test/java/org/javaee8/jsf/hello/world/JSFHelloWorldTest.java

diff --git a/jsf/README.md b/jsf/README.md
index 4c5eda36..5d31707a 100644
--- a/jsf/README.md
+++ b/jsf/README.md
@@ -4,6 +4,7 @@ The [JSR 372](https://jcp.org/en/jsr/detail?id=372) specifies the next version o
 
 ## Samples ##
 
+- hello-world shows a typical "hello world" that prints this often used sentence coming from a backing bean 
 - extensionless-mapping shows how to configure JSF so that views can be requested without using an extension
 
 
diff --git a/jsf/extensionless-mapping/pom.xml b/jsf/extensionless-mapping/pom.xml
index b7524ac5..1f078a5e 100644
--- a/jsf/extensionless-mapping/pom.xml
+++ b/jsf/extensionless-mapping/pom.xml
@@ -8,6 +8,8 @@
     </parent>
 
     <artifactId>extensionless-mapping</artifactId>
+    <packaging>war</packaging>
     <name>Java EE 8 Samples: JSF - Extensionless Mapping</name>
     
+    
 </project>
diff --git a/jsf/hello-world/README.md b/jsf/hello-world/README.md
new file mode 100644
index 00000000..d48aecf7
--- /dev/null
+++ b/jsf/hello-world/README.md
@@ -0,0 +1,9 @@
+# Java EE 8 Samples: JSF 2.3 - Hello world#
+
+The [JSR 372](https://jcp.org/en/jsr/detail?id=372) specifies the next version of JavaServer Faces - JSF 2.3. 
+
+A very simple example consisting out of a single page, a backing bean and a bean that activates JSF. 
+The page prints "Hello world, from JSF!" which comes from the backing bean.
+
+
+
diff --git a/jsf/hello-world/pom.xml b/jsf/hello-world/pom.xml
new file mode 100644
index 00000000..9eef89d4
--- /dev/null
+++ b/jsf/hello-world/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.javaee8</groupId>
+        <artifactId>jsf</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>hello-world</artifactId>
+    <packaging>war</packaging>
+    
+    <name>Java EE 8 Samples: JSF - Hello World</name>
+</project>
diff --git a/jsf/hello-world/src/main/java/org/javaee8/jsf/hello/world/ApplicationInit.java b/jsf/hello-world/src/main/java/org/javaee8/jsf/hello/world/ApplicationInit.java
new file mode 100644
index 00000000..c24a81ef
--- /dev/null
+++ b/jsf/hello-world/src/main/java/org/javaee8/jsf/hello/world/ApplicationInit.java
@@ -0,0 +1,19 @@
+/** Copyright Payara Services Limited **/
+package org.javaee8.jsf.hello.world;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.faces.annotation.FacesConfig;
+
+/**
+ * This class is needed to activate JSF and configure it to be the
+ * right version. Without this being present an explicit mapping
+ * of the FacesServlet in web.xml would be required, but JSF 2.3
+ * would then run in a JSF 2.2 compatibility mode.
+ *
+ * @author Arjan Tijms
+ */
+@FacesConfig
+@ApplicationScoped
+public class ApplicationInit {
+
+}
diff --git a/jsf/hello-world/src/main/java/org/javaee8/jsf/hello/world/HelloBacking.java b/jsf/hello-world/src/main/java/org/javaee8/jsf/hello/world/HelloBacking.java
new file mode 100644
index 00000000..bcd3f1c8
--- /dev/null
+++ b/jsf/hello-world/src/main/java/org/javaee8/jsf/hello/world/HelloBacking.java
@@ -0,0 +1,15 @@
+/** Copyright Payara Services Limited **/
+package org.javaee8.jsf.hello.world;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+
+@Named
+@RequestScoped
+public class HelloBacking {
+
+    public String getHello() {
+        return "Hello world, from JSF!";
+    }
+
+}
diff --git a/jsf/hello-world/src/main/webapp/hello.xhtml b/jsf/hello-world/src/main/webapp/hello.xhtml
new file mode 100755
index 00000000..d352e640
--- /dev/null
+++ b/jsf/hello-world/src/main/webapp/hello.xhtml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!-- 
+    Copyright Payara Services Limited
+ -->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://xmlns.jcp.org/jsf/html">
+
+    <h:head>
+        <title>Hello</title>
+    </h:head>
+    
+    <h:body>
+        <p>
+        JSF says:
+        </p>
+        <p>
+            <b>#{helloBacking.hello}</b>
+        </p>
+    </h:body>
+</html>
+
diff --git a/jsf/hello-world/src/test/java/org/javaee8/jsf/hello/world/JSFHelloWorldTest.java b/jsf/hello-world/src/test/java/org/javaee8/jsf/hello/world/JSFHelloWorldTest.java
new file mode 100644
index 00000000..ce08fefc
--- /dev/null
+++ b/jsf/hello-world/src/test/java/org/javaee8/jsf/hello/world/JSFHelloWorldTest.java
@@ -0,0 +1,72 @@
+/** Copyright Payara Services Limited **/
+package org.javaee8.jsf.hello.world;
+
+import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+
+import org.javaee8.jsf.hello.world.ApplicationInit;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+
+/**
+ *
+ * @author Arjan Tijms
+ *
+ */
+@RunWith(Arquillian.class)
+public class JSFHelloWorldTest {
+
+    @ArquillianResource
+    private URL base;
+
+    private WebClient webClient;
+
+    @Before
+    public void setup() {
+        webClient = new WebClient();
+    }
+
+    @After
+    public void teardown() {
+        webClient.close();
+    }
+
+    @Deployment
+    public static WebArchive deploy() {
+        WebArchive war =
+            create(WebArchive.class)
+                .addClasses(ApplicationInit.class, HelloBacking.class)
+                .addAsWebResource(new File("src/main/webapp/hello.xhtml"))
+                ;
+
+        System.out.println("War to be deployed contains: \n" + war.toString(true));
+
+        return war;
+    }
+
+
+    @Test
+    @RunAsClient
+    public void testHelloWorld() throws IOException {
+        HtmlPage page = webClient.getPage(base + "hello.xhtml");
+
+        assertTrue(page.asXml().contains("Hello world, from JSF!"));
+    }
+
+
+
+}
diff --git a/jsf/pom.xml b/jsf/pom.xml
index 17e1cde4..5f2daea2 100644
--- a/jsf/pom.xml
+++ b/jsf/pom.xml
@@ -6,13 +6,14 @@
         <artifactId>samples-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>jsf</artifactId>
     <packaging>pom</packaging>
     <name>Java EE 8 Samples: JSF</name>
 
     <modules>
-        	<module>extensionless-mapping</module>
+        <module>hello-world</module>
+        <module>extensionless-mapping</module>
     </modules>
 
     <dependencies>

From 2daa798e62aa8507a660e94dc25814623b073862 Mon Sep 17 00:00:00 2001
From: David Matejcek <dmatej@seznam.cz>
Date: Sat, 3 Nov 2018 16:31:30 +0100
Subject: [PATCH 23/30] Issue #20 Updated dependencies to current

- Payara + Glassfish + Arquillian + h2 + Tomcat
- fixes failing build of the payara-micro-managed profile
  - using fixed arquillian-payara-micro-5-managed:1.0.Beta3-m4
---
 pom.xml | 146 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 73 insertions(+), 73 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3c1af7c1..37a691b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,12 @@
         <skipJSF>${skipTests}</skipJSF>
         <skipJACC>${skipTests}</skipJACC>
 
-        <!-- Application Server versions (these are downloaded and installed 
+        <!-- Application Server versions (these are downloaded and installed
             in these versions by Maven for the CI profiles) -->
-        <payara.version>5.182</payara.version>
-        <payara.micro.version>5.182</payara.micro.version> 
-        <glassfish.version>4.1.1</glassfish.version>
-        <tomcat.version>9.0.10</tomcat.version>
+        <payara.version>5.183</payara.version>
+        <payara.micro.version>5.183</payara.micro.version>
+        <glassfish.version>5.0</glassfish.version>
+        <tomcat.version>9.0.12</tomcat.version>
     </properties>
 
     <repositories>
@@ -44,19 +44,19 @@
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
-	    </repository>
-	
-		<repository>
-			<id>payara-milestones</id>
-			<name>Payara Milestones</name>
-			<url>https://raw.github.com/payara/Payara_PatchedProjects/master</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
+        </repository>
+
+        <repository>
+            <id>payara-milestones</id>
+            <name>Payara Milestones</name>
+            <url>https://raw.github.com/payara/Payara_PatchedProjects/master</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
 
         <repository>
             <id>ossrh</id>
@@ -96,7 +96,7 @@
     </repositories>
 
 
-    <!-- The Java EE 8 specs that this project is providing samples for. 
+    <!-- The Java EE 8 specs that this project is providing samples for.
         Each spec is represented by one module. "test-utils" is a helper module. -->
     <modules>
         <module>test-utils</module>
@@ -111,33 +111,33 @@
         <module>json-p</module>
     </modules>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.jboss.arquillian</groupId>
-				<artifactId>arquillian-bom</artifactId>
-				<version>1.3.0.Final</version>
-				<scope>import</scope>
-				<type>pom</type>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.arquillian.container</groupId>
-				<artifactId>arquillian-container-test-api</artifactId>
-				<version>1.3.0.Final</version>
-			</dependency>
-			<dependency>
-				<groupId>com.h2database</groupId>
-				<artifactId>h2</artifactId>
-				<version>1.4.196</version>
-			</dependency>
-			<dependency>
-				<groupId>fish.payara.arquillian</groupId>
-				<artifactId>payara-client-ee8</artifactId>
-				<version>1.0.Beta3-m1</version>
-				<scope>test</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.arquillian</groupId>
+                <artifactId>arquillian-bom</artifactId>
+                <version>1.4.1.Final</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.arquillian.container</groupId>
+                <artifactId>arquillian-container-test-api</artifactId>
+                <version>1.4.1.Final</version>
+            </dependency>
+            <dependency>
+                <groupId>com.h2database</groupId>
+                <artifactId>h2</artifactId>
+                <version>1.4.197</version>
+            </dependency>
+            <dependency>
+                <groupId>fish.payara.arquillian</groupId>
+                <artifactId>payara-client-ee8</artifactId>
+                <version>1.0.Beta3</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
 
     <dependencies>
@@ -348,20 +348,20 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
 
-			<dependencies>
-				<dependency>
-					<groupId>fish.payara.arquillian</groupId>
-					<artifactId>payara-client-ee8</artifactId>
-				</dependency>
-		
-				<!-- The actual Arquillian connector -->
-				<dependency>
-					<groupId>fish.payara.arquillian</groupId>
-					<artifactId>arquillian-payara-server-4-managed</artifactId>
-					<version>1.0.Beta3-m1</version>
-					<scope>test</scope>
-				</dependency>
-			</dependencies>
+            <dependencies>
+                <dependency>
+                    <groupId>fish.payara.arquillian</groupId>
+                    <artifactId>payara-client-ee8</artifactId>
+                </dependency>
+
+                <!-- The actual Arquillian connector -->
+                <dependency>
+                    <groupId>fish.payara.arquillian</groupId>
+                    <artifactId>arquillian-payara-server-4-managed</artifactId>
+                    <version>1.0.Beta3-m3</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
 
             <build>
                 <plugins>
@@ -477,16 +477,16 @@
             <id>payara-remote</id>
 
             <dependencies>
-            		<dependency>
-					<groupId>fish.payara.arquillian</groupId>
-					<artifactId>payara-client-ee8</artifactId>
-				</dependency>
+                <dependency>
+                    <groupId>fish.payara.arquillian</groupId>
+                    <artifactId>payara-client-ee8</artifactId>
+                </dependency>
 
                 <!-- The actual Arquillian connector -->
                 <dependency>
                     <groupId>fish.payara.arquillian</groupId>
                     <artifactId>arquillian-payara-server-4-remote</artifactId>
-                    <version>1.0.Beta3-m1</version>
+                    <version>1.0.Beta3-m3</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -519,12 +519,12 @@
                     <groupId>fish.payara.arquillian</groupId>
                     <artifactId>payara-client-ee8</artifactId>
                 </dependency>
-            
+
                 <!-- The Arquillian connector -->
                 <dependency>
                     <groupId>fish.payara.arquillian</groupId>
-                    <artifactId>arquillian-payara-micro-5-managed</artifactId> 
-                    <version>1.0.Beta3-m2</version> 
+                    <artifactId>arquillian-payara-micro-5-managed</artifactId>
+                    <version>1.0.Beta3-m4</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -568,7 +568,7 @@
                 </plugins>
             </build>
         </profile>
-       
+
 
 
 
@@ -610,7 +610,7 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-glassfish-embedded-3.1</artifactId>
-                    <version>1.0.0.CR4</version>
+                    <version>1.0.2</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -670,7 +670,7 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-glassfish-remote-3.1</artifactId>
-                    <version>1.0.0.CR4</version>
+                    <version>1.0.2</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -717,7 +717,7 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-tomcat-remote-7</artifactId>
-                    <version>1.0.1.Final</version>
+                    <version>1.1.0.Final</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -777,7 +777,7 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-tomcat-managed-7</artifactId>
-                    <version>1.0.1.Final</version>
+                    <version>1.1.0.Final</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>

From 1d7cf59cdd6491c3ebfaafa0eb05ef06f5b6cb2b Mon Sep 17 00:00:00 2001
From: Juan Gonzalez <juagonza@redhat.com>
Date: Fri, 4 Jan 2019 11:27:21 +0100
Subject: [PATCH 24/30] Add Thorntail support

---
 .../cdi/dynamic/bean/DynamicBeanTest.java     |  2 +-
 .../WEB-INF/jboss-deployment-structure.xml    |  8 +++
 .../javaee8/jpa/dynamic/tx/DynamicTXTest.java |  5 +-
 jpa/pom.xml                                   | 13 ++++-
 .../javaee8/cdi/dynamic/bean/MappingInit.java | 51 ++++++++++-------
 .../bean/MappingServletContextListener.java   | 44 +++++++++++++++
 .../src/main/webapp/WEB-INF/faces-config.xml  | 12 ++++
 .../bean/ExtensionlessMappingTest.java        |  5 +-
 .../mapping/controller/PersonController.java  |  5 +-
 pom.xml                                       | 55 +++++++++++++++++--
 .../rememberme/DynamicRemembermeTest.java     |  3 +-
 .../src/test/resources/jboss-web.xml          |  6 ++
 .../org/javaee8/security/jwt/JwtTest.java     |  3 +-
 security/jwt/src/test/resources/jboss-web.xml |  6 ++
 security/pom.xml                              |  4 +-
 servlet/http2/pom.xml                         |  4 +-
 .../org/javaee8/servlet/http2/Http2Test.java  |  5 +-
 .../src/test/resources/project-defaults.yml   |  8 +++
 .../org/javaee8/servlet/mapping/Servlet.java  |  8 ++-
 .../servlet/mapping/ServletMappingTest.java   | 20 +++----
 .../main/resources/arquillian-thorntail.xml   | 18 ++++++
 21 files changed, 234 insertions(+), 51 deletions(-)
 create mode 100644 jpa/dynamic-tx/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
 create mode 100644 jsf/extensionless-mapping/src/main/java/org/javaee8/cdi/dynamic/bean/MappingServletContextListener.java
 create mode 100644 jsf/extensionless-mapping/src/main/webapp/WEB-INF/faces-config.xml
 create mode 100644 security/dynamic-rememberme/src/test/resources/jboss-web.xml
 create mode 100644 security/jwt/src/test/resources/jboss-web.xml
 create mode 100644 servlet/http2/src/test/resources/project-defaults.yml
 create mode 100644 test-utils/src/main/resources/arquillian-thorntail.xml

diff --git a/cdi/dynamic-bean/src/test/java/org/javaee8/cdi/dynamic/bean/DynamicBeanTest.java b/cdi/dynamic-bean/src/test/java/org/javaee8/cdi/dynamic/bean/DynamicBeanTest.java
index 7767f82d..dfc66791 100644
--- a/cdi/dynamic-bean/src/test/java/org/javaee8/cdi/dynamic/bean/DynamicBeanTest.java
+++ b/cdi/dynamic-bean/src/test/java/org/javaee8/cdi/dynamic/bean/DynamicBeanTest.java
@@ -29,7 +29,7 @@ public static WebArchive deploy() {
                     create(JavaArchive.class)
                         .addClasses(CdiExtension.class, MyBean.class, MyBeanImpl.class)
                         .addAsResource("META-INF/services/javax.enterprise.inject.spi.Extension"))
-                .addAsManifestResource("beans.xml");
+                .addAsWebInfResource("beans.xml");
     }
 
     @Inject
diff --git a/jpa/dynamic-tx/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/jpa/dynamic-tx/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
new file mode 100644
index 00000000..4feda966
--- /dev/null
+++ b/jpa/dynamic-tx/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -0,0 +1,8 @@
+<jboss-deployment-structure>
+  <deployment>
+    <dependencies>
+      <!-- https://issues.jboss.org/browse/WFLY-11629  -->
+      <module name="org.jboss.jts" services="export"/>
+    </dependencies>    
+  </deployment>  
+</jboss-deployment-structure>
\ No newline at end of file
diff --git a/jpa/dynamic-tx/src/test/java/org/javaee8/jpa/dynamic/tx/DynamicTXTest.java b/jpa/dynamic-tx/src/test/java/org/javaee8/jpa/dynamic/tx/DynamicTXTest.java
index 26b1b4a7..9b77e54d 100644
--- a/jpa/dynamic-tx/src/test/java/org/javaee8/jpa/dynamic/tx/DynamicTXTest.java
+++ b/jpa/dynamic-tx/src/test/java/org/javaee8/jpa/dynamic/tx/DynamicTXTest.java
@@ -4,6 +4,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
+import java.io.File;
+
 import javax.inject.Inject;
 
 import org.hamcrest.Matchers;
@@ -36,7 +38,8 @@ public static WebArchive createDeployment() {
                 .addPackage(
                     TransactionLiteral.class.getPackage())
                 .addAsResource(
-                    "META-INF/persistence.xml");
+                    "META-INF/persistence.xml")
+                .addAsWebInfResource(new File("src/main/webapp/WEB-INF/jboss-deployment-structure.xml"));
     }
 
     @Test
diff --git a/jpa/pom.xml b/jpa/pom.xml
index eb401dc8..523a9fc5 100644
--- a/jpa/pom.xml
+++ b/jpa/pom.xml
@@ -23,4 +23,15 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+    <profiles>
+        <profile>
+            <id>thorntail</id>
+            <dependencies>
+                <dependency>
+                    <groupId>com.h2database</groupId>
+                    <artifactId>h2</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
diff --git a/jsf/extensionless-mapping/src/main/java/org/javaee8/cdi/dynamic/bean/MappingInit.java b/jsf/extensionless-mapping/src/main/java/org/javaee8/cdi/dynamic/bean/MappingInit.java
index 100fe08a..50bb1276 100644
--- a/jsf/extensionless-mapping/src/main/java/org/javaee8/cdi/dynamic/bean/MappingInit.java
+++ b/jsf/extensionless-mapping/src/main/java/org/javaee8/cdi/dynamic/bean/MappingInit.java
@@ -2,34 +2,47 @@
 
 import static javax.faces.application.ViewVisitOption.RETURN_AS_MINIMAL_IMPLICIT_OUTCOME;
 
+import java.util.Map;
+
+import javax.faces.application.Application;
 import javax.faces.context.FacesContext;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.SystemEvent;
+import javax.faces.event.SystemEventListener;
 import javax.faces.webapp.FacesServlet;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRegistration;
 
 /**
  * 
  * @author Arjan Tijms
  */
-@WebListener
-public class MappingInit implements ServletContextListener {
+public class MappingInit implements SystemEventListener {
     
-    @Override
-    public void contextInitialized(ServletContextEvent sce) {
-        FacesContext context = FacesContext.getCurrentInstance();
+ 
+	@Override
+	public void processEvent(SystemEvent event) throws AbortProcessingException {
+		
+		FacesContext facesContext = event.getFacesContext();
+        ServletContext sc = (ServletContext) facesContext.getExternalContext().getContext();
+        
+        if (Boolean.valueOf((String) sc.getAttribute("mappingsAdded"))) {
+        	return;
+        }
+
+        Map<String, ? extends ServletRegistration> servletRegistrations = (Map<String, ? extends ServletRegistration>) sc.getAttribute("mappings");
         
-        sce.getServletContext()
-           .getServletRegistrations()
-           .values()
-           .stream()
-           .filter(e -> e.getClassName().equals(FacesServlet.class.getName()))
-           .findAny()
-           .ifPresent(
-               reg -> context.getApplication()
-                             .getViewHandler()
-                             .getViews(context, "/", RETURN_AS_MINIMAL_IMPLICIT_OUTCOME)
-                             .forEach(e -> reg.addMapping(e)));
+        if (servletRegistrations == null) {
+        	return;
+        }
+
+        MappingServletContextListener.addServletMappings(servletRegistrations, facesContext);
     }
+		
+
+	@Override
+	public boolean isListenerForSource(Object source) {
+		return source instanceof Application;
+	}
 
 }
diff --git a/jsf/extensionless-mapping/src/main/java/org/javaee8/cdi/dynamic/bean/MappingServletContextListener.java b/jsf/extensionless-mapping/src/main/java/org/javaee8/cdi/dynamic/bean/MappingServletContextListener.java
new file mode 100644
index 00000000..d56b8468
--- /dev/null
+++ b/jsf/extensionless-mapping/src/main/java/org/javaee8/cdi/dynamic/bean/MappingServletContextListener.java
@@ -0,0 +1,44 @@
+package org.javaee8.cdi.dynamic.bean;
+
+import static javax.faces.application.ViewVisitOption.RETURN_AS_MINIMAL_IMPLICIT_OUTCOME;
+
+import java.util.Map;
+
+import javax.faces.application.Application;
+import javax.faces.context.FacesContext;
+import javax.faces.webapp.FacesServlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletRegistration;
+import javax.servlet.annotation.WebListener;
+
+@WebListener
+public class MappingServletContextListener implements ServletContextListener {
+
+	@Override
+	public void contextInitialized(ServletContextEvent sce) {
+		ServletContext sc =  sce.getServletContext();
+
+		sc.setAttribute("mappings", sce.getServletContext().getServletRegistrations());
+		
+		FacesContext facesContext = FacesContext.getCurrentInstance();
+		if (facesContext == null) {
+			//It 's possible that JSF isn't available at this time depending on JSF implementation and Java server container
+			return;
+		}
+        
+        addServletMappings(sc.getServletRegistrations(), facesContext);
+        
+        //Add a flag to not add the mappings again later in MappingInit
+        sc.setAttribute("mappingsAdded", "true");
+	}
+
+	public static void addServletMappings(Map<String, ? extends ServletRegistration> servletRegistrations, FacesContext facesContext) {
+        servletRegistrations.values().stream().filter(e -> e.getClassName().equals(FacesServlet.class.getName()))
+        .findAny()
+        .ifPresent(reg -> facesContext.getApplication().getViewHandler().getViews(
+        		facesContext, "/", RETURN_AS_MINIMAL_IMPLICIT_OUTCOME).forEach(e -> reg.addMapping(e)));
+	}
+
+}
diff --git a/jsf/extensionless-mapping/src/main/webapp/WEB-INF/faces-config.xml b/jsf/extensionless-mapping/src/main/webapp/WEB-INF/faces-config.xml
new file mode 100644
index 00000000..0eae5f11
--- /dev/null
+++ b/jsf/extensionless-mapping/src/main/webapp/WEB-INF/faces-config.xml
@@ -0,0 +1,12 @@
+<faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_3.xsd"
+    version="2.3">
+
+    <application>
+        <system-event-listener>        
+            <system-event-listener-class>org.javaee8.cdi.dynamic.bean.MappingInit</system-event-listener-class>
+            <system-event-class>javax.faces.event.PostConstructApplicationEvent</system-event-class>
+        </system-event-listener>
+    </application>
+</faces-config>
\ No newline at end of file
diff --git a/jsf/extensionless-mapping/src/test/java/org/javaee8/cdi/dynamic/bean/ExtensionlessMappingTest.java b/jsf/extensionless-mapping/src/test/java/org/javaee8/cdi/dynamic/bean/ExtensionlessMappingTest.java
index b7d88288..c98f4e97 100644
--- a/jsf/extensionless-mapping/src/test/java/org/javaee8/cdi/dynamic/bean/ExtensionlessMappingTest.java
+++ b/jsf/extensionless-mapping/src/test/java/org/javaee8/cdi/dynamic/bean/ExtensionlessMappingTest.java
@@ -47,11 +47,12 @@ public void teardown() {
     public static WebArchive deploy() {
         WebArchive war = 
             create(WebArchive.class)
-                .addClasses(MappingInit.class, ApplicationInit.class)
+                .addClasses(MappingInit.class, ApplicationInit.class, MappingServletContextListener.class)
                 .addAsWebResource(new File("src/main/webapp/foo.xhtml"))
                 .addAsWebResource(new File("src/main/webapp/bar.xhtml"))
                 .addAsWebResource(new File("src/main/webapp/sub/bar.xhtml"), "/sub/bar.xhtml")
-                .addAsManifestResource("beans.xml");
+                .addAsWebInfResource("beans.xml")
+                .addAsWebInfResource(new File("src/main/webapp/WEB-INF/faces-config.xml"));
         
         System.out.println("War to be deployed contains: \n" + war.toString(true));
         
diff --git a/jsonb/mapping/src/main/java/org/javaee8/jsonb/mapping/controller/PersonController.java b/jsonb/mapping/src/main/java/org/javaee8/jsonb/mapping/controller/PersonController.java
index 16c5e349..c155dda3 100644
--- a/jsonb/mapping/src/main/java/org/javaee8/jsonb/mapping/controller/PersonController.java
+++ b/jsonb/mapping/src/main/java/org/javaee8/jsonb/mapping/controller/PersonController.java
@@ -3,9 +3,11 @@
 import org.javaee8.jsonb.mapping.domain.Person;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
 /**
  * 
  * @author Gaurav Gupta
@@ -20,6 +22,7 @@ public class PersonController {
      *
      */
     @GET
+    @Produces(MediaType.APPLICATION_JSON)
     public List<Person> getAllPeople() {
         Person person1 = new Person();
         person1.setName("Ondrej");
diff --git a/pom.xml b/pom.xml
index 37a691b8..a4d4f479 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
         <payara.micro.version>5.183</payara.micro.version>
         <glassfish.version>5.0</glassfish.version>
         <tomcat.version>9.0.12</tomcat.version>
+        <thorntail.version>2.3.0.Final</thorntail.version>
     </properties>
 
     <repositories>
@@ -323,11 +324,6 @@
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>3.0.2</version>
             </plugin>
-            <plugin>
-                <groupId>org.wildfly.plugins</groupId>
-                <artifactId>wildfly-maven-plugin</artifactId>
-                <version>1.0.2.Final</version>
-            </plugin>
         </plugins>
     </build>
 
@@ -843,6 +839,55 @@
             </build>
         </profile>
 
+        <!-- ### THORNTAIL ### -->
+
+        <profile>
+            <id>thorntail</id>
+
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>io.thorntail</groupId>
+                        <artifactId>bom</artifactId>
+                        <version>${thorntail.version}</version>
+                        <scope>import</scope>
+                        <type>pom</type>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+    
+            <dependencies>
+    
+                <!-- Java EE based client dependencies to contact a server via 
+                    WebSocket or REST -->
+                <dependency>
+                    <groupId>fish.payara.arquillian</groupId>
+                    <artifactId>payara-client-ee8</artifactId>
+                </dependency>
+    
+                <dependency>
+                    <groupId>io.thorntail</groupId>
+                    <artifactId>arquillian</artifactId>
+                    <scope>test</scope>
+                </dependency>
+    
+            </dependencies>
+    
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <!-- Uncomment to debug -->
+                                <!--<thorntail.debug.port>8000</thorntail.debug.port> -->
+                                <arquillian.xml>arquillian-thorntail.xml</arquillian.xml>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
 
 
         <!-- Activate this profile to download javadoc and sources jars.
diff --git a/security/dynamic-rememberme/src/test/java/org/javaee8/security/dynamic/rememberme/DynamicRemembermeTest.java b/security/dynamic-rememberme/src/test/java/org/javaee8/security/dynamic/rememberme/DynamicRemembermeTest.java
index 1a1354e5..6730258e 100644
--- a/security/dynamic-rememberme/src/test/java/org/javaee8/security/dynamic/rememberme/DynamicRemembermeTest.java
+++ b/security/dynamic-rememberme/src/test/java/org/javaee8/security/dynamic/rememberme/DynamicRemembermeTest.java
@@ -47,7 +47,8 @@ public static WebArchive createDeployment() {
                     Servlet.class
                 )
                 .addPackage(
-                    RememberMeAnnotationLiteral.class.getPackage());
+                    RememberMeAnnotationLiteral.class.getPackage())
+                .addAsWebInfResource("jboss-web.xml");
     }
 
     @Before
diff --git a/security/dynamic-rememberme/src/test/resources/jboss-web.xml b/security/dynamic-rememberme/src/test/resources/jboss-web.xml
new file mode 100644
index 00000000..4a9ba91f
--- /dev/null
+++ b/security/dynamic-rememberme/src/test/resources/jboss-web.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<jboss-web>
+    <!-- JASPIC activation for Wildfly. -->
+    <!-- See https://arjan-tijms.omnifaces.org/2015/08/activating-jaspic-in-jboss-wildfly.html -->
+    <security-domain>jaspitest</security-domain>
+</jboss-web>
\ No newline at end of file
diff --git a/security/jwt/src/test/java/org/javaee8/security/jwt/JwtTest.java b/security/jwt/src/test/java/org/javaee8/security/jwt/JwtTest.java
index 4d96ec11..4958a3fc 100644
--- a/security/jwt/src/test/java/org/javaee8/security/jwt/JwtTest.java
+++ b/security/jwt/src/test/java/org/javaee8/security/jwt/JwtTest.java
@@ -83,7 +83,8 @@ public static WebArchive createDeployment() {
                 .addPackage(JWTCredential.class.getPackage())
                 .addAsLibraries(jjwtFiles)
                 .setWebXML("web.xml")
-                .addAsWebInfResource("beans.xml");
+                .addAsWebInfResource("beans.xml")
+                .addAsWebInfResource("jboss-web.xml");
     }
 
     @Before
diff --git a/security/jwt/src/test/resources/jboss-web.xml b/security/jwt/src/test/resources/jboss-web.xml
new file mode 100644
index 00000000..4a9ba91f
--- /dev/null
+++ b/security/jwt/src/test/resources/jboss-web.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<jboss-web>
+    <!-- JASPIC activation for Wildfly. -->
+    <!-- See https://arjan-tijms.omnifaces.org/2015/08/activating-jaspic-in-jboss-wildfly.html -->
+    <security-domain>jaspitest</security-domain>
+</jboss-web>
\ No newline at end of file
diff --git a/security/pom.xml b/security/pom.xml
index 37c82f50..7e7613c9 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -13,8 +13,8 @@
     <name>Java EE 8 Samples: Security</name>
 
     <modules>
-        	<module>dynamic-rememberme</module>
-                <module>jwt</module>
+            <module>dynamic-rememberme</module>
+            <module>jwt</module>
     </modules>
 
     <dependencies>
diff --git a/servlet/http2/pom.xml b/servlet/http2/pom.xml
index c2a96b16..85a2acd9 100644
--- a/servlet/http2/pom.xml
+++ b/servlet/http2/pom.xml
@@ -53,8 +53,8 @@
                 <jdk>1.8</jdk>
             </activation>
             <properties>
-                <!-- default is the newest possible, supports 8u161 to 8u181 -->
-                <alpn.version>8.1.12.v20180117</alpn.version>
+                <!-- default is the newest possible, supports 8u161 to 8u191 -->
+                <alpn.version>8.1.13.v20181017</alpn.version>
                 <bootclasspathPrefix>
                     ${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn.version}/alpn-boot-${alpn.version}.jar
                 </bootclasspathPrefix>
diff --git a/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java b/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java
index a1bd5513..7c7dc907 100644
--- a/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java
+++ b/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java
@@ -38,9 +38,10 @@ public class Http2Test {
 
     @Deployment
     public static WebArchive createDeployment() {
-        final WebArchive war = create(WebArchive.class).addPackages(true, "org.javaee8.servlet.http2")
+        final WebArchive war = create(WebArchive.class).addClasses(Servlet.class)
                 .addAsWebResource(new File("src/main/webapp/images/payara-logo.jpg"), "images/payara-logo.jpg")
-                .addAsWebInfResource(new File("src/main/webapp/WEB-INF/web.xml"));
+                .addAsWebInfResource(new File("src/main/webapp/WEB-INF/web.xml"))
+                .addAsResource("project-defaults.yml"); // only for Thormtail;
         System.out.println("War file content: \n" + war.toString(true));
         return war;
     }
diff --git a/servlet/http2/src/test/resources/project-defaults.yml b/servlet/http2/src/test/resources/project-defaults.yml
new file mode 100644
index 00000000..c6bc400f
--- /dev/null
+++ b/servlet/http2/src/test/resources/project-defaults.yml
@@ -0,0 +1,8 @@
+thorntail:
+  undertow:
+    servers:
+      default-server:
+        http-listeners:
+          default:
+            # in Thorntail, HTTP/2 is by default only enabled for the HTTPS listener
+            enable-http2: true
diff --git a/servlet/mapping/src/main/java/org/javaee8/servlet/mapping/Servlet.java b/servlet/mapping/src/main/java/org/javaee8/servlet/mapping/Servlet.java
index 944ef909..6eee3789 100644
--- a/servlet/mapping/src/main/java/org/javaee8/servlet/mapping/Servlet.java
+++ b/servlet/mapping/src/main/java/org/javaee8/servlet/mapping/Servlet.java
@@ -28,11 +28,13 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
                 .append("Mapping match:")
                 .append(mapping.getMappingMatch().name())
                 .append("\n")
-                .append("Match value:")
+                .append("Match value:'")
                 .append(mapping.getMatchValue())
+                .append("'")
                 .append("\n")
-                .append("Pattern:")
-                .append(mapping.getPattern());
+                .append("Pattern:'")
+                .append(mapping.getPattern())
+                .append("'");
     }
  
 }
diff --git a/servlet/mapping/src/test/java/org/javaee8/servlet/mapping/ServletMappingTest.java b/servlet/mapping/src/test/java/org/javaee8/servlet/mapping/ServletMappingTest.java
index dec26309..923971fa 100644
--- a/servlet/mapping/src/test/java/org/javaee8/servlet/mapping/ServletMappingTest.java
+++ b/servlet/mapping/src/test/java/org/javaee8/servlet/mapping/ServletMappingTest.java
@@ -59,8 +59,8 @@ public void testPath() throws IOException {
         System.out.println("\nContent for `"+ base + "path/foo" + "` :\n" + content + "\n");
         
         assertTrue(content.contains("Mapping match:" + MappingMatch.PATH.name()));
-        assertTrue(content.contains("Match value:foo"));
-        assertTrue(content.contains("Pattern:/path/*"));
+        assertTrue(content.contains("Match value:'foo'"));
+        assertTrue(content.contains("Pattern:'/path/*'"));
     }
 
     @Test
@@ -74,8 +74,8 @@ public void testExtension() throws IOException {
         System.out.println("\nContent for `"+ base + "foo.ext" + "` :\n" + content + "\n");
         
         assertTrue(content.contains("Mapping match:" + MappingMatch.EXTENSION.name()));
-        assertTrue(content.contains("Match value:foo"));
-        assertTrue(content.contains("Pattern:*.ext"));
+        assertTrue(content.contains("Match value:'foo'"));
+        assertTrue(content.contains("Pattern:'*.ext'"));
     }
     
     @Test
@@ -89,8 +89,8 @@ public void testRoot() throws IOException {
         System.out.println("\nContent for `"+ base + "` :\n" + content + "\n");
         
         assertTrue(content.contains("Mapping match:" + MappingMatch.CONTEXT_ROOT.name()));
-        assertTrue(content.contains("Match value:"));
-        assertTrue(content.contains("Pattern:/"));
+        assertTrue(content.contains("Match value:''"));
+        assertTrue(content.contains("Pattern:''"));
     }
     
     @Test
@@ -104,8 +104,8 @@ public void testDefault() throws IOException {
         System.out.println("\nContent for `"+ base + "doesnotexist" + "` :\n" + content + "\n");
         
         assertTrue(content.contains("Mapping match:" + MappingMatch.DEFAULT.name()));
-        assertTrue(content.contains("Match value:doesnotexist"));
-        assertTrue(content.contains("Pattern:/"));
+        assertTrue(content.contains("Match value:''"));
+        assertTrue(content.contains("Pattern:'/'"));
     }
     
     @Test
@@ -119,8 +119,8 @@ public void testExact() throws IOException {
         System.out.println("\nContent for `"+ base + "exact" + "` :\n" + content + "\n");
         
         assertTrue(content.contains("Mapping match:" + MappingMatch.EXACT.name()));
-        assertTrue(content.contains("Match value:exact"));
-        assertTrue(content.contains("Pattern:/exact"));
+        assertTrue(content.contains("Match value:'exact'"));
+        assertTrue(content.contains("Pattern:'/exact'"));
     }
     
 
diff --git a/test-utils/src/main/resources/arquillian-thorntail.xml b/test-utils/src/main/resources/arquillian-thorntail.xml
new file mode 100644
index 00000000..a55b0b32
--- /dev/null
+++ b/test-utils/src/main/resources/arquillian-thorntail.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jboss.org/schema/arquillian" xsi:schemaLocation="http://jboss.org/schema/arquillian
+    http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+    <!--
+      - must be in a separate file because in-container tests need to use Swarm's DaemonProtocol,
+      - but arquillian.xml sets the default protocol to "Servlet 3.0" and there's no way to override that
+      - (see https://issues.jboss.org/browse/ARQ-579)
+      -->
+    <container qualifier="thorntail" default="true">
+        <configuration>
+            <property name="host">localhost</property>
+            <property name="port">${thorntail.arquillian.daemon.port:12345}</property>
+        </configuration>
+    </container>
+
+</arquillian>

From de406c4bdd9891532ddc0c5951b5a7187ad5eccb Mon Sep 17 00:00:00 2001
From: arjantijms <arjan.tijms@gmail.com>
Date: Mon, 25 Feb 2019 09:39:21 +0100
Subject: [PATCH 25/30] Remote EJB sample of EE 8.

---
 ejb/pom.xml                                   | 32 +++++++
 ejb/remote/pom.xml                            | 20 +++++
 ejb/remote/roles-allowed/pom.xml              | 51 ++++++++++++
 .../org/javaee8/ejb/remote/remote/Bean.java   | 20 +++++
 .../javaee8/ejb/remote/remote/BeanRemote.java |  9 ++
 .../javaee8/ejb/remote/RemoteBeanTest.java    | 83 +++++++++++++++++++
 .../src/test/resources/addUsersPayara.txt     |  1 +
 .../src/test/resources/password.txt           |  1 +
 ejb/remote/vendor/README.md                   | 12 +++
 ejb/remote/vendor/payara-rest/README.md       |  9 ++
 ejb/remote/vendor/payara-rest/pom.xml         | 25 ++++++
 .../org/javaee8/PayaraEJBContextProvider.java | 42 ++++++++++
 .../org.javaee8.RemoteEJBContextProvider      |  1 +
 ejb/remote/vendor/pom.xml                     | 37 +++++++++
 .../org/javaee8/RemoteEJBContextFactory.java  | 23 +++++
 .../org/javaee8/RemoteEJBContextProvider.java |  9 ++
 16 files changed, 375 insertions(+)
 create mode 100644 ejb/pom.xml
 create mode 100644 ejb/remote/pom.xml
 create mode 100644 ejb/remote/roles-allowed/pom.xml
 create mode 100644 ejb/remote/roles-allowed/src/main/java/org/javaee8/ejb/remote/remote/Bean.java
 create mode 100644 ejb/remote/roles-allowed/src/main/java/org/javaee8/ejb/remote/remote/BeanRemote.java
 create mode 100644 ejb/remote/roles-allowed/src/test/java/org/javaee8/ejb/remote/RemoteBeanTest.java
 create mode 100644 ejb/remote/roles-allowed/src/test/resources/addUsersPayara.txt
 create mode 100644 ejb/remote/roles-allowed/src/test/resources/password.txt
 create mode 100644 ejb/remote/vendor/README.md
 create mode 100644 ejb/remote/vendor/payara-rest/README.md
 create mode 100644 ejb/remote/vendor/payara-rest/pom.xml
 create mode 100644 ejb/remote/vendor/payara-rest/src/main/java/org/javaee8/PayaraEJBContextProvider.java
 create mode 100644 ejb/remote/vendor/payara-rest/src/main/resources/META-INF/services/org.javaee8.RemoteEJBContextProvider
 create mode 100644 ejb/remote/vendor/pom.xml
 create mode 100644 test-utils/src/main/java/org/javaee8/RemoteEJBContextFactory.java
 create mode 100644 test-utils/src/main/java/org/javaee8/RemoteEJBContextProvider.java

diff --git a/ejb/pom.xml b/ejb/pom.xml
new file mode 100644
index 00000000..b947caaf
--- /dev/null
+++ b/ejb/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.javaee8</groupId>
+        <artifactId>samples-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>ejb</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Java EE 8 Sample: ejb</name>
+
+    <modules>
+        <module>remote</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.javaee8</groupId>
+            <artifactId>test-utils</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>fish.payara.ejb.rest</groupId>
+            <artifactId>ejb-rest-client</artifactId>
+            <version>5.191-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/ejb/remote/pom.xml b/ejb/remote/pom.xml
new file mode 100644
index 00000000..99efa34a
--- /dev/null
+++ b/ejb/remote/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.javaee8</groupId>
+        <artifactId>ejb</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>ejb-remote</artifactId>
+    <packaging>pom</packaging>
+    
+    <name>Java EE 8 Sample: ejb - remote</name>
+
+    <modules>
+        <module>vendor</module>
+        <module>roles-allowed</module>
+    </modules>
+
+</project>
diff --git a/ejb/remote/roles-allowed/pom.xml b/ejb/remote/roles-allowed/pom.xml
new file mode 100644
index 00000000..5d3fb4ec
--- /dev/null
+++ b/ejb/remote/roles-allowed/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.javaee8</groupId>
+        <artifactId>ejb-remote</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>ejb-remote-roles-allowed</artifactId>
+    <packaging>war</packaging>
+    
+    <name>Java EE 8 Sample: ejb - remote - Roles Allowed</name>
+
+    <profiles>
+        <profile>
+            <id>payara-ci-managed</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.javaee8.ejb.remote.vendor</groupId>
+                    <artifactId>ejb.remote.vendor.payara-rest</artifactId>
+                    <version>1.0-SNAPSHOT</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>payara-remote</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.javaee8.ejb.remote.vendor</groupId>
+                    <artifactId>ejb.remote.vendor.payara-rest</artifactId>
+                    <version>1.0-SNAPSHOT</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>glassfish-remote</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.javaee8.ejb.remote.vendor</groupId>
+                    <artifactId>ejb.remote.vendor.payara-rest</artifactId>
+                    <version>1.0-SNAPSHOT</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+   
+    
+</project>
diff --git a/ejb/remote/roles-allowed/src/main/java/org/javaee8/ejb/remote/remote/Bean.java b/ejb/remote/roles-allowed/src/main/java/org/javaee8/ejb/remote/remote/Bean.java
new file mode 100644
index 00000000..1434ae12
--- /dev/null
+++ b/ejb/remote/roles-allowed/src/main/java/org/javaee8/ejb/remote/remote/Bean.java
@@ -0,0 +1,20 @@
+/** Copyright Payara Services Limited **/
+package org.javaee8.ejb.remote.remote;
+
+import java.io.Serializable;
+
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Stateless;
+
+@Stateless
+public class Bean implements BeanRemote, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    @RolesAllowed("g1")
+    public String method() {
+        return "method";
+    }
+
+}
diff --git a/ejb/remote/roles-allowed/src/main/java/org/javaee8/ejb/remote/remote/BeanRemote.java b/ejb/remote/roles-allowed/src/main/java/org/javaee8/ejb/remote/remote/BeanRemote.java
new file mode 100644
index 00000000..674fd766
--- /dev/null
+++ b/ejb/remote/roles-allowed/src/main/java/org/javaee8/ejb/remote/remote/BeanRemote.java
@@ -0,0 +1,9 @@
+/** Copyright Payara Services Limited **/
+package org.javaee8.ejb.remote.remote;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface BeanRemote {
+    String method();
+}
diff --git a/ejb/remote/roles-allowed/src/test/java/org/javaee8/ejb/remote/RemoteBeanTest.java b/ejb/remote/roles-allowed/src/test/java/org/javaee8/ejb/remote/RemoteBeanTest.java
new file mode 100644
index 00000000..349f0220
--- /dev/null
+++ b/ejb/remote/roles-allowed/src/test/java/org/javaee8/ejb/remote/RemoteBeanTest.java
@@ -0,0 +1,83 @@
+/** Copyright Payara Services Limited **/
+package org.javaee8.ejb.remote;
+
+import static org.javaee8.ServerOperations.addUsersToContainerIdentityStore;
+import static org.jboss.shrinkwrap.api.asset.EmptyAsset.INSTANCE;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeTrue;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+import org.javaee8.RemoteEJBContextFactory;
+import org.javaee8.RemoteEJBContextProvider;
+import org.javaee8.ejb.remote.remote.Bean;
+import org.javaee8.ejb.remote.remote.BeanRemote;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * This class demonstrates and tests how to request an EJB bean from a remote server.
+ *
+ * <p>
+ * {@link RemoteEJBContextProvider} is used, which is a test artifact abstracting the different
+ * ways this is done for different servers.
+ *
+ * @author Arjan Tijms
+ *
+ */
+@RunWith(Arquillian.class)
+public class RemoteBeanTest {
+
+    private RemoteEJBContextProvider remoteEJBContextProvider;
+
+    @Deployment
+    public static Archive<?> deployment() {
+
+        // Add user u1 with password p1 and group g1 to the container's native identity store
+        addUsersToContainerIdentityStore();
+
+        return ShrinkWrap.create(JavaArchive.class)
+                .addClasses(Bean.class, BeanRemote.class)
+                .addAsManifestResource(INSTANCE, "beans.xml");
+    }
+
+    @Before
+    public void before() {
+        remoteEJBContextProvider = RemoteEJBContextFactory.getProvider();
+        assumeTrue(
+            "No RemoteEJBContextProvider available in current profile",
+            remoteEJBContextProvider != null);
+    }
+
+    @After
+    public void after() {
+        remoteEJBContextProvider.releaseContext();
+    }
+
+    @Test
+    @RunAsClient
+    public void callProtectedRemoteBean() throws NamingException {
+        
+        try {
+
+        // Obtain the JNDI naming context in a vendor specific way.
+        Context ejbRemoteContext = remoteEJBContextProvider.getContextWithCredentialsSet("u1", "p1");
+
+        BeanRemote beanRemote = (BeanRemote) ejbRemoteContext.lookup("java:global/test/Bean");
+
+        assertEquals("method", beanRemote.method());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/ejb/remote/roles-allowed/src/test/resources/addUsersPayara.txt b/ejb/remote/roles-allowed/src/test/resources/addUsersPayara.txt
new file mode 100644
index 00000000..037cdbd6
--- /dev/null
+++ b/ejb/remote/roles-allowed/src/test/resources/addUsersPayara.txt
@@ -0,0 +1 @@
+create-file-user --groups g1 --passwordfile ${project.build.directory}/test-classes/password.txt u1
\ No newline at end of file
diff --git a/ejb/remote/roles-allowed/src/test/resources/password.txt b/ejb/remote/roles-allowed/src/test/resources/password.txt
new file mode 100644
index 00000000..c00bb4ca
--- /dev/null
+++ b/ejb/remote/roles-allowed/src/test/resources/password.txt
@@ -0,0 +1 @@
+AS_ADMIN_USERPASSWORD=p1
diff --git a/ejb/remote/vendor/README.md b/ejb/remote/vendor/README.md
new file mode 100644
index 00000000..7295bd08
--- /dev/null
+++ b/ejb/remote/vendor/README.md
@@ -0,0 +1,12 @@
+# Java EE 8 Samples: EJB - Remote - Vendor #
+
+This module contains vendor specific implementations to obtain the JNDI context from where remote EJB beans can be requested
+from with a username/password credential.
+
+## Implementations ##
+
+ - payara-glassfish - An implementation that works for both Payara and GlassFish 
+
+
+
+
diff --git a/ejb/remote/vendor/payara-rest/README.md b/ejb/remote/vendor/payara-rest/README.md
new file mode 100644
index 00000000..b1a3a57b
--- /dev/null
+++ b/ejb/remote/vendor/payara-rest/README.md
@@ -0,0 +1,9 @@
+# Java EE 7 Samples: EJB - Remote - Vendor - Payara and GlassFish #
+
+This modules contains a class that returns a JNDI context suitable for remote lookups against the default URL
+for a remote Payara or GlassFish server (localhost). It sets the provided credentials
+in a Payara/GlassFish specific way and puts the required client jar on the classpath.
+
+
+
+
diff --git a/ejb/remote/vendor/payara-rest/pom.xml b/ejb/remote/vendor/payara-rest/pom.xml
new file mode 100644
index 00000000..0a0febcb
--- /dev/null
+++ b/ejb/remote/vendor/payara-rest/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Copyright Payara Services Limited -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.javaee8</groupId>
+        <artifactId>ejb-remote-vendor</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.javaee8.ejb.remote.vendor</groupId>
+    <artifactId>ejb.remote.vendor.payara-rest</artifactId>
+    
+    <name>Java EE 8 Sample: ejb - remote - vendor - Payara REST Remote EJB Provider</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.javaee8</groupId>
+            <artifactId>test-utils</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/ejb/remote/vendor/payara-rest/src/main/java/org/javaee8/PayaraEJBContextProvider.java b/ejb/remote/vendor/payara-rest/src/main/java/org/javaee8/PayaraEJBContextProvider.java
new file mode 100644
index 00000000..a1414863
--- /dev/null
+++ b/ejb/remote/vendor/payara-rest/src/main/java/org/javaee8/PayaraEJBContextProvider.java
@@ -0,0 +1,42 @@
+/** Copyright Payara Services Limited **/
+package org.javaee8;
+
+import static javax.naming.Context.INITIAL_CONTEXT_FACTORY;
+import static javax.naming.Context.PROVIDER_URL;
+import static javax.naming.Context.SECURITY_CREDENTIALS;
+import static javax.naming.Context.SECURITY_PRINCIPAL;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * This class returns a JNDI context suitable for remote lookups against the default URL
+ * for a remote Payara or GlassFish server (localhost). It sets the provided credentials
+ * in a Payara/GlassFish specific way.
+ *
+ * @author Arjan Tijms
+ *
+ */
+public class PayaraEJBContextProvider implements RemoteEJBContextProvider {
+    public Context getContextWithCredentialsSet(String username, String password) {
+        Hashtable<String, String> environment = new Hashtable<String, String>();
+        environment.put(INITIAL_CONTEXT_FACTORY, "fish.payara.ejb.rest.client.RemoteEJBContextFactory");
+        environment.put(PROVIDER_URL, "http://localhost:8080/ejb-invoker");
+        environment.put(SECURITY_PRINCIPAL, "u1");
+        environment.put(SECURITY_CREDENTIALS, "p1");
+        
+        try {
+            return new InitialContext(environment);
+        } catch (NamingException e) {
+            throw new IllegalStateException(e);
+        }
+        
+    }
+
+    public void releaseContext() {
+    }
+
+}
diff --git a/ejb/remote/vendor/payara-rest/src/main/resources/META-INF/services/org.javaee8.RemoteEJBContextProvider b/ejb/remote/vendor/payara-rest/src/main/resources/META-INF/services/org.javaee8.RemoteEJBContextProvider
new file mode 100644
index 00000000..039b7cb9
--- /dev/null
+++ b/ejb/remote/vendor/payara-rest/src/main/resources/META-INF/services/org.javaee8.RemoteEJBContextProvider
@@ -0,0 +1 @@
+org.javaee8.PayaraEJBContextProvider
\ No newline at end of file
diff --git a/ejb/remote/vendor/pom.xml b/ejb/remote/vendor/pom.xml
new file mode 100644
index 00000000..05f59217
--- /dev/null
+++ b/ejb/remote/vendor/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Copyright Payara Services Limited -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
+    
+    <groupId>org.javaee8</groupId>
+    <artifactId>ejb-remote-vendor</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    
+    <name>Java EE 8 Sample: ejb - remote - vendor</name>
+
+    <profiles>
+        <profile>
+            <id>payara-ci-managed</id>
+            <modules>
+                <module>payara-rest</module>
+            </modules>
+        </profile>
+        
+        <profile>
+            <id>payara-remote</id>
+            <modules>
+                <module>payara-rest</module>
+            </modules>
+        </profile>
+        
+        <profile>
+            <id>glassfish-remote</id>
+            <modules>
+                <module>payara-rest</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/test-utils/src/main/java/org/javaee8/RemoteEJBContextFactory.java b/test-utils/src/main/java/org/javaee8/RemoteEJBContextFactory.java
new file mode 100644
index 00000000..5ba2db36
--- /dev/null
+++ b/test-utils/src/main/java/org/javaee8/RemoteEJBContextFactory.java
@@ -0,0 +1,23 @@
+/** Copyright Payara Services Limited **/
+package org.javaee8;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+public class RemoteEJBContextFactory {
+
+    public static RemoteEJBContextProvider getProvider() {
+
+        ServiceLoader<RemoteEJBContextProvider> loader = ServiceLoader.load(RemoteEJBContextProvider.class);
+
+        Iterator<RemoteEJBContextProvider> providers = loader.iterator();
+
+        if (!providers.hasNext()) {
+            return null;
+        }
+
+        return providers.next();
+
+    }
+
+}
diff --git a/test-utils/src/main/java/org/javaee8/RemoteEJBContextProvider.java b/test-utils/src/main/java/org/javaee8/RemoteEJBContextProvider.java
new file mode 100644
index 00000000..efcadded
--- /dev/null
+++ b/test-utils/src/main/java/org/javaee8/RemoteEJBContextProvider.java
@@ -0,0 +1,9 @@
+/** Copyright Payara Services Limited **/
+package org.javaee8;
+
+import javax.naming.Context;
+
+public interface RemoteEJBContextProvider {
+    Context getContextWithCredentialsSet(String username, String password);
+    void releaseContext();
+}

From 5543b2c4ec2e1f66a830b1e1341449373f3bd72c Mon Sep 17 00:00:00 2001
From: arjantijms <arjan.tijms@gmail.com>
Date: Mon, 25 Feb 2019 13:15:23 +0100
Subject: [PATCH 26/30] Remove catch for EE 8 EJB test

---
 .../test/java/org/javaee8/ejb/remote/RemoteBeanTest.java    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ejb/remote/roles-allowed/src/test/java/org/javaee8/ejb/remote/RemoteBeanTest.java b/ejb/remote/roles-allowed/src/test/java/org/javaee8/ejb/remote/RemoteBeanTest.java
index 349f0220..cf6bee83 100644
--- a/ejb/remote/roles-allowed/src/test/java/org/javaee8/ejb/remote/RemoteBeanTest.java
+++ b/ejb/remote/roles-allowed/src/test/java/org/javaee8/ejb/remote/RemoteBeanTest.java
@@ -66,18 +66,12 @@ public void after() {
     @Test
     @RunAsClient
     public void callProtectedRemoteBean() throws NamingException {
-        
-        try {
-
         // Obtain the JNDI naming context in a vendor specific way.
         Context ejbRemoteContext = remoteEJBContextProvider.getContextWithCredentialsSet("u1", "p1");
 
         BeanRemote beanRemote = (BeanRemote) ejbRemoteContext.lookup("java:global/test/Bean");
 
         assertEquals("method", beanRemote.method());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }
 
 }
\ No newline at end of file

From c208ea19c6669558a0b88ca043703e0d0bfe4517 Mon Sep 17 00:00:00 2001
From: Gaurav Gupta <gaurav.gupta.jc@gmail.com>
Date: Thu, 28 Feb 2019 13:59:27 +0530
Subject: [PATCH 27/30] QA-188 Upgrade Java EE 8 Samples dependencies

---
 pom.xml | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index a4d4f479..1c2aa1f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,13 +167,13 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
-            <version>1.3</version>
+            <version>2.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>1.3</version>
+            <version>2.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -212,7 +212,7 @@
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.28</version>
+            <version>2.33</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -224,7 +224,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20170516</version>
+            <version>20180813</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -233,6 +233,16 @@
             <version>1.7.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>2.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.2</version>
+        </dependency>
     </dependencies>
 
 
@@ -250,7 +260,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>3.8.0</version>
                 <configuration>
                     <source>${java.min.version}</source>
                     <target>${java.min.version}</target>
@@ -259,7 +269,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.20.1</version>
+                <version>3.0.0-M3</version>
                 <configuration>
                     <aggregate>true</aggregate>
                     <linkXRef>true</linkXRef>
@@ -268,19 +278,19 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.20.1</version>
+                <version>3.0.0-M3</version>
                 <dependencies>
                     <dependency>
                         <groupId>javax.annotation</groupId>
                         <artifactId>javax.annotation-api</artifactId>
-                        <version>1.3.1</version>
+                        <version>1.3.2</version>
                     </dependency>
                 </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.2.2</version>
                 <configuration>
                     <attachClasses>true</attachClasses>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
@@ -289,7 +299,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M1</version>
+                <version>3.0.0-M2</version>
                 <configuration>
                     <rules>
                         <requireMavenVersion>
@@ -317,12 +327,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.1.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.1.0</version>
             </plugin>
         </plugins>
     </build>

From b348ed653b154a873b45850d55066ae3440e3d3c Mon Sep 17 00:00:00 2001
From: Juan Gonzalez <juagonza@redhat.com>
Date: Thu, 28 Feb 2019 11:12:35 +0100
Subject: [PATCH 28/30] Fix servlet/http2 when using latest Oracle JDK versions

---
 servlet/http2/pom.xml | 81 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/servlet/http2/pom.xml b/servlet/http2/pom.xml
index 85a2acd9..81d15c2e 100644
--- a/servlet/http2/pom.xml
+++ b/servlet/http2/pom.xml
@@ -329,6 +329,87 @@
                 <alpn.version>8.1.11.v20170118</alpn.version>
             </properties>
         </profile>
+        <profile>
+            <id>alpn-when-jdk8_161</id>
+            <activation>
+                <jdk>1.8.0_161</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.12.v20180117</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_162</id>
+            <activation>
+                <jdk>1.8.0_162</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.12.v20180117</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_171</id>
+            <activation>
+                <jdk>1.8.0_171</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.12.v20180117</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_172</id>
+            <activation>
+                <jdk>1.8.0_172</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.12.v20180117</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_181</id>
+            <activation>
+                <jdk>1.8.0_181</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.12.v20180117</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_191</id>
+            <activation>
+                <jdk>1.8.0_191</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.13.v20181017</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_192</id>
+            <activation>
+                <jdk>1.8.0_192</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.13.v20181017</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_201</id>
+            <activation>
+                <jdk>1.8.0_201</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.13.v20181017</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_202</id>
+            <activation>
+                <jdk>1.8.0_202</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.13.v20181017</alpn.version>
+            </properties>
+        </profile>
     </profiles>
 
 </project>

From edd3ca2455204c0410ba96420cbb31600c9b6f06 Mon Sep 17 00:00:00 2001
From: arjantijms <arjan.tijms@gmail.com>
Date: Thu, 14 Mar 2019 15:26:10 +0000
Subject: [PATCH 29/30] Updated client coordinates for remote EJB test

---
 ejb/pom.xml                           | 5 -----
 ejb/remote/vendor/payara-rest/pom.xml | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ejb/pom.xml b/ejb/pom.xml
index b947caaf..ce90c570 100644
--- a/ejb/pom.xml
+++ b/ejb/pom.xml
@@ -23,10 +23,5 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>fish.payara.ejb.rest</groupId>
-            <artifactId>ejb-rest-client</artifactId>
-            <version>5.191-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/ejb/remote/vendor/payara-rest/pom.xml b/ejb/remote/vendor/payara-rest/pom.xml
index 0a0febcb..e29fc862 100644
--- a/ejb/remote/vendor/payara-rest/pom.xml
+++ b/ejb/remote/vendor/payara-rest/pom.xml
@@ -21,5 +21,10 @@
             <artifactId>test-utils</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>fish.payara.extras</groupId>
+            <artifactId>ejb-http-client</artifactId>
+            <version>5.191</version>
+        </dependency>
     </dependencies>
 </project>

From 99e9e7b0f69898ac3f7bb74939db62e36428804d Mon Sep 17 00:00:00 2001
From: Ladislav Thon <lthon@redhat.com>
Date: Wed, 6 May 2020 12:08:48 +0200
Subject: [PATCH 30/30] fix Jetty ALPN usage on newer OpenJDK releases

---
 servlet/http2/pom.xml | 99 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 96 insertions(+), 3 deletions(-)

diff --git a/servlet/http2/pom.xml b/servlet/http2/pom.xml
index 81d15c2e..cc57a2e2 100644
--- a/servlet/http2/pom.xml
+++ b/servlet/http2/pom.xml
@@ -14,7 +14,7 @@
     <name>Java EE 8 Samples: Servlet - http2</name>
 
     <properties>
-        <jetty-version>9.4.11.v20180605</jetty-version>
+        <jetty-version>9.4.28.v20200408</jetty-version>
     </properties>
 
     <dependencies>
@@ -46,6 +46,7 @@
     </dependencies>
 
     <!-- ALPN profiles are needed to ensure that the correct ALPN version is used -->
+    <!-- note that 8u251 and above have ALPN support built-in and the Jetty ALPN JAR should not be present -->
     <profiles>
         <profile>
             <id>alpn-when-jdk8</id>
@@ -53,18 +54,19 @@
                 <jdk>1.8</jdk>
             </activation>
             <properties>
-                <!-- default is the newest possible, supports 8u161 to 8u191 -->
+                <!-- default is the newest possible, supports 8u191 to 8u242 -->
                 <alpn.version>8.1.13.v20181017</alpn.version>
                 <bootclasspathPrefix>
                     ${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn.version}/alpn-boot-${alpn.version}.jar
                 </bootclasspathPrefix>
+                <surefireArgLine>-Xbootclasspath/p:${bootclasspathPrefix}</surefireArgLine>
             </properties>
             <build>
                 <plugins>
                     <plugin>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <argLine>-Xbootclasspath/p:${bootclasspathPrefix}</argLine>
+                            <argLine>${surefireArgLine}</argLine>
                         </configuration>
                         <dependencies>
                             <dependency>
@@ -410,6 +412,97 @@
                 <alpn.version>8.1.13.v20181017</alpn.version>
             </properties>
         </profile>
+        <profile>
+            <id>alpn-when-jdk8_211</id>
+            <activation>
+                <jdk>1.8.0_211</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.13.v20181017</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_212</id>
+            <activation>
+                <jdk>1.8.0_212</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.13.v20181017</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_221</id>
+            <activation>
+                <jdk>1.8.0_221</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.13.v20181017</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_222</id>
+            <activation>
+                <jdk>1.8.0_222</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.13.v20181017</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_231</id>
+            <activation>
+                <jdk>1.8.0_231</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.13.v20181017</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_232</id>
+            <activation>
+                <jdk>1.8.0_232</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.13.v20181017</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_241</id>
+            <activation>
+                <jdk>1.8.0_241</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.13.v20181017</alpn.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>alpn-when-jdk8_242</id>
+            <activation>
+                <jdk>1.8.0_242</jdk>
+            </activation>
+            <properties>
+                <alpn.version>8.1.13.v20181017</alpn.version>
+            </properties>
+        </profile>
+
+        <profile>
+           <id>alpn-when-jdk8_251</id>
+            <activation>
+                <jdk>1.8.0_251</jdk>
+            </activation>
+            <properties>
+                <surefireArgLine/>
+            </properties>
+        </profile>
+        <profile>
+           <id>alpn-when-jdk8_252</id>
+            <activation>
+                <jdk>1.8.0_252</jdk>
+            </activation>
+            <properties>
+                <surefireArgLine/>
+            </properties>
+        </profile>
     </profiles>
 
 </project>