diff --git a/boms/bom/pom.xml b/boms/bom/pom.xml
index a1566df96d..3dcd0373c7 100644
--- a/boms/bom/pom.xml
+++ b/boms/bom/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.8</version>
         <relativePath />
     </parent>
 
     <groupId>org.glassfish.grizzly</groupId>
     <artifactId>grizzly-bom</artifactId>
-    <version>4.0.0.payara-p2-SNAPSHOT</version>
+    <version>4.0.2.payara-p1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>grizzly-bom</name>
@@ -172,14 +172,12 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0-M4</version>
+                    <version>3.1.2</version>
                 </plugin>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.6.0</version>
                     <configuration>
                         <additionalOptions>
                             <additionalOption>-Xdoclint:none</additionalOption>
@@ -187,22 +185,24 @@
                     </configuration>
                 </plugin>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
+                    <!-- 
+                        Can not use 3.3.0, which triggers:
+                        
+                        Presumably you have configured maven-source-plugn to execute twice times in your build. You have to configure a classifier for at least on of them.
+                        
+                    -->
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.0.1</version>
+                    <version>3.2.1</version>
                 </plugin>
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.4.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M3</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>
diff --git a/extras/bundles/grizzly-httpservice-bundle/pom.xml b/extras/bundles/grizzly-httpservice-bundle/pom.xml
index 83acb05139..efccb36330 100644
--- a/extras/bundles/grizzly-httpservice-bundle/pom.xml
+++ b/extras/bundles/grizzly-httpservice-bundle/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
@@ -71,9 +71,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.3.1</version>
                 <configuration>
                     <filesets>
                         <!-- Make sure we remove the fake source directory. -->
@@ -83,6 +82,34 @@
                     </filesets>
                 </configuration>
             </plugin>
+            
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>src-dependencies</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <!-- use copy-dependencies instead if you don't want to explode the sources -->
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>sources</classifier>
+                            <excludeScope>provided</excludeScope>
+                            <excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
+                            <excludes>module-info.java</excludes>
+                            <!-- fudge an actual source hierarchy so that the source
+                                 plugin can actually do something useful.  Otherwise,
+                                 you'll end up with an empty source jar -->
+                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
@@ -91,6 +118,7 @@
                     </excludes>
                 </configuration>
             </plugin>
+            
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -129,17 +157,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <sourcepath>
-                        ${basedir}/../../grizzly-httpservice/src/main/java;
-                        ${basedir}/../../../modules/bundles/http-servlet/src/main/java;
-                    </sourcepath>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                </configuration>
-            </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -150,6 +168,7 @@
                     </execution>
                 </executions>
             </plugin>
+            
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.8</version>
@@ -167,33 +186,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.1.2</version>
-                <executions>
-                    <execution>
-                        <id>src-dependencies</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <!-- use copy-dependencies instead if you don't want to explode the sources -->
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>sources</classifier>
-                            <excludeScope>provided</excludeScope>
-                            <excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
-                            <excludes>module-info.java</excludes>
-                            <!-- fudge an actual source hierarchy so that the source
-                                 plugin can actually do something useful.  Otherwise,
-                                 you'll end up with an empty source jar -->
-                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+            
         </plugins>
     </build>
 </project>
diff --git a/extras/bundles/pom.xml b/extras/bundles/pom.xml
index 91a9b35c77..6053a46fa9 100644
--- a/extras/bundles/pom.xml
+++ b/extras/bundles/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/extras/connection-pool/pom.xml b/extras/connection-pool/pom.xml
index ebd01097ac..08e895b410 100644
--- a/extras/connection-pool/pom.xml
+++ b/extras/connection-pool/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/extras/grizzly-httpservice/pom.xml b/extras/grizzly-httpservice/pom.xml
index ce138f6ea1..b0c2f021b7 100644
--- a/extras/grizzly-httpservice/pom.xml
+++ b/extras/grizzly-httpservice/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -137,9 +137,8 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <id>unpack_osgi_compendium_sources</id>
diff --git a/extras/http-server-jaxws/pom.xml b/extras/http-server-jaxws/pom.xml
index 8a134fb89d..0a451c8fc7 100644
--- a/extras/http-server-jaxws/pom.xml
+++ b/extras/http-server-jaxws/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -41,24 +41,24 @@
         <dependency>
             <groupId>com.sun.xml.ws</groupId>
             <artifactId>jaxws-rt</artifactId>
-            <version>3.0.2</version>
+            <version>4.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.ws</groupId>
             <artifactId>jakarta.xml.ws-api</artifactId>
-            <version>3.0.1</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-osgi</artifactId>
-            <version>3.0.2</version>
+            <version>4.0.3</version>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.glassfish.metro</groupId>
             <artifactId>webservices-osgi</artifactId>
-            <version>3.0.2</version>
+            <version>4.0.2</version>
             <type>jar</type>
         </dependency>
     </dependencies>
@@ -69,9 +69,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkMode>always</forkMode>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
diff --git a/extras/http-server-multipart/pom.xml b/extras/http-server-multipart/pom.xml
index bb201f4cc5..2947ebc191 100644
--- a/extras/http-server-multipart/pom.xml
+++ b/extras/http-server-multipart/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -53,7 +53,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/extras/http-servlet-extras/pom.xml b/extras/http-servlet-extras/pom.xml
index bc1d8f5b3c..9b9880afd6 100644
--- a/extras/http-servlet-extras/pom.xml
+++ b/extras/http-servlet-extras/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -57,7 +57,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/extras/pom.xml b/extras/pom.xml
index 199c54fc81..c788ada0aa 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/extras/tls-sni/pom.xml b/extras/tls-sni/pom.xml
index df7612e0c8..f3f567b680 100644
--- a/extras/tls-sni/pom.xml
+++ b/extras/tls-sni/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/extras/tls-sni/src/main/java/org/glassfish/grizzly/sni/SNIConfig.java b/extras/tls-sni/src/main/java/org/glassfish/grizzly/sni/SNIConfig.java
index cb45b021ef..a8ac9babb5 100644
--- a/extras/tls-sni/src/main/java/org/glassfish/grizzly/sni/SNIConfig.java
+++ b/extras/tls-sni/src/main/java/org/glassfish/grizzly/sni/SNIConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -99,16 +99,6 @@ public SSLEngineConfigurator copy() {
             return new NullSSLEngineConfigurator();
         }
 
