From cb70d8904087fc1d8852179dc4afe949e849672e Mon Sep 17 00:00:00 2001
From: David Matejcek <dmatej@seznam.cz>
Date: Wed, 18 Nov 2020 12:24:46 +0100
Subject: [PATCH] Issue #2016 Possibility to run tests with different JSSE
 implementations

- default is none (uses JDK's impl)
- profile npn uses grizzly-npn-bootstrap
- profile openjsse uses openjsse
- versions can be overriden from command line (to compare results)

Signed-off-by: David Matejcek <dmatej@seznam.cz>
---
 modules/bundles/http/pom.xml |  3 +--
 modules/http2/pom.xml        | 44 +++++++++++++++++++++++++++++++-----
 pom.xml                      | 14 +++++++-----
 3 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/modules/bundles/http/pom.xml b/modules/bundles/http/pom.xml
index 50aefba1f8..2cfacf86df 100755
--- a/modules/bundles/http/pom.xml
+++ b/modules/bundles/http/pom.xml
@@ -52,14 +52,13 @@
         <dependency>
             <groupId>org.glassfish.grizzly</groupId>
             <artifactId>grizzly-npn-api</artifactId>
-            <version>${grizzly.alpn.version}</version>
+            <version>${grizzly.npn.api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.grizzly</groupId>
             <artifactId>grizzly-http-server-multipart</artifactId>
         </dependency>
     </dependencies>
-
     <build>
         <defaultGoal>install</defaultGoal>
         <plugins>
diff --git a/modules/http2/pom.xml b/modules/http2/pom.xml
index bba200786c..8282bfd511 100644
--- a/modules/http2/pom.xml
+++ b/modules/http2/pom.xml
@@ -30,6 +30,9 @@
     <artifactId>grizzly-http2</artifactId>
 
     <name>grizzly-http2</name>
+    <properties>
+        <bootClasspath></bootClasspath>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -39,7 +42,7 @@
         <dependency>
             <groupId>org.glassfish.grizzly</groupId>
             <artifactId>grizzly-http-server</artifactId>
-            <!-- These dependencies aren't needed in the client case. Only if the project is using the Http2Addon or the 
+            <!-- These dependencies aren't needed in the client case. Only if the project is using the Http2Addon or the
                 GlassFish integration code -->
             <scope>provided</scope>
             <optional>true</optional>
@@ -47,10 +50,9 @@
         <dependency>
             <groupId>org.glassfish.grizzly</groupId>
             <artifactId>grizzly-npn-api</artifactId>
-            <version>${grizzly.alpn.version}</version>
+            <version>${grizzly.npn.api.version}</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -107,9 +109,7 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>
-                        -XX:+HeapDumpOnOutOfMemoryError
-                    </argLine>
+                    <argLine>-XX:+HeapDumpOnOutOfMemoryError ${bootClasspath}</argLine>
                 </configuration>
             </plugin>
         </plugins>
@@ -126,4 +126,36 @@
             </plugin>
         </plugins>
     </reporting>
+
+    <profiles>
+        <!-- Compatibility tests with other implementations of ALPN. New JDK implementations have their own. -->
+        <profile>
+            <id>openjsse</id>
+            <properties>
+                <bootClasspath>-Xbootclasspath/p:${settings.localRepository}/org/openjsse/openjsse/${openjsse.version}/openjsse-${openjsse.version}.jar</bootClasspath>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.openjsse</groupId>
+                    <artifactId>openjsse</artifactId>
+                    <version>${openjsse.version}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>npn</id>
+            <properties>
+                <bootClasspath>-Xbootclasspath/p:${settings.localRepository}/org/glassfish/grizzly/grizzly-npn-bootstrap/${grizzly.npn.bootstrap.version}/grizzly-npn-bootstrap-${grizzly.npn.bootstrap.version}.jar</bootClasspath>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.glassfish.grizzly</groupId>
+                    <artifactId>grizzly-npn-api</artifactId>
+                    <version>${grizzly.npn.bootstrap.version}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index fbf415b6b1..6c856db042 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,8 +125,10 @@
         <felix-version>4.2.1</felix-version>
         <cobertura.version>2.4</cobertura.version>
         <gmbal.version>4.0.0</gmbal.version>
+        <grizzly.npn.api.version>1.9</grizzly.npn.api.version>
+        <grizzly.npn.bootstrap.version>1.9</grizzly.npn.bootstrap.version>
+        <openjsse.version>1.1.4</openjsse.version>
         <osgi.version>4.2.0</osgi.version>
-        <grizzly.alpn.version>1.9</grizzly.alpn.version>
         <release.arguments></release.arguments>
     </properties>
 
@@ -218,7 +220,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <!-- Restricts the Java version to 1.8 -->
             <plugin>
                 <inherited>true</inherited>
@@ -230,7 +232,7 @@
                     <compilerArgument>-Xlint:unchecked,deprecation,fallthrough,finally,cast,dep-ann,empty,overrides</compilerArgument>
                 </configuration>
             </plugin>
-            
+
             <plugin><inherited>true</inherited>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -246,7 +248,7 @@
                     </archive>
                 </configuration>
             </plugin>
-            
+
             <plugin><inherited>true</inherited>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -259,7 +261,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <!-- Configure the jar with the javadoc -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -271,7 +273,7 @@
                     <doctitle>${project.name} ${project.version}</doctitle>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.glassfish.copyright</groupId>
                 <artifactId>glassfish-copyright-maven-plugin</artifactId>