From 2a0b89bc068ceb6ce93330ee0f822f5afadabdb8 Mon Sep 17 00:00:00 2001
From: Matthew Gill <matthew.gill@live.co.uk>
Date: Tue, 7 Jul 2020 11:59:28 +0100
Subject: [PATCH 1/2] FISH-31 Upgrade Grizzly to 2.4.4.payara-p3

Now supports JDK9 ALPN APIs.

Signed-off-by: Matthew Gill <matthew.gill@live.co.uk>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 27a28ac1e03..a095901376b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@
         <!-- BOM-referenced versions -->
         <jakartaee.api.version>8.0.0</jakartaee.api.version>
         <servlet-api.version>4.0.2</servlet-api.version>
-        <grizzly.version>2.4.4.payara-p2</grizzly.version>
+        <grizzly.version>2.4.4.payara-p3</grizzly.version>
         <jax-rs-api.impl.version>2.1.6</jax-rs-api.impl.version>
         <jersey.version>2.30.payara-p2</jersey.version>
         <jakarta.validation.version>2.0.2</jakarta.validation.version>

From 6d6ef6e5e0b4c7f8f2e44266a36db445319fdfdf Mon Sep 17 00:00:00 2001
From: Matthew Gill <matthew.gill@live.co.uk>
Date: Tue, 7 Jul 2020 15:09:13 +0100
Subject: [PATCH 2/2] FISH-31 Upgrade Grizzly NPN Jar

This is to prevent runtime issues with the Grizzly HTTP/2 module which
has dependencies in the client JAR.

Signed-off-by: Matthew Gill <matthew.gill@live.co.uk>
---
 nucleus/packager/nucleus-grizzly/pom.xml | 4 ++--
 nucleus/pom.xml                          | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nucleus/packager/nucleus-grizzly/pom.xml b/nucleus/packager/nucleus-grizzly/pom.xml
index ebfa2b4cbfd..8251b25f095 100644
--- a/nucleus/packager/nucleus-grizzly/pom.xml
+++ b/nucleus/packager/nucleus-grizzly/pom.xml
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.glassfish.grizzly</groupId>
             <artifactId>grizzly-npn-osgi</artifactId>
-            <version>${grizzly.npn.version}</version>
+            <version>${grizzly.npn.osgi.version}</version>
         </dependency>
     </dependencies>
 
@@ -92,7 +92,7 @@
                                 <artifactItem>
                                     <groupId>org.glassfish.grizzly</groupId>
                                     <artifactId>grizzly-npn-api</artifactId>
-                                    <version>1.9</version>
+				    <version>${grizzly.npn.version}</version>
                                     <destFileName>grizzly-npn-api.jar</destFileName>
                                 </artifactItem>
                                 <!-- Default NPN Bootstrap Jar for old domain.xml files -->
diff --git a/nucleus/pom.xml b/nucleus/pom.xml
index dba129d7a94..78640d8f3d4 100644
--- a/nucleus/pom.xml
+++ b/nucleus/pom.xml
@@ -121,7 +121,8 @@
 
         <!-- Servlet -->
         <!-- Requires JDK8u161 or above-->
-        <grizzly.npn.version>1.8</grizzly.npn.version>
+        <grizzly.npn.version>1.9.payara-p1</grizzly.npn.version>
+        <grizzly.npn.osgi.version>1.9</grizzly.npn.osgi.version>
 
         <!-- Microprofile -->
         <!-- JAX-RS -->