-        @Override
-        public SSLEngineConfigurator setProtocolConfigured(boolean isProtocolConfigured) {
-            throw new IllegalStateException("Immutable config");
-        }
-
-        @Override
-        public SSLEngineConfigurator setCipherConfigured(boolean isCipherConfigured) {
-            throw new IllegalStateException("Immutable config");
-        }
-
         @Override
         public SSLEngineConfigurator setEnabledProtocols(String[] enabledProtocols) {
             throw new IllegalStateException("Immutable config");
diff --git a/extras/tls-sni/src/main/java/org/glassfish/grizzly/sni/SNIFilter.java b/extras/tls-sni/src/main/java/org/glassfish/grizzly/sni/SNIFilter.java
index cf1346c650..88649ead03 100644
--- a/extras/tls-sni/src/main/java/org/glassfish/grizzly/sni/SNIFilter.java
+++ b/extras/tls-sni/src/main/java/org/glassfish/grizzly/sni/SNIFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -38,7 +38,6 @@
 import org.glassfish.grizzly.ssl.SSLEngineConfigurator;
 import org.glassfish.grizzly.ssl.SSLFilter;
 import org.glassfish.grizzly.utils.Charsets;
-import org.glassfish.grizzly.utils.JdkVersion;
 
 /**
  * TLS Server Name Indication (SNI) {@link Filter} implementation. This filter supports SNI extension on both client and
@@ -57,7 +56,6 @@
  */
 public class SNIFilter extends SSLFilter {
     private static final Logger LOGGER = Grizzly.logger(SNIFilter.class);
-    private static final boolean JDK7_OR_HIGHER = JdkVersion.getJdkVersion().compareTo(JdkVersion.parseVersion("1.7")) >= 0;
 
     private static final byte HANDSHAKE_TYPE = 0x16;
     private static final int MIN_TLS_VERSION = 0x0301;
@@ -125,10 +123,6 @@ public SNIClientConfigResolver getClientSSLConfigResolver() {
      * @param resolver
      */
     public void setClientSSLConfigResolver(final SNIClientConfigResolver resolver) {
-        if (!JDK7_OR_HIGHER) {
-            LOGGER.warning("Client side SNI support requires JDK 1.7+");
-        }
-
         this.clientResolver = resolver;
     }
 
@@ -141,10 +135,6 @@ protected SSLTransportFilterWrapper createOptimizedTransportFilter(final Transpo
 
     @Override
     public NextAction handleConnect(final FilterChainContext ctx) throws IOException {
-        if (!JDK7_OR_HIGHER) {
-            return super.handleConnect(ctx);
-        }
-
         // new client-side connection
         final Connection c = ctx.getConnection();
 
diff --git a/extras/tls-sni/src/test/java/org/glassfish/grizzly/sni/SNITest.java b/extras/tls-sni/src/test/java/org/glassfish/grizzly/sni/SNITest.java
index 2f647d4420..46b9ec7a54 100644
--- a/extras/tls-sni/src/test/java/org/glassfish/grizzly/sni/SNITest.java
+++ b/extras/tls-sni/src/test/java/org/glassfish/grizzly/sni/SNITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -34,7 +34,6 @@
 import org.glassfish.grizzly.ssl.SSLContextConfigurator;
 import org.glassfish.grizzly.ssl.SSLEngineConfigurator;
 import org.glassfish.grizzly.utils.Futures;
-import org.glassfish.grizzly.utils.JdkVersion;
 import org.glassfish.grizzly.utils.StringFilter;
 import org.junit.Test;
 
@@ -48,9 +47,7 @@
 @SuppressWarnings("unchecked")
 public class SNITest {
     public static final int PORT = 19283;
-    private static final boolean JDK7_OR_HIGHER = JdkVersion.getJdkVersion()
-            .compareTo(JdkVersion.parseVersion("1.7")) >= 0;
-    
+
     @Test
     public void testClientServerSNI() throws Exception {
         final String sniHostValue = "sni-test.com";
@@ -58,11 +55,7 @@ public void testClientServerSNI() throws Exception {
         
         final Attribute<String> sniHostAttr =
                 Grizzly.DEFAULT_ATTRIBUTE_BUILDER.createAttribute("sni-host-attr");
-        
-        if (!JDK7_OR_HIGHER) {
-            return;
-        }
-        
+
         final SSLEngineConfigurator sslServerEngineConfig = 
                     new SSLEngineConfigurator(
                             createSSLContextConfigurator().createSSLContext(),
diff --git a/modules/bundles/comet/pom.xml b/modules/bundles/comet/pom.xml
index 4cb79a630d..4d7c3a2646 100644
--- a/modules/bundles/comet/pom.xml
+++ b/modules/bundles/comet/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
@@ -47,6 +47,53 @@
     <build>
         <defaultGoal>install</defaultGoal>
         <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <filesets>
+                        <!-- Make sure we remove the fake source directory. -->
+                        <fileset>
+                            <directory>src</directory>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>src-dependencies</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <!-- use copy-dependencies instead if you don't want to explode the sources -->
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>sources</classifier>
+                            
+                            <!-- 
+
+                                As this is a bundle we are excluding 
+                                module-info.java files when unpacking the 
+                                project dependencies.
+                                 
+                                -->
+                            <excludes>module-info.java</excludes>
+                            <excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
+                            <!-- fudge an actual source hierarchy so that the source
+                                 plugin can actually do something useful.  Otherwise,
+                                 you'll end up with an empty source jar -->
+                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -73,17 +120,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <sourcepath>
-                        ${basedir}/../http/src/main/java;
-                        ${basedir}/../../comet/src/main/java;
-                    </sourcepath>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                </configuration>
-            </plugin>
+           
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -94,19 +131,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <filesets>
-                        <!-- Make sure we remove the fake source directory. -->
-                        <fileset>
-                            <directory>src</directory>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
+          
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.8</version>
@@ -124,31 +149,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.1.2</version>
-                <executions>
-                    <execution>
-                        <id>src-dependencies</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <!-- use copy-dependencies instead if you don't want to explode the sources -->
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>sources</classifier>
-                            <excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
-                            <!-- fudge an actual source hierarchy so that the source
-                                 plugin can actually do something useful.  Otherwise,
-                                 you'll end up with an empty source jar -->
-                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+            
         </plugins>
     </build>
 </project>
diff --git a/modules/bundles/core/pom.xml b/modules/bundles/core/pom.xml
index 631030834f..bcdb0ad409 100644
--- a/modules/bundles/core/pom.xml
+++ b/modules/bundles/core/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
@@ -47,6 +47,52 @@
     <build>
         <defaultGoal>install</defaultGoal>
         <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <filesets>
+                        <!-- Make sure we remove the fake source directory. -->
+                        <fileset>
+                            <directory>src</directory>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>src-dependencies</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <!-- use copy-dependencies instead if you don't want to explode the sources -->
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>sources</classifier>
+                            <!-- 
+
+                                As this is a bundle we are excluding 
+                                module-info.java files when unpacking the 
+                                project dependencies.
+                                 
+                                -->
+                            <excludes>module-info.java</excludes>
+                            <excludeArtifactIds>junit,hamcrest-core</excludeArtifactIds>
+                            <!-- fudge an actual source hierarchy so that the source
+                                 plugin can actually do something useful.  Otherwise,
+                                 you'll end up with an empty source jar -->
+                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -73,17 +119,15 @@
                     </execution>
                 </executions>
             </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
-                    <sourcepath>
-                        ${basedir}/../../grizzly/src/main/java;
-                        ${basedir}/../../portunif/src/main/java;
-                    </sourcepath>
                     <additionalparam>-Xdoclint:none</additionalparam>
                 </configuration>
             </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -94,19 +138,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <filesets>
-                        <!-- Make sure we remove the fake source directory. -->
-                        <fileset>
-                            <directory>src</directory>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
+            
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.8</version>
@@ -124,31 +156,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.1.2</version>
-                <executions>
-                    <execution>
-                        <id>src-dependencies</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <!-- use copy-dependencies instead if you don't want to explode the sources -->
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>sources</classifier>
-                            <excludeArtifactIds>junit,hamcrest-core</excludeArtifactIds>
-                            <!-- fudge an actual source hierarchy so that the source
-                                 plugin can actually do something useful.  Otherwise,
-                                 you'll end up with an empty source jar -->
-                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+            
         </plugins>
     </build>
 </project>
diff --git a/modules/bundles/http-all/pom.xml b/modules/bundles/http-all/pom.xml
index 9ef97f1957..193ea916b0 100644
--- a/modules/bundles/http-all/pom.xml
+++ b/modules/bundles/http-all/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
@@ -59,6 +59,45 @@
     <build>
         <defaultGoal>install</defaultGoal>
         <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <filesets>
+                        <!-- Make sure we remove the fake source directory. -->
+                        <fileset>
+                            <directory>src</directory>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>src-dependencies</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <!-- use copy-dependencies instead if you don't want to explode the sources -->
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>sources</classifier>
+                            <excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
+                            <excludes>module-info.java</excludes>
+                            <!-- fudge an actual source hierarchy so that the source
+                                 plugin can actually do something useful.  Otherwise,
+                                 you'll end up with an empty source jar -->
+                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -86,19 +125,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <sourcepath>
-                        ${basedir}/../http/src/main/java;
-                        ${basedir}/../../comet/src/main/java;
-                        ${basedir}/../../websockets/src/main/java;
-                        ${basedir}/../../servlet/src/main/java;
-                    </sourcepath>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                </configuration>
-            </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -109,19 +136,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <filesets>
-                        <!-- Make sure we remove the fake source directory. -->
-                        <fileset>
-                            <directory>src</directory>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
+            
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.8</version>
@@ -139,32 +154,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.1.2</version>
-                <executions>
-                    <execution>
-                        <id>src-dependencies</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <!-- use copy-dependencies instead if you don't want to explode the sources -->
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>sources</classifier>
-                            <excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
-                            <excludes>module-info.java</excludes>
-                            <!-- fudge an actual source hierarchy so that the source
-                                 plugin can actually do something useful.  Otherwise,
-                                 you'll end up with an empty source jar -->
-                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+           
         </plugins>
     </build>
 </project>
diff --git a/modules/bundles/http-servlet/pom.xml b/modules/bundles/http-servlet/pom.xml
index d8a470601e..98f053bd63 100755
--- a/modules/bundles/http-servlet/pom.xml
+++ b/modules/bundles/http-servlet/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
@@ -51,6 +51,45 @@
     <build>
         <defaultGoal>install</defaultGoal>
         <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <filesets>
+                        <!-- Make sure we remove the fake source directory. -->
+                        <fileset>
+                            <directory>src</directory>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            
+             <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>src-dependencies</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <!-- use copy-dependencies instead if you don't want to explode the sources -->
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>sources</classifier>
+                            <excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
+                            <excludes>module-info.java</excludes>
+                            <!-- fudge an actual source hierarchy so that the source
+                                 plugin can actually do something useful.  Otherwise,
+                                 you'll end up with an empty source jar -->
+                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -78,18 +117,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <sourcepath>
-                        ${basedir}/../http/src/main/java;
-                        ${basedir}/../../http-servlet/src/main/java;
-                        ${basedir}/../../../extras/http-servlet-extras/src/main/java;
-                    </sourcepath>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                </configuration>
-            </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -100,19 +128,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <filesets>
-                        <!-- Make sure we remove the fake source directory. -->
-                        <fileset>
-                            <directory>src</directory>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
+            
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.8</version>
@@ -130,32 +146,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.1.2</version>
-                <executions>
-                    <execution>
-                        <id>src-dependencies</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <!-- use copy-dependencies instead if you don't want to explode the sources -->
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>sources</classifier>
-                            <excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
-                            <excludes>module-info.java</excludes>
-                            <!-- fudge an actual source hierarchy so that the source
-                                 plugin can actually do something useful.  Otherwise,
-                                 you'll end up with an empty source jar -->
-                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+           
         </plugins>
     </build>
 </project>
diff --git a/modules/bundles/http/pom.xml b/modules/bundles/http/pom.xml
index e9e6e87f14..7a9943a682 100755
--- a/modules/bundles/http/pom.xml
+++ b/modules/bundles/http/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
@@ -64,6 +64,52 @@
     <build>
         <defaultGoal>install</defaultGoal>
         <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <filesets>
+                        <!-- Make sure we remove the fake source directory. -->
+                        <fileset>
+                            <directory>src</directory>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>src-dependencies</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <!-- use copy-dependencies instead if you don't want to explode the sources -->
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>sources</classifier>
+                            <!-- 
+
+                                As this is a bundle we are excluding 
+                                module-info.java files when unpacking the 
+                                project dependencies.
+                                 
+                                -->
+                            <excludes>module-info.java</excludes>
+                            <excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
+                            <!-- fudge an actual source hierarchy so that the source
+                                 plugin can actually do something useful.  Otherwise,
+                                 you'll end up with an empty source jar -->
+                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -91,21 +137,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <sourcepath>
-                        ${basedir}/../core/src/main/java;
-                        ${basedir}/../../http/src/main/java;
-                        ${basedir}/../../http-server/src/main/java;
-                        ${basedir}/../../http2/src/main/java;
-                        ${basedir}/../../http-ajp/src/main/java;
-                        ${basedir}/../../../extras/http-server-multipart/src/main/java;
-                    </sourcepath>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                </configuration>
-            </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -116,19 +148,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <filesets>
-                        <!-- Make sure we remove the fake source directory. -->
-                        <fileset>
-                            <directory>src</directory>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
+            
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.8</version>
@@ -146,31 +166,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.1.2</version>
-                <executions>
-                    <execution>
-                        <id>src-dependencies</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <!-- use copy-dependencies instead if you don't want to explode the sources -->
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>sources</classifier>
-                            <excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
-                            <!-- fudge an actual source hierarchy so that the source
-                                 plugin can actually do something useful.  Otherwise,
-                                 you'll end up with an empty source jar -->
-                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/modules/bundles/pom.xml b/modules/bundles/pom.xml
index 67d7142589..07eb18a092 100644
--- a/modules/bundles/pom.xml
+++ b/modules/bundles/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/bundles/websockets/pom.xml b/modules/bundles/websockets/pom.xml
index 593ca31321..4db264f856 100644
--- a/modules/bundles/websockets/pom.xml
+++ b/modules/bundles/websockets/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
@@ -57,6 +57,45 @@
     <build>
         <defaultGoal>install</defaultGoal>
         <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <filesets>
+                        <!-- Make sure we remove the fake source directory. -->
+                        <fileset>
+                            <directory>src</directory>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>src-dependencies</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <!-- use copy-dependencies instead if you don't want to explode the sources -->
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>sources</classifier>
+                            <excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
+                            <excludes>module-info.java</excludes>
+                            <!-- fudge an actual source hierarchy so that the source
+                                 plugin can actually do something useful.  Otherwise,
+                                 you'll end up with an empty source jar -->
+                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -83,17 +122,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <sourcepath>
-                        ${basedir}/../http/src/main/java;
-                        ${basedir}/../../websockets/src/main/java;
-                    </sourcepath>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                </configuration>
-            </plugin>
+           
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -104,19 +133,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <filesets>
-                        <!-- Make sure we remove the fake source directory. -->
-                        <fileset>
-                            <directory>src</directory>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
+            
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.8</version>
@@ -134,32 +151,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.1.2</version>
-                <executions>
-                    <execution>
-                        <id>src-dependencies</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <!-- use copy-dependencies instead if you don't want to explode the sources -->
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>sources</classifier>
-                            <excludeArtifactIds>junit, hamcrest-core</excludeArtifactIds>
-                            <excludes>module-info.java</excludes>
-                            <!-- fudge an actual source hierarchy so that the source
-                                 plugin can actually do something useful.  Otherwise,
-                                 you'll end up with an empty source jar -->
-                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+            
         </plugins>
     </build>
 </project>
diff --git a/modules/comet/pom.xml b/modules/comet/pom.xml
index d04246569f..8e172387db 100644
--- a/modules/comet/pom.xml
+++ b/modules/comet/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -91,7 +91,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <useModulePath>false</useModulePath>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
 <!--
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/NullaryFunction.java b/modules/comet/src/main/java/module-info.java
similarity index 54%
rename from modules/grizzly/src/main/java/org/glassfish/grizzly/utils/NullaryFunction.java
rename to modules/comet/src/main/java/module-info.java
index 0179e87c0e..8a74bd64b9 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/NullaryFunction.java
+++ b/modules/comet/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,22 +14,16 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.grizzly.utils;
+module org.glassfish.grizzly.comet {
 
-/**
- * General initializer interface.
- *
- * It might be useful abstraction, which helps to create and initialize certain values lazily.
- *
- * @see org.glassfish.grizzly.attributes.Attribute
- * @see org.glassfish.grizzly.attributes.AttributeHolder
- * @see org.glassfish.grizzly.utils.Holder
- *
- * @author Ken Cavanaugh
- */
-public interface NullaryFunction<T> {
-    /**
-     * Initializes and returns the value.
-     */
-    T evaluate();
+    exports org.glassfish.grizzly.comet;
+    
+    opens org.glassfish.grizzly.comet;
+    
+    requires static jakarta.servlet;
+    requires java.logging;
+    requires static java.management;
+    requires org.glassfish.grizzly;
+    requires org.glassfish.grizzly.http.server;
+    requires org.glassfish.grizzly.http;
 }
diff --git a/modules/grizzly/pom.xml b/modules/grizzly/pom.xml
index e4fd749881..49a0aa84b9 100644
--- a/modules/grizzly/pom.xml
+++ b/modules/grizzly/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -57,7 +57,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
@@ -90,6 +90,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>add-source</id>
diff --git a/modules/grizzly/src/main/java/module-info.java b/modules/grizzly/src/main/java/module-info.java
new file mode 100644
index 0000000000..843f5fb541
--- /dev/null
+++ b/modules/grizzly/src/main/java/module-info.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018 Payara Services Ltd.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+module org.glassfish.grizzly {
+    
+    exports org.glassfish.grizzly;
+    exports org.glassfish.grizzly.asyncqueue;
+    exports org.glassfish.grizzly.attributes;
+    exports org.glassfish.grizzly.compression.lzma;
+    exports org.glassfish.grizzly.compression.lzma.impl;
+    exports org.glassfish.grizzly.compression.lzma.impl.lz;
+    exports org.glassfish.grizzly.compression.lzma.impl.rangecoder;
+    exports org.glassfish.grizzly.compression.zip;
+    exports org.glassfish.grizzly.filterchain;
+    exports org.glassfish.grizzly.impl;
+    exports org.glassfish.grizzly.jmxbase;
+    exports org.glassfish.grizzly.localization;
+    exports org.glassfish.grizzly.memory;
+    exports org.glassfish.grizzly.monitoring;
+    exports org.glassfish.grizzly.nio;
+    exports org.glassfish.grizzly.nio.tmpselectors;
+    exports org.glassfish.grizzly.nio.transport;
+    exports org.glassfish.grizzly.ssl;
+    exports org.glassfish.grizzly.strategies;
+    exports org.glassfish.grizzly.streams;
+    exports org.glassfish.grizzly.threadpool;
+    exports org.glassfish.grizzly.utils;
+    exports org.glassfish.grizzly.utils.conditions;
+    
+    opens org.glassfish.grizzly;
+    opens org.glassfish.grizzly.asyncqueue;
+    opens org.glassfish.grizzly.attributes;
+    opens org.glassfish.grizzly.compression.lzma;
+    opens org.glassfish.grizzly.compression.lzma.impl;
+    opens org.glassfish.grizzly.compression.lzma.impl.lz;
+    opens org.glassfish.grizzly.compression.lzma.impl.rangecoder;
+    opens org.glassfish.grizzly.compression.zip;
+    opens org.glassfish.grizzly.filterchain;
+    opens org.glassfish.grizzly.impl;
+    opens org.glassfish.grizzly.jmxbase;
+    opens org.glassfish.grizzly.localization;
+    opens org.glassfish.grizzly.memory;
+    opens org.glassfish.grizzly.monitoring;
+    opens org.glassfish.grizzly.nio;
+    opens org.glassfish.grizzly.nio.tmpselectors;
+    opens org.glassfish.grizzly.nio.transport;
+    opens org.glassfish.grizzly.ssl;
+    opens org.glassfish.grizzly.strategies;
+    opens org.glassfish.grizzly.streams;
+    opens org.glassfish.grizzly.threadpool;
+    opens org.glassfish.grizzly.utils;
+    opens org.glassfish.grizzly.utils.conditions;
+    
+    requires java.logging;
+}
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/Connection.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/Connection.java
index fb8a9ce7fa..ee537db008 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/Connection.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/Connection.java
@@ -21,11 +21,11 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
+import java.util.function.Supplier;
 import org.glassfish.grizzly.attributes.AttributeStorage;
 import org.glassfish.grizzly.memory.MemoryManager;
 import org.glassfish.grizzly.monitoring.MonitoringAware;
 import org.glassfish.grizzly.monitoring.MonitoringConfig;
-import org.glassfish.grizzly.utils.NullaryFunction;
 
 /**
  * Common interface, which represents any kind of connection.
@@ -152,7 +152,7 @@ public interface Connection<L> extends Readable<L>, Writeable<L>, Closeable, Att
      *
      * @return the {@link Processor} state associated with this <tt>Connection</tt>.
      */
-    <E> E obtainProcessorState(Processor processor, NullaryFunction<E> factory);
+    <E> E obtainProcessorState(Processor processor, Supplier<E> factory);
 
     /**
      * Executes the {@link Runnable} in the thread, responsible for running the given type of event on this
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/Attribute.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/Attribute.java
index 6576c1c13d..147c134b03 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/Attribute.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/Attribute.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.grizzly.attributes;
 
-import org.glassfish.grizzly.utils.NullaryFunction;
+import java.util.function.Supplier;
 
 /**
  * Class used to define dynamic typed attributes on {@link AttributeHolder} instances. Storing attribute values in
@@ -38,7 +38,7 @@ public final class Attribute<T> {
     /**
      * Attribute initializer, which will be called, if attribute is not set.
      */
-    private final NullaryFunction<T> initializer;
+    private final Supplier<T> initializer;
     /**
      * Attribute index in AttributeBuilder
      */
@@ -50,16 +50,16 @@ public String toString() {
     }
 
     protected Attribute(final AttributeBuilder builder, final String name, final int index, final T defaultValue) {
-        this(builder, name, index, new NullaryFunction<T>() {
+        this(builder, name, index, new Supplier<T>() {
 
             @Override
-            public T evaluate() {
+            public T get() {
                 return defaultValue;
             }
         });
     }
 
-    protected Attribute(final AttributeBuilder builder, final String name, final int index, final NullaryFunction<T> initializer) {
+    protected Attribute(final AttributeBuilder builder, final String name, final int index, final Supplier<T> initializer) {
         this.builder = builder;
         this.name = name;
         this.attributeIndex = index;
@@ -68,7 +68,7 @@ protected Attribute(final AttributeBuilder builder, final String name, final int
 
     /**
      * Get attribute value, stored on the {@link AttributeHolder}, the difference from
-     * {@link #get(org.glassfish.grizzly.attributes.AttributeHolder)} is that default value or {@link NullaryFunction} won't
+     * {@link #get(org.glassfish.grizzly.attributes.AttributeHolder)} is that default value or {@link Supplier} won't
      * be invoked.
      *
      * @param attributeHolder {@link AttributeHolder}.
@@ -80,7 +80,7 @@ public T peek(final AttributeHolder attributeHolder) {
 
     /**
      * Get attribute value, stored on the {@link AttributeStorage}, the difference from {@link #get(AttributeStorage)} is
-     * that default value or {@link NullaryFunction} won't be invoked.
+     * that default value or {@link Supplier} won't be invoked.
      *
      * @param storage {@link AttributeStorage}.
      * @return attribute value
@@ -212,7 +212,7 @@ public int index() {
     }
 
     @SuppressWarnings("unchecked")
-    private T get0(final AttributeHolder attributeHolder, final NullaryFunction<T> initializer) {
+    private T get0(final AttributeHolder attributeHolder, final Supplier<T> initializer) {
         final IndexedAttributeAccessor indexedAccessor = attributeHolder.getIndexedAttributeAccessor();
 
         return indexedAccessor != null ? (T) indexedAccessor.getAttribute(attributeIndex, initializer) : (T) attributeHolder.getAttribute(name, initializer);
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/AttributeBuilder.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/AttributeBuilder.java
index 6d187925a3..4583679ff7 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/AttributeBuilder.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/AttributeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,6 +16,8 @@
 
 package org.glassfish.grizzly.attributes;
 
+import java.util.function.Supplier;
+
 /**
  * <tt>AttributeBuilder</tt> is responsible for creating and indexing {@link Attribute}s. For faster access to
  * {@link Attribute} value, each {@link Attribute} has assigned index. <tt>AttributeBuilder</tt> is responsible to
@@ -61,29 +63,17 @@ public interface AttributeBuilder {
      */
     <T> Attribute<T> createAttribute(String name, T defaultValue);
 
-    /**
-     * Create Attribute with name and initializer, which will be called, if Attribute's value is null on a AttributedObject
-     *
-     * @param <T> Type of attribute value
-     * @param name attribute name
-     * @param initializer NullaryFunction, which will be called, if Attribute's value is null on a AttributedObject
-     *
-     * @return Attribute<T>
-     */
-    <T> Attribute<T> createAttribute(String name, org.glassfish.grizzly.utils.NullaryFunction<T> initializer);
 
     /**
      * Create Attribute with name and initializer, which will be called, if Attribute's value is null on a AttributedObject
      *
      * @param <T> Type of attribute value
      * @param name attribute name
-     * @param initializer NullaryFunction, which will be called, if Attribute's value is null on a AttributedObject
+     * @param initializer {@link Supplier}, which will be called, if Attribute's value is null on a AttributedObject
      *
      * @return Attribute<T>
-     * @deprecated pls. use {@link #createAttribute(java.lang.String, org.glassfish.grizzly.utils.NullaryFunction)}.
      */
-    @Deprecated
-    <T> Attribute<T> createAttribute(String name, NullaryFunction<T> initializer);
+    <T> Attribute<T> createAttribute(String name, Supplier<T> initializer);
 
     /**
      * Creates and returns new thread-safe {@link AttributeHolder}
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/AttributeHolder.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/AttributeHolder.java
index 251eaebe62..fdc4949c04 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/AttributeHolder.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/AttributeHolder.java
@@ -18,7 +18,7 @@
 
 import java.util.Set;
 
-import org.glassfish.grizzly.utils.NullaryFunction;
+import java.util.function.Supplier;
 
 /**
  * Interface declares common functionality for objects, which have associated {@link Attribute}s.
@@ -62,7 +62,7 @@ public interface AttributeHolder {
      *
      * @since 2.3.18
      */
-    Object getAttribute(String name, NullaryFunction initializer);
+    Object getAttribute(String name, Supplier initializer);
 
     /**
      * Return a {@link Set} of attribute names.
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/DefaultAttributeBuilder.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/DefaultAttributeBuilder.java
index 6e9844afb1..87cdc9abcb 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/DefaultAttributeBuilder.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/DefaultAttributeBuilder.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.glassfish.grizzly.utils.NullaryFunction;
+import java.util.function.Supplier;
 
 /**
  * Default {@link AttributeBuilder} implementation.
@@ -63,7 +63,7 @@ public synchronized <T> Attribute<T> createAttribute(final String name, final T
      */
     @Override
     @SuppressWarnings("unchecked")
-    public synchronized <T> Attribute<T> createAttribute(final String name, final NullaryFunction<T> initializer) {
+    public synchronized <T> Attribute<T> createAttribute(final String name, final Supplier<T> initializer) {
         Attribute<T> attribute = name2Attribute.get(name);
         if (attribute == null) {
             attribute = new Attribute<>(this, name, attributes.size(), initializer);
@@ -74,17 +74,6 @@ public synchronized <T> Attribute<T> createAttribute(final String name, final Nu
         return attribute;
     }
 
-    @Override
-    public <T> Attribute<T> createAttribute(final String name, final org.glassfish.grizzly.attributes.NullaryFunction<T> initializer) {
-        return createAttribute(name, initializer == null ? null : new NullaryFunction<T>() {
-
-            @Override
-            public T evaluate() {
-                return initializer.evaluate();
-            }
-        });
-    }
-
     @Override
     public AttributeHolder createSafeAttributeHolder() {
         return new IndexedAttributeHolder(this);
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/IndexedAttributeAccessor.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/IndexedAttributeAccessor.java
index 8fb043d799..2580ab7cb0 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/IndexedAttributeAccessor.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/IndexedAttributeAccessor.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.grizzly.attributes;
 
-import org.glassfish.grizzly.utils.NullaryFunction;
+import java.util.function.Supplier;
 
 /**
  * The interface declares, that {@link AttributeHolder} supports indexed {@link Attribute} access.
@@ -38,11 +38,11 @@ public interface IndexedAttributeAccessor {
      * index is not set, set it to the default value, using the <tt>initializer</tt>, and return the default.
      * 
      * @param index the attribute index
-     * @param initializer the default value {@link NullaryFunction}
+     * @param initializer the default value {@link Supplier}
      * @return the value of the attribute by index
      * @since 2.3.18
      */
-    Object getAttribute(int index, NullaryFunction initializer);
+    Object getAttribute(int index, Supplier initializer);
 
     /**
      * Internal method for dynamic attribute support. Set the attribute with the index to value.
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/IndexedAttributeHolder.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/IndexedAttributeHolder.java
index 9f0b840bd5..77096caecf 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/IndexedAttributeHolder.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/IndexedAttributeHolder.java
@@ -21,7 +21,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.glassfish.grizzly.utils.NullaryFunction;
+import java.util.function.Supplier;
 
 /**
  * {@link AttributeHolder}, which supports indexed access to stored {@link Attribute}s. Access to such indexed
@@ -69,7 +69,7 @@ public Object getAttribute(final String name) {
      * {@inheritDoc}
      */
     @Override
-    public Object getAttribute(final String name, final NullaryFunction initializer) {
+    public Object getAttribute(final String name, final Supplier initializer) {
         final Attribute attribute = attributeBuilder.getAttributeByName(name);
         if (attribute != null) {
             return indexedAttributeAccessor.getAttribute(attribute.index(), initializer);
@@ -293,17 +293,17 @@ public Object getAttribute(final int index) {
          * {@inheritDoc}
          */
         @Override
-        public Object getAttribute(final int index, final NullaryFunction initializer) {
+        public Object getAttribute(final int index, final Supplier initializer) {
             Object value = weakGet(index);
 
             if (value == null && initializer != null) {
                 synchronized (sync) {
-                    // we want to make sure that parallel getAttribute(int, NullaryFunction)
-                    // won't create multiple value instances (everyone will call NullaryFunction.evaluate())
+                    // we want to make sure that parallel getAttribute(int, Suppler)
+                    // won't create multiple value instances (everyone will call Supplier.get())
                     value = weakGet(index);
 
                     if (value == null) {
-                        value = initializer.evaluate();
+                        value = initializer.get();
                         setAttribute(index, value);
                     }
                 }
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/UnsafeAttributeHolder.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/UnsafeAttributeHolder.java
index 9a9db75a8c..0fe2fe726c 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/UnsafeAttributeHolder.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/UnsafeAttributeHolder.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.glassfish.grizzly.utils.NullaryFunction;
+import java.util.function.Supplier;
 
 /**
  * A non thread-safe {@link AttributeHolder} implementation.
@@ -57,7 +57,7 @@ public Object getAttribute(final String name) {
     }
 
     @Override
-    public Object getAttribute(final String name, final NullaryFunction initializer) {
+    public Object getAttribute(final String name, final Supplier initializer) {
 
         if (!isSet && initializer == null) {
             return null;
@@ -68,7 +68,7 @@ public Object getAttribute(final String name, final NullaryFunction initializer)
             return indexedAttributeAccessor.getAttribute(attribute, initializer);
         }
 
-        return initializer != null ? initializer.evaluate() : null;
+        return initializer != null ? initializer.get() : null;
     }
 
     @Override
@@ -238,7 +238,7 @@ public Object getAttribute(final int index) {
         }
 
         @Override
-        public Object getAttribute(final int index, final NullaryFunction initializer) {
+        public Object getAttribute(final int index, final Supplier initializer) {
             if (!isSet && initializer == null) {
                 return null;
             }
@@ -256,14 +256,14 @@ public Object removeAttribute(final int index) {
             return removeAttribute(attributeBuilder.getAttributeByIndex(index));
         }
 
-        private Object getAttribute(final Attribute attribute, final NullaryFunction initializer) {
+        private Object getAttribute(final Attribute attribute, final Supplier initializer) {
             final int idx = attribute.index();
 
             final Holder h = holderByIdx(idx);
 
             if (h != null) {
                 if (h.value == null && initializer != null) {
-                    h.value = initializer.evaluate();
+                    h.value = initializer.get();
                 }
 
                 return h.value;
@@ -272,7 +272,7 @@ private Object getAttribute(final Attribute attribute, final NullaryFunction ini
             Object value = valueMap != null ? MapperAccessor.getValue(UnsafeAttributeHolder.this, idx) : null;
 
             if (value == null && initializer != null) {
-                value = initializer.evaluate();
+                value = initializer.get();
                 setAttribute(attribute, value);
             }
 
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/compression/zip/GZipEncoder.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/compression/zip/GZipEncoder.java
index a2db37126b..49ecbed997 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/compression/zip/GZipEncoder.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/compression/zip/GZipEncoder.java
@@ -43,8 +43,8 @@ public class GZipEncoder extends AbstractTransformer<Buffer, Buffer> {
     private static final int TRAILER_SIZE = 8;
 
     private final int bufferSize;
-    private static int compressionLevel;
-    private static int compressionStrategy;
+    private final int compressionLevel;
+    private final int compressionStrategy;
 
     private static final Buffer header;
 
@@ -112,7 +112,7 @@ protected TransformationResult<Buffer, Buffer> transformImpl(AttributeStorage st
         final GZipOutputState state = (GZipOutputState) obtainStateObject(storage);
 
         if (!state.isInitialized) {
-            state.initialize();
+            state.initialize(compressionLevel, compressionStrategy);
         }
 
         Buffer encodedBuffer = null;
@@ -290,7 +290,7 @@ protected static final class GZipOutputState extends LastResultAwareState<Buffer
          */
         private Deflater deflater;
 
-        private void initialize() {
+        private void initialize(int compressionLevel, int compressionStrategy) {
             final Deflater newDeflater = new Deflater(compressionLevel, true);
             newDeflater.setStrategy(compressionStrategy);
             final CRC32 newCrc32 = new CRC32();
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/filterchain/DefaultFilterChain.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/filterchain/DefaultFilterChain.java
index 0412825230..5259730192 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/filterchain/DefaultFilterChain.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/filterchain/DefaultFilterChain.java
@@ -20,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.concurrent.ExecutionException;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -44,7 +45,6 @@
 import org.glassfish.grizzly.memory.Buffers;
 import org.glassfish.grizzly.utils.Exceptions;
 import org.glassfish.grizzly.utils.Futures;
-import org.glassfish.grizzly.utils.NullaryFunction;
 
 /**
  * Default {@link FilterChain} implementation
@@ -637,10 +637,10 @@ private Object append(final Object currentMessage) {
         }
     }
 
-    private final class FiltersStateFactory implements NullaryFunction<FiltersState> {
+    private final class FiltersStateFactory implements Supplier<FiltersState> {
 
         @Override
-        public FiltersState evaluate() {
+        public FiltersState get() {
             return new FiltersState(size());
         }
     }
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/NIOConnection.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/NIOConnection.java
index ad95701f16..439fbb11d8 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/NIOConnection.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/NIOConnection.java
@@ -35,6 +35,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -67,7 +68,6 @@
 import org.glassfish.grizzly.monitoring.MonitoringConfig;
 import org.glassfish.grizzly.utils.CompletionHandlerAdapter;
 import org.glassfish.grizzly.utils.Futures;
-import org.glassfish.grizzly.utils.NullaryFunction;
 
 /**
  * Common {@link Connection} implementation for Java NIO <tt>Connection</tt>s.
@@ -315,7 +315,7 @@ public void setProcessorSelector(final ProcessorSelector preferableProcessorSele
     }
 
     @Override
-    public <E> E obtainProcessorState(final Processor processor, final NullaryFunction<E> factory) {
+    public <E> E obtainProcessorState(final Processor processor, final Supplier<E> factory) {
         return processorStateStorage.getState(processor, factory);
     }
 
@@ -962,7 +962,7 @@ private final static class ProcessorStatesMap {
         private ConcurrentMap<Processor, Object> processorStatesMap;
 
         @SuppressWarnings("unchecked")
-        public <E> E getState(final Processor processor, final NullaryFunction<E> stateFactory) {
+        public <E> E getState(final Processor processor, final Supplier<E> stateFactory) {
 
             final int c = volatileFlag;
             if (c == 0) {
@@ -986,9 +986,9 @@ public <E> E getState(final Processor processor, final NullaryFunction<E> stateF
             }
         }
 
-        private synchronized <E> Object getStateSync(final Processor processor, final NullaryFunction<E> stateFactory) {
+        private synchronized <E> Object getStateSync(final Processor processor, final Supplier<E> stateFactory) {
             if (volatileFlag == 0) {
-                final E state = stateFactory.evaluate();
+                final E state = stateFactory.get();
                 singleProcessorState = new ProcessorState(processor, state);
                 volatileFlag++;
 
@@ -1021,7 +1021,7 @@ private static final class StaticMapAccessor {
                 Grizzly.logger(StaticMapAccessor.class).fine("Map is going to " + "be used as Connection<->ProcessorState storage");
             }
 
-            private static <E> Object getFromMap(final ProcessorStatesMap storage, final Processor processor, final NullaryFunction<E> stateFactory) {
+            private static <E> Object getFromMap(final ProcessorStatesMap storage, final Processor processor, final Supplier<E> stateFactory) {
 
                 final Map<Processor, Object> localStateMap = storage.processorStatesMap;
                 if (localStateMap != null) {
@@ -1034,7 +1034,7 @@ private static <E> Object getFromMap(final ProcessorStatesMap storage, final Pro
                 return storage.getStateSync(processor, stateFactory);
             }
 
-            private static <E> Object getFromMapSync(final ProcessorStatesMap storage, final Processor processor, final NullaryFunction<E> stateFactory) {
+            private static <E> Object getFromMapSync(final ProcessorStatesMap storage, final Processor processor, final Supplier<E> stateFactory) {
 
                 ConcurrentMap<Processor, Object> localStatesMap = storage.processorStatesMap;
 
@@ -1043,13 +1043,13 @@ private static <E> Object getFromMapSync(final ProcessorStatesMap storage, final
                         return localStatesMap.get(processor);
                     }
 
-                    final Object state = stateFactory.evaluate();
+                    final Object state = stateFactory.get();
                     localStatesMap.put(processor, state);
                     return state;
                 }
 
                 localStatesMap = new ConcurrentHashMap<>(4);
-                final Object state = stateFactory.evaluate();
+                final Object state = stateFactory.get();
                 localStatesMap.put(processor, state);
                 storage.processorStatesMap = localStatesMap;
                 storage.volatileFlag++;
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/transport/TCPNIOConnection.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/transport/TCPNIOConnection.java
index 7a1516926b..6842f225f1 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/transport/TCPNIOConnection.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/transport/TCPNIOConnection.java
@@ -22,6 +22,7 @@
 import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -37,7 +38,6 @@
 import org.glassfish.grizzly.nio.NIOConnection;
 import org.glassfish.grizzly.nio.SelectorRunner;
 import org.glassfish.grizzly.utils.Holder;
-import org.glassfish.grizzly.utils.NullaryFunction;
 
 /**
  * {@link org.glassfish.grizzly.Connection} implementation for the {@link TCPNIOTransport}
@@ -112,16 +112,16 @@ protected void resetProperties() {
             setMaxAsyncWriteQueueSize(
                     transportMaxAsyncWriteQueueSize == AsyncQueueWriter.AUTO_SIZE ? getWriteBufferSize() * 4 : transportMaxAsyncWriteQueueSize);
 
-            localSocketAddressHolder = Holder.lazyHolder(new NullaryFunction<SocketAddress>() {
+            localSocketAddressHolder = Holder.lazyHolder(new Supplier<SocketAddress>() {
                 @Override
-                public SocketAddress evaluate() {
+                public SocketAddress get() {
                     return ((SocketChannel) channel).socket().getLocalSocketAddress();
                 }
             });
 
-            peerSocketAddressHolder = Holder.lazyHolder(new NullaryFunction<SocketAddress>() {
+            peerSocketAddressHolder = Holder.lazyHolder(new Supplier<SocketAddress>() {
                 @Override
-                public SocketAddress evaluate() {
+                public SocketAddress get() {
                     return ((SocketChannel) channel).socket().getRemoteSocketAddress();
                 }
             });
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/transport/TCPNIOServerConnection.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/transport/TCPNIOServerConnection.java
index bcdaac7c62..a57f52a0f0 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/transport/TCPNIOServerConnection.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/transport/TCPNIOServerConnection.java
@@ -24,6 +24,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -42,7 +43,6 @@
 import org.glassfish.grizzly.utils.CompletionHandlerAdapter;
 import org.glassfish.grizzly.utils.Exceptions;
 import org.glassfish.grizzly.utils.Holder;
-import org.glassfish.grizzly.utils.NullaryFunction;
 
 /**
  *
@@ -265,10 +265,10 @@ protected void closeGracefully0(final CompletionHandler<Closeable> completionHan
     @Override
     @SuppressWarnings("unchecked")
     protected void resetProperties() {
-        localSocketAddressHolder = Holder.lazyHolder(new NullaryFunction<SocketAddress>() {
+        localSocketAddressHolder = Holder.lazyHolder(new Supplier<SocketAddress>() {
 
             @Override
-            public SocketAddress evaluate() {
+            public SocketAddress get() {
                 return ((ServerSocketChannel) channel).socket().getLocalSocketAddress();
             }
         });
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/transport/UDPNIOConnection.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/transport/UDPNIOConnection.java
index e5aa6ea35a..57b617d20d 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/transport/UDPNIOConnection.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/nio/transport/UDPNIOConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -29,6 +29,7 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -42,8 +43,6 @@
 import org.glassfish.grizzly.nio.SelectorRunner;
 import org.glassfish.grizzly.utils.Exceptions;
 import org.glassfish.grizzly.utils.Holder;
-import org.glassfish.grizzly.utils.JdkVersion;
-import org.glassfish.grizzly.utils.NullaryFunction;
 
 /**
  * {@link org.glassfish.grizzly.Connection} implementation for the {@link UDPNIOTransport}
@@ -65,28 +64,25 @@ public class UDPNIOConnection extends NIOConnection {
     private static final Method MK_UNBLOCK_METHOD;
 
     static {
-        JdkVersion jdkVersion = JdkVersion.getJdkVersion();
-        JdkVersion minimumVersion = JdkVersion.parseVersion("1.7.0");
 
         boolean isInitialized = false;
         Method join = null, joinWithSource = null, mkGetNetworkInterface = null, mkGetSourceAddress = null, mkDrop = null, mkBlock = null, mkUnblock = null;
-        if (minimumVersion.compareTo(jdkVersion) <= 0) { // If JDK version is >= 1.7
-            try {
-                join = DatagramChannel.class.getMethod("join", InetAddress.class, NetworkInterface.class);
-                joinWithSource = DatagramChannel.class.getMethod("join", InetAddress.class, NetworkInterface.class, InetAddress.class);
 
-                final Class membershipKeyClass = loadClass("java.nio.channels.MembershipKey");
+        try {
+            join = DatagramChannel.class.getMethod("join", InetAddress.class, NetworkInterface.class);
+            joinWithSource = DatagramChannel.class.getMethod("join", InetAddress.class, NetworkInterface.class, InetAddress.class);
 
-                mkGetNetworkInterface = membershipKeyClass.getDeclaredMethod("networkInterface");
-                mkGetSourceAddress = membershipKeyClass.getDeclaredMethod("sourceAddress");
-                mkDrop = membershipKeyClass.getDeclaredMethod("drop");
+            final Class membershipKeyClass = loadClass("java.nio.channels.MembershipKey");
 
-                mkBlock = membershipKeyClass.getDeclaredMethod("block", InetAddress.class);
-                mkUnblock = membershipKeyClass.getDeclaredMethod("unblock", InetAddress.class);
-                isInitialized = true;
-            } catch (Throwable t) {
-                LOGGER.log(Level.WARNING, LogMessages.WARNING_GRIZZLY_CONNECTION_UDPMULTICASTING_EXCEPTIONE(), t);
-            }
+            mkGetNetworkInterface = membershipKeyClass.getDeclaredMethod("networkInterface");
+            mkGetSourceAddress = membershipKeyClass.getDeclaredMethod("sourceAddress");
+            mkDrop = membershipKeyClass.getDeclaredMethod("drop");
+
+            mkBlock = membershipKeyClass.getDeclaredMethod("block", InetAddress.class);
+            mkUnblock = membershipKeyClass.getDeclaredMethod("unblock", InetAddress.class);
+            isInitialized = true;
+        } catch (Throwable t) {
+            LOGGER.log(Level.WARNING, LogMessages.WARNING_GRIZZLY_CONNECTION_UDPMULTICASTING_EXCEPTIONE(), t);
         }
 
         if (isInitialized) {
@@ -424,16 +420,16 @@ protected final void resetProperties() {
             setMaxAsyncWriteQueueSize(
                     transportMaxAsyncWriteQueueSize == AsyncQueueWriter.AUTO_SIZE ? getWriteBufferSize() * 4 : transportMaxAsyncWriteQueueSize);
 
-            localSocketAddressHolder = Holder.lazyHolder(new NullaryFunction<SocketAddress>() {
+            localSocketAddressHolder = Holder.lazyHolder(new Supplier<SocketAddress>() {
                 @Override
-                public SocketAddress evaluate() {
+                public SocketAddress get() {
                     return ((DatagramChannel) channel).socket().getLocalSocketAddress();
                 }
             });
 
-            peerSocketAddressHolder = Holder.lazyHolder(new NullaryFunction<SocketAddress>() {
+            peerSocketAddressHolder = Holder.lazyHolder(new Supplier<SocketAddress>() {
                 @Override
-                public SocketAddress evaluate() {
+                public SocketAddress get() {
                     return ((DatagramChannel) channel).socket().getRemoteSocketAddress();
                 }
             });
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/SSLEngineConfigurator.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/SSLEngineConfigurator.java
index f672d7ae42..eabbcafc22 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/SSLEngineConfigurator.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/SSLEngineConfigurator.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2023 Contributors to the Eclipse Foundation.
+ * Copyright (c) 2008, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,6 +24,7 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 
+import javax.net.ssl.SSLParameters;
 import org.glassfish.grizzly.Grizzly;
 
 /**
@@ -39,34 +41,15 @@ public class SSLEngineConfigurator implements SSLEngineFactory {
 
     protected volatile SSLContext sslContext;
 
-    /**
-     * The list of cipher suite
-     */
-    protected String[] enabledCipherSuites = null;
-    /**
-     * the list of protocols
-     */
-    protected String[] enabledProtocols = null;
     /**
      * Client mode when handshaking.
      */
     protected boolean clientMode;
+
     /**
-     * Require client Authentication.
-     */
-    protected boolean needClientAuth;
-    /**
-     * True when requesting authentication.
-     */
-    protected boolean wantClientAuth;
-    /**
-     * Has the enabled protocol configured.
-     */
-    private boolean isProtocolConfigured = false;
-    /**
-     * Has the enabled Cipher configured.
+     * Parameters to configure {@link SSLEngine}.
      */
-    private boolean isCipherConfigured = false;
+    private SSLParameters sslParameters;
 
     /**
      * Create SSL Engine configuration basing on passed {@link SSLContext}.
@@ -94,8 +77,15 @@ public SSLEngineConfigurator(final SSLContext sslContext, final boolean clientMo
         this.sslContextConfiguration = null;
         this.sslContext = sslContext;
         this.clientMode = clientMode;
-        this.needClientAuth = needClientAuth;
-        this.wantClientAuth = wantClientAuth;
+
+        this.sslParameters = sslContext.getDefaultSSLParameters();
+        if (needClientAuth) {
+            sslParameters.setNeedClientAuth(true);
+        }
+
+        if (wantClientAuth) {
+            sslParameters.setWantClientAuth(true);
+        }
     }
 
     /**
@@ -118,33 +108,32 @@ public SSLEngineConfigurator(SSLContextConfigurator sslContextConfiguration) {
      * @param wantClientAuth
      */
     public SSLEngineConfigurator(SSLContextConfigurator sslContextConfiguration, boolean clientMode, boolean needClientAuth, boolean wantClientAuth) {
-
         if (sslContextConfiguration == null) {
             throw new IllegalArgumentException("SSLContextConfigurator can not be null");
         }
 
         this.sslContextConfiguration = sslContextConfiguration;
         this.clientMode = clientMode;
-        this.needClientAuth = needClientAuth;
-        this.wantClientAuth = wantClientAuth;
+
+        this.sslParameters = new SSLParameters();
+        if (needClientAuth) {
+            sslParameters.setNeedClientAuth(true);
+        }
+
+        if (wantClientAuth) {
+            sslParameters.setWantClientAuth(true);
+        }
     }
 
     public SSLEngineConfigurator(SSLEngineConfigurator pattern) {
         this.sslContextConfiguration = pattern.sslContextConfiguration;
         this.sslContext = pattern.sslContext;
         this.clientMode = pattern.clientMode;
-        this.needClientAuth = pattern.needClientAuth;
-        this.wantClientAuth = pattern.wantClientAuth;
-
-        this.enabledCipherSuites = pattern.enabledCipherSuites != null ? Arrays.copyOf(pattern.enabledCipherSuites, pattern.enabledCipherSuites.length) : null;
-
-        this.enabledProtocols = pattern.enabledProtocols != null ? Arrays.copyOf(pattern.enabledProtocols, pattern.enabledProtocols.length) : null;
-
-        this.isCipherConfigured = pattern.isCipherConfigured;
-        this.isProtocolConfigured = pattern.isProtocolConfigured;
+        this.sslParameters = copy(pattern.sslParameters);
     }
 
     protected SSLEngineConfigurator() {
+        this.sslParameters = new SSLParameters();
     }
 
     /**
@@ -192,29 +181,24 @@ public SSLEngine createSSLEngine(final String peerHost, final int peerPort) {
      * @return configured {@link SSLEngine}.
      */
     public SSLEngine configure(final SSLEngine sslEngine) {
+
+        SSLParameters params = copy(sslParameters);
+
+        String[] enabledCipherSuites = params.getProtocols();
         if (enabledCipherSuites != null) {
-            if (!isCipherConfigured) {
-                enabledCipherSuites = configureEnabledCiphers(sslEngine, enabledCipherSuites);
-                isCipherConfigured = true;
-            }
-            sslEngine.setEnabledCipherSuites(enabledCipherSuites);
+            enabledCipherSuites = configureEnabledCiphers(sslEngine, enabledCipherSuites);
+            params.setCipherSuites(enabledCipherSuites);
         }
 
+        String[] enabledProtocols = params.getProtocols();
         if (enabledProtocols != null) {
-            if (!isProtocolConfigured) {
-                enabledProtocols = configureEnabledProtocols(sslEngine, enabledProtocols);
-                isProtocolConfigured = true;
-            }
-            sslEngine.setEnabledProtocols(enabledProtocols);
+            enabledProtocols = configureEnabledProtocols(sslEngine,
+                            enabledProtocols);
+            params.setProtocols(enabledProtocols);
         }
 
         sslEngine.setUseClientMode(clientMode);
-        if (wantClientAuth) {
-            sslEngine.setWantClientAuth(wantClientAuth);
-        }
-        if (needClientAuth) {
-            sslEngine.setNeedClientAuth(needClientAuth);
-        }
+        sslEngine.setSSLParameters(sslParameters);
 
         return sslEngine;
     }
@@ -242,29 +226,40 @@ public SSLEngineConfigurator setClientMode(boolean clientMode) {
     }
 
     public boolean isNeedClientAuth() {
-        return needClientAuth;
+        return sslParameters.getNeedClientAuth();
     }
 
     public SSLEngineConfigurator setNeedClientAuth(boolean needClientAuth) {
-        this.needClientAuth = needClientAuth;
+        sslParameters.setNeedClientAuth(needClientAuth);
         return this;
     }
 
     public boolean isWantClientAuth() {
-        return wantClientAuth;
+        return sslParameters.getWantClientAuth();
     }
 
     public SSLEngineConfigurator setWantClientAuth(boolean wantClientAuth) {
-        this.wantClientAuth = wantClientAuth;
+        sslParameters.setWantClientAuth(wantClientAuth);
         return this;
     }
 
     /**
-     * @return an array of enabled cipher suites. Modifications made on the array content won't be propagated to
-     * SSLEngineConfigurator
+     * Apply {@link SSLParameters} to this SSLEngineConfigurator.
+     *
+     * @param sslParameters
+     * @return this SSLEngineConfigurator
+     */
+    public SSLEngineConfigurator setSSLParameters(SSLParameters sslParameters) {
+        this.sslParameters = copy(this.sslParameters);
+        return this;
+    }
+
+    /**
+     * @return an array of enabled cipher suites. Modifications made on the array
+     *      content won't be propagated to SSLEngineConfigurator
      */
     public String[] getEnabledCipherSuites() {
-        return enabledCipherSuites != null ? Arrays.copyOf(enabledCipherSuites, enabledCipherSuites.length) : null;
+        return sslParameters.getCipherSuites();
     }
 
     /**
@@ -275,7 +270,7 @@ public String[] getEnabledCipherSuites() {
      * @return this SSLEngineConfigurator
      */
     public SSLEngineConfigurator setEnabledCipherSuites(final String[] enabledCipherSuites) {
-        this.enabledCipherSuites = enabledCipherSuites != null ? Arrays.copyOf(enabledCipherSuites, enabledCipherSuites.length) : null;
+        sslParameters.setCipherSuites(enabledCipherSuites);
         return this;
     }
 
@@ -284,7 +279,7 @@ public SSLEngineConfigurator setEnabledCipherSuites(final String[] enabledCipher
      * SSLEngineConfigurator
      */
     public String[] getEnabledProtocols() {
-        return enabledProtocols != null ? Arrays.copyOf(enabledProtocols, enabledProtocols.length) : null;
+        return sslParameters.getProtocols();
     }
 
     /**
@@ -295,25 +290,7 @@ public String[] getEnabledProtocols() {
      * @return this SSLEngineConfigurator
      */
     public SSLEngineConfigurator setEnabledProtocols(final String[] enabledProtocols) {
-        this.enabledProtocols = enabledProtocols != null ? Arrays.copyOf(enabledProtocols, enabledProtocols.length) : null;
-        return this;
-    }
-
-    public boolean isCipherConfigured() {
-        return isCipherConfigured;
-    }
-
-    public SSLEngineConfigurator setCipherConfigured(boolean isCipherConfigured) {
-        this.isCipherConfigured = isCipherConfigured;
-        return this;
-    }
-
-    public boolean isProtocolConfigured() {
-        return isProtocolConfigured;
-    }
-
-    public SSLEngineConfigurator setProtocolConfigured(boolean isProtocolConfigured) {
-        this.isProtocolConfigured = isProtocolConfigured;
+        sslParameters.setProtocols(enabledProtocols);
         return this;
     }
 
@@ -331,7 +308,7 @@ public SSLContext getSslContext() {
 
     /**
      * Return the list of allowed protocol.
-     * 
+     *
      * @return String[] an array of supported protocols.
      */
     private static String[] configureEnabledProtocols(SSLEngine sslEngine, String[] requestedProtocols) {
@@ -400,12 +377,12 @@ public String toString() {
         final StringBuilder sb = new StringBuilder();
         sb.append("SSLEngineConfigurator");
         sb.append("{clientMode=").append(clientMode);
-        sb.append(", enabledCipherSuites=").append(enabledCipherSuites == null ? "null" : Arrays.asList(enabledCipherSuites).toString());
-        sb.append(", enabledProtocols=").append(enabledProtocols == null ? "null" : Arrays.asList(enabledProtocols).toString());
-        sb.append(", needClientAuth=").append(needClientAuth);
-        sb.append(", wantClientAuth=").append(wantClientAuth);
-        sb.append(", isProtocolConfigured=").append(isProtocolConfigured);
-        sb.append(", isCipherConfigured=").append(isCipherConfigured);
+        sb.append(", enabledCipherSuites=")
+            .append(sslParameters.getCipherSuites() == null ? "null" : Arrays.toString(sslParameters.getCipherSuites()));
+        sb.append(", enabledProtocols=")
+            .append(sslParameters.getProtocols() == null ? "null" : Arrays.toString(sslParameters.getProtocols()));
+        sb.append(", needClientAuth=").append(sslParameters.getNeedClientAuth());
+        sb.append(", wantClientAuth=").append(sslParameters.getWantClientAuth());
         sb.append('}');
         return sb.toString();
     }
@@ -413,4 +390,30 @@ public String toString() {
     public SSLEngineConfigurator copy() {
         return new SSLEngineConfigurator(this);
     }
+
+    private SSLParameters copy(SSLParameters src) {
+        SSLParameters dest = new SSLParameters();
+
+        dest.setCipherSuites(src.getCipherSuites());
+        dest.setProtocols(src.getProtocols());
+
+        if (src.getNeedClientAuth()) {
+            dest.setNeedClientAuth(src.getNeedClientAuth());
+        }
+
+        if (src.getWantClientAuth()) {
+            dest.setWantClientAuth(src.getWantClientAuth());
+        }
+
+        dest.setAlgorithmConstraints(src.getAlgorithmConstraints());
+        dest.setApplicationProtocols(src.getApplicationProtocols());
+        dest.setEnableRetransmissions(src.getEnableRetransmissions());
+        dest.setEndpointIdentificationAlgorithm(src.getEndpointIdentificationAlgorithm());
+        dest.setMaximumPacketSize(src.getMaximumPacketSize());
+        dest.setSNIMatchers(src.getSNIMatchers());
+        dest.setServerNames(src.getServerNames());
+        dest.setUseCipherSuitesOrder(src.getUseCipherSuitesOrder());
+
+        return dest;
+    }
 }
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/SSLFilter.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/SSLFilter.java
index 85f098c794..bbe7cd9fb9 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/SSLFilter.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/SSLFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -42,7 +42,6 @@
 import org.glassfish.grizzly.filterchain.FilterChainContext.Operation;
 import org.glassfish.grizzly.filterchain.NextAction;
 import org.glassfish.grizzly.utils.Exceptions;
-import org.glassfish.grizzly.utils.JdkVersion;
 
 /**
  * SSL {@link Filter} to operate with SSL encrypted data.
@@ -51,7 +50,6 @@
  */
 public class SSLFilter extends SSLBaseFilter {
     private static final Logger LOGGER = Grizzly.logger(SSLFilter.class);
-    private static final boolean IS_JDK7_OR_HIGHER = JdkVersion.getJdkVersion().compareTo("1.7.0") >= 0;
 
     private final Attribute<SSLHandshakeContext> handshakeContextAttr;
     private final SSLEngineConfigurator clientSSLEngineConfigurator;
@@ -268,8 +266,7 @@ protected Buffer doHandshakeStep(final SSLConnectionContext sslCtx, final Filter
 
     protected SSLEngine createClientSSLEngine(final SSLConnectionContext sslCtx, final SSLEngineConfigurator sslEngineConfigurator) {
 
-        return IS_JDK7_OR_HIGHER ? sslEngineConfigurator.createSSLEngine(HostNameResolver.getPeerHostName(sslCtx.getConnection()), -1)
-                : sslEngineConfigurator.createSSLEngine();
+        return sslEngineConfigurator.createSSLEngine(HostNameResolver.getPeerHostName(sslCtx.getConnection()), -1);
     }
 
     // ----------------------------------------------------------- Inner Classes
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/ActivityCheckFilter.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/ActivityCheckFilter.java
index 09fdf0e235..2a24820f87 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/ActivityCheckFilter.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/ActivityCheckFilter.java
@@ -21,6 +21,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 import java.util.logging.Logger;
 
 import org.glassfish.grizzly.Connection;
@@ -45,10 +46,10 @@ public class ActivityCheckFilter extends BaseFilter {
 
     public static final String ACTIVE_ATTRIBUTE_NAME = "connection-active-attribute";
     private static final Attribute<ActiveRecord> IDLE_ATTR = Grizzly.DEFAULT_ATTRIBUTE_BUILDER.createAttribute(ACTIVE_ATTRIBUTE_NAME,
-            new NullaryFunction<ActiveRecord>() {
+            new Supplier<ActiveRecord>() {
 
                 @Override
-                public ActiveRecord evaluate() {
+                public ActiveRecord get() {
                     return new ActiveRecord();
                 }
             });
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/Holder.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/Holder.java
index 039b35c807..25c30171b5 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/Holder.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/Holder.java
@@ -16,6 +16,8 @@
 
 package org.glassfish.grizzly.utils;
 
+import java.util.function.Supplier;
+
 /**
  * The object holder, which might be used for lazy object initialization.
  *
@@ -42,22 +44,22 @@ public int getInt() {
         };
     }
 
-    public static <T> LazyHolder<T> lazyHolder(final NullaryFunction<T> factory) {
+    public static <T> LazyHolder<T> lazyHolder(final Supplier<T> factory) {
         return new LazyHolder<T>() {
 
             @Override
             protected T evaluate() {
-                return factory.evaluate();
+                return factory.get();
             }
         };
     }
 
-    public static LazyIntHolder lazyIntHolder(final NullaryFunction<Integer> factory) {
+    public static LazyIntHolder lazyIntHolder(final Supplier<Integer> factory) {
         return new LazyIntHolder() {
 
             @Override
             protected int evaluate() {
-                return factory.evaluate();
+                return factory.get();
             }
         };
     }
@@ -67,7 +69,7 @@ protected int evaluate() {
     @Override
     public String toString() {
         final E obj = get();
-        return obj != null ? "{" + obj + "}" : null;
+        return obj != null ? "{" + obj + "}" : "{}";
     }
 
     public static abstract class LazyHolder<E> extends Holder<E> {
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/IdleTimeoutFilter.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/IdleTimeoutFilter.java
index d377367c2b..a438d113f9 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/IdleTimeoutFilter.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/IdleTimeoutFilter.java
@@ -24,6 +24,7 @@
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 
+import java.util.function.Supplier;
 import org.glassfish.grizzly.Connection;
 import org.glassfish.grizzly.Grizzly;
 import org.glassfish.grizzly.attributes.Attribute;
@@ -50,10 +51,10 @@ public class IdleTimeoutFilter extends BaseFilter {
 
     public static final String IDLE_ATTRIBUTE_NAME = "connection-idle-attribute";
     private static final Attribute<IdleRecord> IDLE_ATTR = Grizzly.DEFAULT_ATTRIBUTE_BUILDER.createAttribute(IDLE_ATTRIBUTE_NAME,
-            new NullaryFunction<IdleRecord>() {
+            new Supplier<IdleRecord>() {
 
                 @Override
-                public IdleRecord evaluate() {
+                public IdleRecord get() {
                     return new IdleRecord();
                 }
             });
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/JdkVersion.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/JdkVersion.java
deleted file mode 100644
index b60472746b..0000000000
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/JdkVersion.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.grizzly.utils;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.glassfish.grizzly.Grizzly;
-
-/**
- *
- * @since 2.2.11
- */
-public class JdkVersion implements Comparable<JdkVersion> {
-    private static final Logger LOGGER = Grizzly.logger(JdkVersion.class);
-
-    // take max 4 parts of the JDK version and cut the rest (usually the build number)
-    private static final Pattern VERSION_PATTERN = Pattern.compile("([0-9]+)(\\.([0-9]+))?(\\.([0-9]+))?([_\\.]([0-9]+))?.*");
-
-    private static final JdkVersion UNKNOWN_VERSION = new JdkVersion(-1, -1, -1, -1);
-    private static final JdkVersion JDK_VERSION = parseVersion(System.getProperty("java.version"));
-
-    private final int major;
-    private final int minor;
-    private final int maintenance;
-    private final int update;
-
-    // ------------------------------------------------------------ Constructors
-
-    private JdkVersion(final int major, final int minor, final int maintenance, final int update) {
-        this.major = major;
-        this.minor = minor;
-        this.maintenance = maintenance;
-        this.update = update;
-    }
-
-    // ---------------------------------------------------------- Public Methods
-
-    public static JdkVersion parseVersion(final String versionString) {
-
-        try {
-            final Matcher matcher = VERSION_PATTERN.matcher(versionString);
-            if (matcher.matches()) {
-                return new JdkVersion(parseInt(matcher.group(1)), parseInt(matcher.group(3)), parseInt(matcher.group(5)), parseInt(matcher.group(7)));
-            }
-
-            LOGGER.log(Level.FINE, "Can't parse the JDK version {0}", versionString);
-
-        } catch (Exception e) {
-            LOGGER.log(Level.FINE, "Error parsing the JDK version " + versionString, e);
-        }
-
-        return UNKNOWN_VERSION;
-    }
-
-    public static JdkVersion getJdkVersion() {
-        return JDK_VERSION;
-    }
-
-    @SuppressWarnings("UnusedDeclaration")
-    public int getMajor() {
-        return major;
-    }
-
-    @SuppressWarnings("UnusedDeclaration")
-    public int getMinor() {
-        return minor;
-    }
-
-    @SuppressWarnings("UnusedDeclaration")
-    public int getMaintenance() {
-        return maintenance;
-    }
-
-    @SuppressWarnings("UnusedDeclaration")
-    public int getUpdate() {
-        return update;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder();
-        sb.append("JdkVersion");
-        sb.append("{major=").append(major);
-        sb.append(", minor=").append(minor);
-        sb.append(", maintenance=").append(maintenance);
-        sb.append(", update=").append(update);
-        sb.append('}');
-        return sb.toString();
-    }
-
-    // ------------------------------------------------- Methods from Comparable
-
-    public int compareTo(String versionString) {
-        return compareTo(JdkVersion.parseVersion(versionString));
-    }
-
-    @Override
-    public int compareTo(JdkVersion otherVersion) {
-        if (major < otherVersion.major) {
-            return -1;
-        }
-        if (major > otherVersion.major) {
-            return 1;
-        }
-        if (minor < otherVersion.minor) {
-            return -1;
-        }
-        if (minor > otherVersion.minor) {
-            return 1;
-        }
-        if (maintenance < otherVersion.maintenance) {
-            return -1;
-        }
-        if (maintenance > otherVersion.maintenance) {
-            return 1;
-        }
-        if (update < otherVersion.update) {
-            return -1;
-        }
-        if (update > otherVersion.update) {
-            return 1;
-        }
-        return 0;
-    }
-
-    private static int parseInt(final String s) {
-        return s != null ? Integer.parseInt(s) : 0;
-    }
-}
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/ThreadLocalRandom.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/ThreadLocalRandom.java
deleted file mode 100644
index f5ade07e4a..0000000000
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/ThreadLocalRandom.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-package org.glassfish.grizzly.utils;
-
-import java.util.Random;
-import java.util.concurrent.ForkJoinTask;
-
-/**
- * A random number generator isolated to the current thread. Like the global {@link java.util.Random} generator used by
- * the {@link java.lang.Math} class, a {@code ThreadLocalRandom} is initialized with an internally generated seed that
- * may not otherwise be modified. When applicable, use of {@code ThreadLocalRandom} rather than shared {@code Random}
- * objects in concurrent programs will typically encounter much less overhead and contention. Use of
- * {@code ThreadLocalRandom} is particularly appropriate when multiple tasks (for example, each a {@link ForkJoinTask})
- * use random numbers in parallel in thread pools.
- *
- * <p>
- * Usages of this class should typically be of the form: {@code ThreadLocalRandom.current().nextX(...)} (where {@code X}
- * is {@code Int}, {@code Long}, etc). When all usages are of this form, it is never possible to accidently share a
- * {@code ThreadLocalRandom} across multiple threads.
- *
- * <p>
- * This class also provides additional commonly used bounded random generation methods.
- *
- * @author Doug Lea
- */
-class ThreadLocalRandom extends Random {
-    // same constants as Random, but must be redeclared because private
-    private static final long multiplier = 0x5DEECE66DL;
-    private static final long addend = 0xBL;
-    private static final long mask = (1L << 48) - 1;
-
-    /**
-     * The random seed. We can't use super.seed.
-     */
-    private long rnd;
-
-    /**
-     * Initialization flag to permit calls to setSeed to succeed only while executing the Random constructor. We can't allow
-     * others since it would cause setting seed in one part of a program to unintentionally impact other usages by the
-     * thread.
-     */
-    final boolean initialized;
-
-    // Padding to help avoid memory contention among seed updates in
-    // different TLRs in the common case that they are located near
-    // each other.
-    private long pad0, pad1, pad2, pad3, pad4, pad5, pad6, pad7;
-
-    /**
-     * The actual ThreadLocal
-     */
-    private static final ThreadLocal<ThreadLocalRandom> localRandom = new ThreadLocal<ThreadLocalRandom>() {
-        @Override
-        protected ThreadLocalRandom initialValue() {
-            return new ThreadLocalRandom();
-        }
-    };
-
-    /**
-     * Constructor called only by localRandom.initialValue.
-     */
-    ThreadLocalRandom() {
-        super();
-        initialized = true;
-    }
-
-    /**
-     * Returns the current thread's {@code ThreadLocalRandom}.
-     *
-     * @return the current thread's {@code ThreadLocalRandom}
-     */
-    public static ThreadLocalRandom current() {
-        return localRandom.get();
-    }
-
-    /**
-     * Throws {@code UnsupportedOperationException}. Setting seeds in this generator is not supported.
-     *
-     * @throws UnsupportedOperationException always
-     */
-    @Override
-    public void setSeed(long seed) {
-        if (initialized) {
-            throw new UnsupportedOperationException();
-        }
-        rnd = (seed ^ multiplier) & mask;
-    }
-
-    @Override
-    protected int next(int bits) {
-        rnd = rnd * multiplier + addend & mask;
-        return (int) (rnd >>> 48 - bits);
-    }
-
-    /**
-     * Returns a pseudorandom, uniformly distributed value between the given least value (inclusive) and bound (exclusive).
-     *
-     * @param least the least value returned
-     * @param bound the upper bound (exclusive)
-     * @return the next value
-     * @throws IllegalArgumentException if least greater than or equal to bound
-     */
-    public int nextInt(int least, int bound) {
-        if (least >= bound) {
-            throw new IllegalArgumentException();
-        }
-        return nextInt(bound - least) + least;
-    }
-
-    /**
-     * Returns a pseudorandom, uniformly distributed value between 0 (inclusive) and the specified value (exclusive).
-     *
-     * @param n the bound on the random number to be returned. Must be positive.
-     * @return the next value
-     * @throws IllegalArgumentException if n is not positive
-     */
-    public long nextLong(long n) {
-        if (n <= 0) {
-            throw new IllegalArgumentException("n must be positive");
-        }
-        // Divide n by two until small enough for nextInt. On each
-        // iteration (at most 31 of them but usually much less),
-        // randomly choose both whether to include high bit in result
-        // (offset) and whether to continue with the lower vs upper
-        // half (which makes a difference only if odd).
-        long offset = 0;
-        while (n >= Integer.MAX_VALUE) {
-            int bits = next(2);
-            long half = n >>> 1;
-            long nextn = (bits & 2) == 0 ? half : n - half;
-            if ((bits & 1) == 0) {
-                offset += n - nextn;
-            }
-            n = nextn;
-        }
-        return offset + nextInt((int) n);
-    }
-
-    /**
-     * Returns a pseudorandom, uniformly distributed value between the given least value (inclusive) and bound (exclusive).
-     *
-     * @param least the least value returned
-     * @param bound the upper bound (exclusive)
-     * @return the next value
-     * @throws IllegalArgumentException if least greater than or equal to bound
-     */
-    public long nextLong(long least, long bound) {
-        if (least >= bound) {
-            throw new IllegalArgumentException();
-        }
-        return nextLong(bound - least) + least;
-    }
-
-    /**
-     * Returns a pseudorandom, uniformly distributed {@code double} value between 0 (inclusive) and the specified value
-     * (exclusive).
-     *
-     * @param n the bound on the random number to be returned. Must be positive.
-     * @return the next value
-     * @throws IllegalArgumentException if n is not positive
-     */
-    public double nextDouble(double n) {
-        if (n <= 0) {
-            throw new IllegalArgumentException("n must be positive");
-        }
-        return nextDouble() * n;
-    }
-
-    /**
-     * Returns a pseudorandom, uniformly distributed value between the given least value (inclusive) and bound (exclusive).
-     *
-     * @param least the least value returned
-     * @param bound the upper bound (exclusive)
-     * @return the next value
-     * @throws IllegalArgumentException if least greater than or equal to bound
-     */
-    public double nextDouble(double least, double bound) {
-        if (least >= bound) {
-            throw new IllegalArgumentException();
-        }
-        return nextDouble() * (bound - least) + least;
-    }
-
-    private static final long serialVersionUID = -5851777807851030925L;
-}
diff --git a/modules/grizzly/src/test/java/org/glassfish/grizzly/AttributesTest.java b/modules/grizzly/src/test/java/org/glassfish/grizzly/AttributesTest.java
index 298efde5e7..7b434c1672 100644
--- a/modules/grizzly/src/test/java/org/glassfish/grizzly/AttributesTest.java
+++ b/modules/grizzly/src/test/java/org/glassfish/grizzly/AttributesTest.java
@@ -26,11 +26,11 @@
 import java.util.Collection;
 import java.util.Set;
 
+import java.util.function.Supplier;
 import org.glassfish.grizzly.attributes.Attribute;
 import org.glassfish.grizzly.attributes.AttributeBuilder;
 import org.glassfish.grizzly.attributes.AttributeHolder;
 import org.glassfish.grizzly.attributes.DefaultAttributeBuilder;
-import org.glassfish.grizzly.utils.NullaryFunction;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -102,9 +102,9 @@ public void testAttributeGetWithNullaryFunctionOnEmptyHolder() {
         AttributeBuilder builder = new DefaultAttributeBuilder();
         AttributeHolder holder = isSafe ? builder.createSafeAttributeHolder() : builder.createUnsafeAttributeHolder();
 
-        final Attribute<String> attr = builder.createAttribute("attribute", new NullaryFunction<String>() {
+        final Attribute<String> attr = builder.createAttribute("attribute", new Supplier<String>() {
             @Override
-            public String evaluate() {
+            public String get() {
                 return "default";
             }
         });
diff --git a/modules/grizzly/src/test/java/org/glassfish/grizzly/FileTransferTest.java b/modules/grizzly/src/test/java/org/glassfish/grizzly/FileTransferTest.java
index a2431b3c74..c86e6058b5 100644
--- a/modules/grizzly/src/test/java/org/glassfish/grizzly/FileTransferTest.java
+++ b/modules/grizzly/src/test/java/org/glassfish/grizzly/FileTransferTest.java
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
+import java.nio.file.Files;
 import java.security.MessageDigest;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
@@ -69,7 +70,7 @@ public NextAction handleRead(FilterChainContext ctx) throws IOException {
         TCPNIOTransport client = TCPNIOTransportBuilder.newInstance().build();
         FilterChainBuilder clientChain = FilterChainBuilder.stateless();
         final SafeFutureImpl<File> future = SafeFutureImpl.create();
-        final File temp = File.createTempFile("grizzly-download-", ".tmp");
+        final File temp = Files.createTempFile("grizzly-download-", ".tmp").toFile();
         temp.deleteOnExit();
         final FileOutputStream out = new FileOutputStream(temp);
         final AtomicInteger total = new AtomicInteger(0);
@@ -140,7 +141,7 @@ public void negativeFileTransferAPITest() throws Exception {
             fail("Unexpected exception type: " + e);
         }
 
-        f = File.createTempFile("grizzly-test-", ".tmp");
+        f = Files.createTempFile("grizzly-test-", ".tmp").toFile();
         f.deleteOnExit();
         new FileOutputStream(f).write(1);
 
@@ -195,7 +196,7 @@ private static BigInteger getMDSum(final File f) throws Exception {
     }
 
     private static File generateTempFile(final int size) throws IOException {
-        final File f = File.createTempFile("grizzly-temp-" + size, ".tmp");
+        final File f = Files.createTempFile("grizzly-temp-" + size, ".tmp").toFile();
         Random r = new Random();
         byte[] data = new byte[8192];
         r.nextBytes(data);
diff --git a/modules/grizzly/src/test/java/org/glassfish/grizzly/FilterChainTest.java b/modules/grizzly/src/test/java/org/glassfish/grizzly/FilterChainTest.java
index 0f420c7a1e..8a9f8620ef 100644
--- a/modules/grizzly/src/test/java/org/glassfish/grizzly/FilterChainTest.java
+++ b/modules/grizzly/src/test/java/org/glassfish/grizzly/FilterChainTest.java
@@ -31,6 +31,7 @@
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import java.util.function.Supplier;
 import org.glassfish.grizzly.asyncqueue.MessageCloner;
 import org.glassfish.grizzly.attributes.Attribute;
 import org.glassfish.grizzly.attributes.AttributeBuilder;
@@ -52,7 +53,6 @@
 import org.glassfish.grizzly.nio.transport.TCPNIOTransportBuilder;
 import org.glassfish.grizzly.utils.EchoFilter;
 import org.glassfish.grizzly.utils.Futures;
-import org.glassfish.grizzly.utils.NullaryFunction;
 import org.glassfish.grizzly.utils.StringFilter;
 
 import junit.framework.TestCase;
@@ -79,10 +79,10 @@ static int PORT() {
     private static Attribute<AtomicInteger> counterAttr = DEFAULT_ATTRIBUTE_BUILDER.createAttribute(FilterChainTest.class.getName() + ".counter");
 
     private static Attribute<CompositeBuffer> bufferAttr = DEFAULT_ATTRIBUTE_BUILDER.createAttribute(FilterChainTest.class.getName() + ".buffer",
-            new NullaryFunction<CompositeBuffer>() {
+            new Supplier<CompositeBuffer>() {
 
                 @Override
-                public CompositeBuffer evaluate() {
+                public CompositeBuffer get() {
                     return CompositeBuffer.newBuffer();
                 }
             });
diff --git a/modules/grizzly/src/test/java/org/glassfish/grizzly/TestDefaults.java b/modules/grizzly/src/test/java/org/glassfish/grizzly/TestDefaults.java
index fea5017c9f..02a631fafc 100644
--- a/modules/grizzly/src/test/java/org/glassfish/grizzly/TestDefaults.java
+++ b/modules/grizzly/src/test/java/org/glassfish/grizzly/TestDefaults.java
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.nio.channels.SelectionKey;
 
+import java.util.function.Supplier;
 import org.glassfish.grizzly.attributes.Attribute;
 import org.glassfish.grizzly.attributes.AttributeBuilder;
 import org.glassfish.grizzly.attributes.AttributeHolder;
@@ -28,7 +29,6 @@
 import org.glassfish.grizzly.monitoring.MonitoringConfig;
 import org.glassfish.grizzly.nio.NIOConnection;
 import org.glassfish.grizzly.nio.SelectionKeyHandler;
-import org.glassfish.grizzly.utils.NullaryFunction;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -144,12 +144,7 @@ public <T> Attribute<T> createAttribute(String name, T defaultValue) {
         }
 
         @Override
-        public <T> Attribute<T> createAttribute(String name, NullaryFunction<T> initializer) {
-            return null;
-        }
-
-        @Override
-        public <T> Attribute<T> createAttribute(String name, org.glassfish.grizzly.attributes.NullaryFunction<T> initializer) {
+        public <T> Attribute<T> createAttribute(String name, Supplier<T> initializer) {
             return null;
         }
 
diff --git a/modules/http-ajp/pom.xml b/modules/http-ajp/pom.xml
index f7a411b456..1a3aed1ed6 100755
--- a/modules/http-ajp/pom.xml
+++ b/modules/http-ajp/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -65,7 +65,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <useModulePath>false</useModulePath>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/NullaryFunction.java b/modules/http-ajp/src/main/java/module-info.java
similarity index 53%
rename from modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/NullaryFunction.java
rename to modules/http-ajp/src/main/java/module-info.java
index a0c6ad3775..877f75faaa 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/NullaryFunction.java
+++ b/modules/http-ajp/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,20 +14,14 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.grizzly.attributes;
+module org.glassfish.grizzly.http.ajp {
 
-/**
- * {@link Attribute} initializer.
- *
- * Is used by {@link Attribute#get(AttributeHolder)}, if there is no attribute value stored in {@link AttributeHolder},
- * or attribute value is <tt>null</tt>.
- *
- * @see Attribute
- * @see AttributeHolder
- *
- * @author Ken Cavanaugh
- * @deprecated pls. use {@link org.glassfish.grizzly.utils.NullaryFunction}
- */
-@Deprecated
-public interface NullaryFunction<T> extends org.glassfish.grizzly.utils.NullaryFunction<T> {
+    exports org.glassfish.grizzly.http.ajp;
+    
+    opens org.glassfish.grizzly.http.ajp;
+
+    requires java.logging;
+    requires org.glassfish.grizzly.http.server;
+    requires org.glassfish.grizzly.http;
+    requires org.glassfish.grizzly;
 }
diff --git a/modules/http-ajp/src/main/java/org/glassfish/grizzly/http/ajp/AjpMessageFilter.java b/modules/http-ajp/src/main/java/org/glassfish/grizzly/http/ajp/AjpMessageFilter.java
index cd225f4dab..336aba7553 100644
--- a/modules/http-ajp/src/main/java/org/glassfish/grizzly/http/ajp/AjpMessageFilter.java
+++ b/modules/http-ajp/src/main/java/org/glassfish/grizzly/http/ajp/AjpMessageFilter.java
@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 
+import java.util.function.Supplier;
 import org.glassfish.grizzly.Buffer;
 import org.glassfish.grizzly.Connection;
 import org.glassfish.grizzly.Grizzly;
@@ -25,7 +26,6 @@
 import org.glassfish.grizzly.filterchain.BaseFilter;
 import org.glassfish.grizzly.filterchain.FilterChainContext;
 import org.glassfish.grizzly.filterchain.NextAction;
-import org.glassfish.grizzly.utils.NullaryFunction;
 
 /**
  * Filter, responsible for parsing Ajp requests and making sure the request packets are complete and properly
@@ -35,10 +35,10 @@
  */
 public class AjpMessageFilter extends BaseFilter {
     private final Attribute<ParsingState> parsingStateAttribute = Grizzly.DEFAULT_ATTRIBUTE_BUILDER
-            .createAttribute(AjpMessageFilter.class + ".parsingStateAttribute", new NullaryFunction<ParsingState>() {
+            .createAttribute(AjpMessageFilter.class + ".parsingStateAttribute", new Supplier<ParsingState>() {
 
                 @Override
-                public ParsingState evaluate() {
+                public ParsingState get() {
                     return new ParsingState();
                 }
             });
diff --git a/modules/http-ajp/src/test/java/org/glassfish/grizzly/http/ajp/AjpClientMessageFilter.java b/modules/http-ajp/src/test/java/org/glassfish/grizzly/http/ajp/AjpClientMessageFilter.java
index 909dce4e64..c5c7edb73c 100644
--- a/modules/http-ajp/src/test/java/org/glassfish/grizzly/http/ajp/AjpClientMessageFilter.java
+++ b/modules/http-ajp/src/test/java/org/glassfish/grizzly/http/ajp/AjpClientMessageFilter.java
@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 
+import java.util.function.Supplier;
 import org.glassfish.grizzly.Buffer;
 import org.glassfish.grizzly.Connection;
 import org.glassfish.grizzly.Grizzly;
@@ -25,7 +26,6 @@
 import org.glassfish.grizzly.filterchain.BaseFilter;
 import org.glassfish.grizzly.filterchain.FilterChainContext;
 import org.glassfish.grizzly.filterchain.NextAction;
-import org.glassfish.grizzly.utils.NullaryFunction;
 
 /**
  * Client side AJP filter, which deserializes AJP message by parsing magic bytes and message length.
@@ -34,10 +34,10 @@
  */
 public class AjpClientMessageFilter extends BaseFilter {
     private final Attribute<AjpClientMessageFilter.ParsingState> parsingStateAttribute = Grizzly.DEFAULT_ATTRIBUTE_BUILDER
-            .createAttribute(AjpClientMessageFilter.class + ".parsingStateAttribute", new NullaryFunction<AjpClientMessageFilter.ParsingState>() {
+            .createAttribute(AjpClientMessageFilter.class + ".parsingStateAttribute", new Supplier<ParsingState>() {
 
                 @Override
-                public AjpClientMessageFilter.ParsingState evaluate() {
+                public AjpClientMessageFilter.ParsingState get() {
                     return new AjpClientMessageFilter.ParsingState();
                 }
             });
diff --git a/modules/http-server/pom.xml b/modules/http-server/pom.xml
index 4dcc3a9d0a..ab0ee756b1 100644
--- a/modules/http-server/pom.xml
+++ b/modules/http-server/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/http-server/src/main/java/module-info.java b/modules/http-server/src/main/java/module-info.java
new file mode 100644
index 0000000000..8fb83fa6ee
--- /dev/null
+++ b/modules/http-server/src/main/java/module-info.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+module org.glassfish.grizzly.http.server {
+    
+    exports org.glassfish.grizzly.http.server;
+    exports org.glassfish.grizzly.http.server.accesslog;
+    exports org.glassfish.grizzly.http.server.filecache;
+    exports org.glassfish.grizzly.http.server.http2;
+    exports org.glassfish.grizzly.http.server.io;
+    exports org.glassfish.grizzly.http.server.jmxbase;
+    exports org.glassfish.grizzly.http.server.naming;
+    exports org.glassfish.grizzly.http.server.util;
+
+    opens org.glassfish.grizzly.http.server;
+    opens org.glassfish.grizzly.http.server.accesslog;
+    opens org.glassfish.grizzly.http.server.filecache;
+    opens org.glassfish.grizzly.http.server.http2;
+    opens org.glassfish.grizzly.http.server.io;
+    opens org.glassfish.grizzly.http.server.jmxbase;
+    opens org.glassfish.grizzly.http.server.naming;
+    opens org.glassfish.grizzly.http.server.util;
+    
+    requires java.logging;
+    requires org.glassfish.grizzly.http;
+    requires org.glassfish.grizzly;
+    
+    requires static gmbal;
+    requires static org.glassfish.external.management.api;
+    requires static pfl.basic.tools;
+    requires static pfl.dynamic;
+    requires static pfl.basic;
+    requires static pfl.tf;
+    requires static pfl.tf.tools;
+    requires static org.objectweb.asm;
+    requires static org.objectweb.asm.util;
+    requires static org.objectweb.asm.tree;
+    requires static org.objectweb.asm.tree.analysis;
+    requires static org.objectweb.asm.commons;
+}
diff --git a/modules/http-server/src/main/java/org/glassfish/grizzly/http/server/HttpServerFilter.java b/modules/http-server/src/main/java/org/glassfish/grizzly/http/server/HttpServerFilter.java
index 2ab201038b..879f7305db 100644
--- a/modules/http-server/src/main/java/org/glassfish/grizzly/http/server/HttpServerFilter.java
+++ b/modules/http-server/src/main/java/org/glassfish/grizzly/http/server/HttpServerFilter.java
@@ -325,6 +325,10 @@ private NextAction afterService(final FilterChainContext ctx, final Connection c
 
         final HttpContext context = request.getRequest().getProcessingState().getHttpContext();
 
+        if (request.getRequest().isUpgrade() && !response.getResponse().isUpgrade()) {
+            request.getRequest().setIgnoreContentModifiers(false);
+        }
+
         httpRequestInProgress.remove(context);
         response.finish();
         request.onAfterService();
diff --git a/modules/http-server/src/main/java/org/glassfish/grizzly/http/server/ServerFilterConfiguration.java b/modules/http-server/src/main/java/org/glassfish/grizzly/http/server/ServerFilterConfiguration.java
index 21a7d3729c..0050d8d302 100644
--- a/modules/http-server/src/main/java/org/glassfish/grizzly/http/server/ServerFilterConfiguration.java
+++ b/modules/http-server/src/main/java/org/glassfish/grizzly/http/server/ServerFilterConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -19,7 +19,6 @@
 import java.nio.charset.Charset;
 
 import org.glassfish.grizzly.Grizzly;
-import org.glassfish.grizzly.utils.JdkVersion;
 
 /**
  * {@link HttpServerFilter} configuration.
@@ -482,7 +481,7 @@ public void setSessionManager(SessionManager sessionManager) {
 
     private void configureSendFileSupport() {
 
-        if (System.getProperty("os.name").equalsIgnoreCase("linux") && !linuxSendFileSupported() || System.getProperty("os.name").equalsIgnoreCase("HP-UX")) {
+        if (System.getProperty("os.name").equalsIgnoreCase("HP-UX")) {
             sendFileEnabled = false;
         }
 
@@ -493,10 +492,4 @@ private void configureSendFileSupport() {
 
     }
 
-    private static boolean linuxSendFileSupported() {
-        JdkVersion jdkVersion = JdkVersion.getJdkVersion();
-        JdkVersion minimumVersion = JdkVersion.parseVersion("1.6.0_18");
-        return minimumVersion.compareTo(jdkVersion) <= 0;
-    }
-
 }
diff --git a/modules/http-server/src/main/java/org/glassfish/grizzly/http/server/filecache/FileCache.java b/modules/http-server/src/main/java/org/glassfish/grizzly/http/server/filecache/FileCache.java
index 9ba56eb32a..81a505e906 100644
--- a/modules/http-server/src/main/java/org/glassfish/grizzly/http/server/filecache/FileCache.java
+++ b/modules/http-server/src/main/java/org/glassfish/grizzly/http/server/filecache/FileCache.java
@@ -25,6 +25,7 @@
 import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
+import java.nio.file.Files;
 import java.util.StringTokenizer;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -599,7 +600,7 @@ public void setFileSendEnabled(boolean fileSendEnabled) {
      */
     protected void compressFile(final FileCacheEntry entry) {
         try {
-            final File tmpCompressedFile = File.createTempFile(String.valueOf(entry.plainFile.hashCode()), ".tmpzip", compressedFilesFolder);
+            final File tmpCompressedFile = Files.createTempFile(compressedFilesFolder.toPath(), String.valueOf(entry.plainFile.hashCode()), ".tmpzip").toFile();
             tmpCompressedFile.deleteOnExit();
 
             InputStream in = null;
diff --git a/modules/http-server/src/test/java/org/glassfish/grizzly/http/server/FileCacheTest.java b/modules/http-server/src/test/java/org/glassfish/grizzly/http/server/FileCacheTest.java
index 9502bf7cbf..06456a5719 100644
--- a/modules/http-server/src/test/java/org/glassfish/grizzly/http/server/FileCacheTest.java
+++ b/modules/http-server/src/test/java/org/glassfish/grizzly/http/server/FileCacheTest.java
@@ -28,6 +28,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.nio.file.Files;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -965,7 +966,7 @@ private static String convertToDate(final long date) {
     }
 
     private static File createTempFile() throws IOException {
-        final File f = File.createTempFile("grizzly-file-cache", ".txt");
+        final File f = Files.createTempFile("grizzly-file-cache", ".txt").toFile();
         f.deleteOnExit();
         FileOutputStream out = null;
         try {
diff --git a/modules/http-server/src/test/java/org/glassfish/grizzly/http/server/SendFileTest.java b/modules/http-server/src/test/java/org/glassfish/grizzly/http/server/SendFileTest.java
index 092af15fba..4ceef994cf 100644
--- a/modules/http-server/src/test/java/org/glassfish/grizzly/http/server/SendFileTest.java
+++ b/modules/http-server/src/test/java/org/glassfish/grizzly/http/server/SendFileTest.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.math.BigInteger;
 import java.nio.channels.FileChannel;
+import java.nio.file.Files;
 import java.security.MessageDigest;
 import java.util.Random;
 import java.util.concurrent.Executors;
@@ -558,7 +559,7 @@ private static File generateTempFile(final int size) throws IOException {
     }
 
     private static File generateTempFile(final int size, final String ext) throws IOException {
-        final File f = File.createTempFile("grizzly-temp-" + size, "." + ext);
+        final File f = Files.createTempFile("grizzly-temp-" + size, "." + ext).toFile();
         Random r = new Random();
         byte[] data = new byte[8192];
         r.nextBytes(data);
diff --git a/modules/http-server/src/test/java/org/glassfish/grizzly/http/server/StaticHttpHandlerTest.java b/modules/http-server/src/test/java/org/glassfish/grizzly/http/server/StaticHttpHandlerTest.java
index 0d22a05318..7865a8097e 100644
--- a/modules/http-server/src/test/java/org/glassfish/grizzly/http/server/StaticHttpHandlerTest.java
+++ b/modules/http-server/src/test/java/org/glassfish/grizzly/http/server/StaticHttpHandlerTest.java
@@ -319,7 +319,7 @@ private static String getSystemTmpDir() {
     }
 
     private static File generateTempFile(final int size) throws IOException {
-        final File f = File.createTempFile("grizzly-temp-" + size, ".tmp2");
+        final File f = Files.createTempFile("grizzly-temp-" + size, ".tmp2").toFile();
         Random r = new Random();
         byte[] data = new byte[8192];
         r.nextBytes(data);
diff --git a/modules/http-servlet/pom.xml b/modules/http-servlet/pom.xml
index f4c10303ef..642793a350 100755
--- a/modules/http-servlet/pom.xml
+++ b/modules/http-servlet/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
     <name>grizzly-http-servlet</name>
 
     <properties>
-        <jersey-version>3.0.3</jersey-version>
+        <jersey-version>3.1.3</jersey-version>
         <maven.compiler.argument>-Xlint:unchecked,-deprecation,fallthrough,finally,cast,dep-ann,empty,overrides</maven.compiler.argument>
     </properties>
 
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
-            <version>3.0.0</version>
+            <version>3.1.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -75,7 +75,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <useModulePath>false</useModulePath>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/modules/http-servlet/src/main/java/module-info.java b/modules/http-servlet/src/main/java/module-info.java
new file mode 100644
index 0000000000..f6f8237d2b
--- /dev/null
+++ b/modules/http-servlet/src/main/java/module-info.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+module org.glassfish.grizzly.servlet {
+
+    exports org.glassfish.grizzly.servlet;
+    
+    opens org.glassfish.grizzly.servlet;
+    
+    requires static jakarta.servlet;
+    requires java.logging;
+    requires org.glassfish.grizzly.http.server;
+    requires org.glassfish.grizzly.http;
+    requires org.glassfish.grizzly;
+}
diff --git a/modules/http/pom.xml b/modules/http/pom.xml
index 199653db2c..57d69fcee0 100644
--- a/modules/http/pom.xml
+++ b/modules/http/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -63,7 +63,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/modules/http/src/main/java/module-info.java b/modules/http/src/main/java/module-info.java
new file mode 100644
index 0000000000..3cb29b3c12
--- /dev/null
+++ b/modules/http/src/main/java/module-info.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018 Payara Services Ltd.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+module org.glassfish.grizzly.http {
+    
+    exports org.glassfish.grizzly.http;
+    exports org.glassfish.grizzly.http.io;
+    exports org.glassfish.grizzly.http.util;
+    
+    opens org.glassfish.grizzly.http;
+    opens org.glassfish.grizzly.http.io;
+    opens org.glassfish.grizzly.http.util;
+
+    requires java.logging;
+    requires org.glassfish.grizzly;
+}
diff --git a/modules/http/src/main/java/org/glassfish/grizzly/http/GZipContentEncoding.java b/modules/http/src/main/java/org/glassfish/grizzly/http/GZipContentEncoding.java
index db20a8bca9..1448c29d17 100644
--- a/modules/http/src/main/java/org/glassfish/grizzly/http/GZipContentEncoding.java
+++ b/modules/http/src/main/java/org/glassfish/grizzly/http/GZipContentEncoding.java
@@ -52,7 +52,7 @@ public GZipContentEncoding() {
 
     /**
      * Construct <tt>GZipContentEncoding</tt> using specific buffer sizes.
-     * 
+     *
      * @param inBufferSize input buffer size
      * @param outBufferSize output buffer size
      */
diff --git a/modules/http2/pom.xml b/modules/http2/pom.xml
index 071d37d631..398a2b77c7 100644
--- a/modules/http2/pom.xml
+++ b/modules/http2/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -110,6 +110,7 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <useModulePath>false</useModulePath>
                     <argLine>-XX:+HeapDumpOnOutOfMemoryError ${bootClasspath}</argLine>
                 </configuration>
             </plugin>
diff --git a/modules/http2/src/main/java/module-info.java b/modules/http2/src/main/java/module-info.java
new file mode 100644
index 0000000000..b538312b40
--- /dev/null
+++ b/modules/http2/src/main/java/module-info.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+module org.glassfish.grizzly.http2 {
+
+    exports org.glassfish.grizzly.http2;
+    exports org.glassfish.grizzly.http2.frames;
+    exports org.glassfish.grizzly.http2.hpack;
+    exports org.glassfish.grizzly.http2.utils;
+
+    opens org.glassfish.grizzly.http2;
+    opens org.glassfish.grizzly.http2.frames;
+    opens org.glassfish.grizzly.http2.hpack;
+    opens org.glassfish.grizzly.http2.utils;
+    
+    requires static grizzly.npn.api;
+    requires java.logging;
+    requires org.glassfish.grizzly.http;
+    requires org.glassfish.grizzly;
+    requires org.glassfish.grizzly.http.server;
+}
diff --git a/modules/http2/src/main/java/org/glassfish/grizzly/http2/Http2Session.java b/modules/http2/src/main/java/org/glassfish/grizzly/http2/Http2Session.java
index 737321fa23..90dfc2327f 100644
--- a/modules/http2/src/main/java/org/glassfish/grizzly/http2/Http2Session.java
+++ b/modules/http2/src/main/java/org/glassfish/grizzly/http2/Http2Session.java
@@ -30,6 +30,7 @@
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -77,7 +78,6 @@
 import org.glassfish.grizzly.ssl.SSLBaseFilter;
 import org.glassfish.grizzly.utils.Futures;
 import org.glassfish.grizzly.utils.Holder;
-import org.glassfish.grizzly.utils.NullaryFunction;
 
 /**
  * The HTTP2 session abstraction.
@@ -207,7 +207,7 @@ public Http2Session(final Connection<?> connection, final boolean isServer, fina
             this.lastPeerStreamId = 0;
         }
 
-        this.addressHolder = Holder.lazyHolder((NullaryFunction<Object>) () -> connection.getPeerAddress());
+        this.addressHolder = Holder.lazyHolder(() -> connection.getPeerAddress());
 
         connection.addCloseListener(new ConnectionCloseListener());
 
diff --git a/modules/http2/src/test/java/org/glassfish/grizzly/http2/FileCacheTest.java b/modules/http2/src/test/java/org/glassfish/grizzly/http2/FileCacheTest.java
index d694a0e0f9..91df6eeaf6 100644
--- a/modules/http2/src/test/java/org/glassfish/grizzly/http2/FileCacheTest.java
+++ b/modules/http2/src/test/java/org/glassfish/grizzly/http2/FileCacheTest.java
@@ -25,6 +25,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Writer;
+import java.nio.file.Files;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Date;
@@ -400,7 +401,7 @@ private static String convertToDate(final long date) {
     }
 
     private static File createTempFile() throws IOException {
-        final File f = File.createTempFile("grizzly-file-cache", ".txt");
+        final File f = Files.createTempFile("grizzly-file-cache", ".txt").toFile();
         f.deleteOnExit();
         FileOutputStream out = null;
         try {
diff --git a/modules/monitoring/grizzly/pom.xml b/modules/monitoring/grizzly/pom.xml
index c9a6d67216..ab6cdb6aed 100644
--- a/modules/monitoring/grizzly/pom.xml
+++ b/modules/monitoring/grizzly/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
@@ -68,7 +68,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
@@ -103,6 +103,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>add-source</id>
diff --git a/modules/monitoring/http-server/pom.xml b/modules/monitoring/http-server/pom.xml
index f4000abbee..ec61d79b4a 100644
--- a/modules/monitoring/http-server/pom.xml
+++ b/modules/monitoring/http-server/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
@@ -68,7 +68,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
@@ -101,6 +101,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>add-source</id>
diff --git a/modules/monitoring/http/pom.xml b/modules/monitoring/http/pom.xml
index af8cb8edf2..d284986dfa 100644
--- a/modules/monitoring/http/pom.xml
+++ b/modules/monitoring/http/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
@@ -68,7 +68,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
@@ -100,6 +100,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>add-source</id>
diff --git a/modules/monitoring/pom.xml b/modules/monitoring/pom.xml
index 7d431ba274..c04bf8d9b2 100644
--- a/modules/monitoring/pom.xml
+++ b/modules/monitoring/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/pom.xml b/modules/pom.xml
index 62ce3c4ef3..8bdbfa9a28 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
     </parent>
 
     <artifactId>grizzly-modules</artifactId>
diff --git a/modules/portunif/pom.xml b/modules/portunif/pom.xml
index f82cf4a0a3..a8c0382a83 100644
--- a/modules/portunif/pom.xml
+++ b/modules/portunif/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -62,7 +62,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/modules/portunif/src/main/java/module-info.java b/modules/portunif/src/main/java/module-info.java
new file mode 100644
index 0000000000..808891b5b4
--- /dev/null
+++ b/modules/portunif/src/main/java/module-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+module org.glassfish.grizzly.portunif {
+
+    exports org.glassfish.grizzly.portunif;
+    exports org.glassfish.grizzly.portunif.finders;
+
+    opens org.glassfish.grizzly.portunif;
+    opens org.glassfish.grizzly.portunif.finders;
+    
+    requires java.logging;
+    requires org.glassfish.grizzly;
+}
diff --git a/modules/portunif/src/test/java/org/glassfish/grizzly/portunif/AsyncPUTest.java b/modules/portunif/src/test/java/org/glassfish/grizzly/portunif/AsyncPUTest.java
index 29a8ca322d..803f56b51d 100644
--- a/modules/portunif/src/test/java/org/glassfish/grizzly/portunif/AsyncPUTest.java
+++ b/modules/portunif/src/test/java/org/glassfish/grizzly/portunif/AsyncPUTest.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
 import java.util.logging.Logger;
 
 import org.glassfish.grizzly.Connection;
@@ -43,7 +44,6 @@
 import org.glassfish.grizzly.nio.transport.TCPNIOConnectorHandler;
 import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
 import org.glassfish.grizzly.nio.transport.TCPNIOTransportBuilder;
-import org.glassfish.grizzly.utils.NullaryFunction;
 import org.glassfish.grizzly.utils.StringFilter;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -247,10 +247,10 @@ public void run() {
 
     private static final class ClientResultFilter extends BaseFilter {
         private static final Attribute<AtomicInteger> responseCounterAttr = Grizzly.DEFAULT_ATTRIBUTE_BUILDER
-                .createAttribute(ClientResultFilter.class.getName() + ".responseCounter", new NullaryFunction<AtomicInteger>() {
+                .createAttribute(ClientResultFilter.class.getName() + ".responseCounter", new Supplier<AtomicInteger>() {
 
                     @Override
-                    public AtomicInteger evaluate() {
+                    public AtomicInteger get() {
                         return new AtomicInteger();
                     }
                 });
@@ -285,10 +285,10 @@ public NextAction handleRead(final FilterChainContext ctx) throws IOException {
 
     private static class StringDuplicatorFilter extends BaseFilter {
         private static final Attribute<AtomicInteger> duplicationsCounterAttribute = Grizzly.DEFAULT_ATTRIBUTE_BUILDER
-                .createAttribute(StringDuplicatorFilter.class.getName() + ".duplicationsCounterAttribute", new NullaryFunction<AtomicInteger>() {
+                .createAttribute(StringDuplicatorFilter.class.getName() + ".duplicationsCounterAttribute", new Supplier<AtomicInteger>() {
 
                     @Override
-                    public AtomicInteger evaluate() {
+                    public AtomicInteger get() {
                         return new AtomicInteger();
                     }
                 });
diff --git a/modules/websockets/pom.xml b/modules/websockets/pom.xml
index 65175570eb..cb2c432dd4 100644
--- a/modules/websockets/pom.xml
+++ b/modules/websockets/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -83,7 +83,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <useModulePath>false</useModulePath>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/modules/websockets/src/main/java/module-info.java b/modules/websockets/src/main/java/module-info.java
new file mode 100644
index 0000000000..fa162b5c40
--- /dev/null
+++ b/modules/websockets/src/main/java/module-info.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+module org.glassfish.grizzly.websockets {
+    
+    exports org.glassfish.grizzly.websockets;
+    exports org.glassfish.grizzly.websockets.frametypes;
+    exports org.glassfish.grizzly.websockets.glassfish;
+    exports org.glassfish.grizzly.websockets.rfc6455;
+    
+    opens org.glassfish.grizzly.websockets;
+    opens org.glassfish.grizzly.websockets.frametypes;
+    opens org.glassfish.grizzly.websockets.glassfish;
+    opens org.glassfish.grizzly.websockets.rfc6455;
+
+    requires static jakarta.servlet;
+    requires java.logging;
+    requires org.glassfish.grizzly;
+    requires org.glassfish.grizzly.http;
+    requires org.glassfish.grizzly.http.server;
+    requires org.glassfish.grizzly.servlet;
+}
diff --git a/pom.xml b/pom.xml
index 4278a78db5..a3580ab82b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,12 +24,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-bom</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>boms/bom/pom.xml</relativePath>
     </parent>
 
     <artifactId>grizzly-project</artifactId>
-    <version>4.0.0.payara-p2-SNAPSHOT</version> <!-- Version must be repeated so versions-maven-plugin:set works correctly -->
+    <version>4.0.2.payara-p1-SNAPSHOT</version>
+    <!-- Version must be repeated so versions-maven-plugin:set works correctly -->
     <packaging>pom</packaging>
 
     <name>grizzly-project</name>
@@ -174,7 +175,6 @@
         </dependency>
     </dependencies>
 
-
     <build>
         <defaultGoal>install</defaultGoal>
         <directory>target</directory>
@@ -189,32 +189,33 @@
                 <directory>src/test/resources/</directory>
             </testResource>
         </testResources>
-
         <pluginManagement>
             <plugins>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.9.0</version>
+                    <version>3.11.0</version>
                     <configuration>
-                        <source>11</source>
-                        <target>11</target>
+                        <release>11</release>
                         <compilerArgument>-Xlint:unchecked,deprecation,fallthrough,finally,cast,dep-ann,empty,overrides</compilerArgument>
                     </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>5.1.2</version>
+                    <version>5.1.9</version>
+                    <configuration>
+                        <instructions>
+                            <_noimportjava>true</_noimportjava>
+                            <_runee>JavaSE-11</_runee>
+                        </instructions>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
-
         <plugins>
             <!-- Sets minimal Maven version to 3.6.3 -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>
@@ -235,10 +236,8 @@
                 </executions>
             </plugin>
 
-            <plugin><inherited>true</inherited>
-                <groupId>org.apache.maven.plugins</groupId>
+            <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -251,7 +250,7 @@
                 </configuration>
             </plugin>
 
-            <plugin><inherited>true</inherited>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
                 <executions>
@@ -269,7 +268,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
-                    <javadocVersion>1.8</javadocVersion>
+                    <doclint>none</doclint>
                     <notimestamp>true</notimestamp>
                     <splitindex>true</splitindex>
                     <doctitle>${project.name} ${project.version}</doctitle>
diff --git a/samples/connection-pool-samples/pom.xml b/samples/connection-pool-samples/pom.xml
index 051a4e56d0..d54bfc6cd0 100755
--- a/samples/connection-pool-samples/pom.xml
+++ b/samples/connection-pool-samples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -43,7 +43,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/samples/framework-samples/pom.xml b/samples/framework-samples/pom.xml
index 9756796e48..c1dc518bfd 100755
--- a/samples/framework-samples/pom.xml
+++ b/samples/framework-samples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -53,7 +53,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/samples/framework-samples/src/main/java/org/glassfish/grizzly/samples/udpmulticast/MulticastChat.java b/samples/framework-samples/src/main/java/org/glassfish/grizzly/samples/udpmulticast/MulticastChat.java
index 2d4857d566..4bb5804b02 100644
--- a/samples/framework-samples/src/main/java/org/glassfish/grizzly/samples/udpmulticast/MulticastChat.java
+++ b/samples/framework-samples/src/main/java/org/glassfish/grizzly/samples/udpmulticast/MulticastChat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -25,7 +25,6 @@
 import org.glassfish.grizzly.nio.transport.UDPNIOConnection;
 import org.glassfish.grizzly.nio.transport.UDPNIOTransport;
 import org.glassfish.grizzly.nio.transport.UDPNIOTransportBuilder;
-import org.glassfish.grizzly.utils.JdkVersion;
 import org.glassfish.grizzly.utils.StringFilter;
 
 /**
@@ -96,14 +95,6 @@ public static void main(String[] args) throws Exception {
     }
 
     private void run() throws Exception {
-        // Check if current JDK version is higher or equals to 1.7.0
-        final JdkVersion jdkVersion = JdkVersion.getJdkVersion();
-        final JdkVersion minimumVersion = JdkVersion.parseVersion("1.7.0");
-
-        if (minimumVersion.compareTo(jdkVersion) > 0) { // If JDK version is >= 1.7
-            System.out.println("Sample requires JDK 1.7+");
-            System.exit(1);
-        }
 
         // Build FilterChain to parse incoming UDP packets and print to System.out
         final FilterChain filterChain = FilterChainBuilder.stateless()
diff --git a/samples/http-ajp-samples/pom.xml b/samples/http-ajp-samples/pom.xml
index aa7b39303d..ec691bd38c 100644
--- a/samples/http-ajp-samples/pom.xml
+++ b/samples/http-ajp-samples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -43,7 +43,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/samples/http-jaxws-samples/pom.xml b/samples/http-jaxws-samples/pom.xml
index 64ff85aef2..c2016e50d9 100644
--- a/samples/http-jaxws-samples/pom.xml
+++ b/samples/http-jaxws-samples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -32,17 +32,16 @@
         <dependency>
             <groupId>com.sun.xml.ws</groupId>
             <artifactId>jaxws-rt</artifactId>
-            <version>3.0.1</version>
+            <version>4.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.grizzly</groupId>
             <artifactId>grizzly-http-server-jaxws</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>3.0.1</version>
+            <version>4.0.1</version>
         </dependency>
     </dependencies>
 
@@ -52,9 +51,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkMode>always</forkMode>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
diff --git a/samples/http-multipart-samples/pom.xml b/samples/http-multipart-samples/pom.xml
index 7292f6a7bd..ab9034cf84 100644
--- a/samples/http-multipart-samples/pom.xml
+++ b/samples/http-multipart-samples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -53,7 +53,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/samples/http-samples/pom.xml b/samples/http-samples/pom.xml
index d5ebe6ca76..18ccdecaa4 100755
--- a/samples/http-samples/pom.xml
+++ b/samples/http-samples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -53,7 +53,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/samples/http-server-samples/pom.xml b/samples/http-server-samples/pom.xml
index df28f26aa8..d790d59de2 100644
--- a/samples/http-server-samples/pom.xml
+++ b/samples/http-server-samples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -53,7 +53,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/samples/pom.xml b/samples/pom.xml
index 26016d7734..811482af18 100755
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/samples/portunif/pom.xml b/samples/portunif/pom.xml
index f5801806f6..f8fc7f9666 100644
--- a/samples/portunif/pom.xml
+++ b/samples/portunif/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -60,7 +60,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/samples/tls-sni-samples/pom.xml b/samples/tls-sni-samples/pom.xml
index d50926c99b..32bab42626 100644
--- a/samples/tls-sni-samples/pom.xml
+++ b/samples/tls-sni-samples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2021 Contributors to the Eclipse Foundation.
+    Copyright 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p2-SNAPSHOT</version>
+        <version>4.0.2.payara-p1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -56,7 +56,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>always</forkMode>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>