diff --git a/Jenkinsfile b/Jenkinsfile
index 9b2862f5a62..469a53a1043 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -198,10 +198,10 @@ pipeline {
 //                         sh "rm -rf /tmp/cargo*"
 //
 //                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
-//                         sh """mvn -B -V -ff -e clean install --strict-checksums -Dsurefire.useFile=false \
-//                         -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/lib/security/cacerts \
-//                         -Djavax.xml.accessExternalSchema=all -Dpayara.version=${pom.version} \
-//                         -Ppayara-server-remote -DtrimStackTrace=false"""
+//                         sh  """mvn -B -V -ff -e clean verify --strict-checksums -Dsurefire.useFile=false \
+//                          -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/lib/security/cacerts \
+//                          -Djavax.xml.accessExternalSchema=all \
+//                          -Ppayara-server-remote -DtrimStackTrace=false"""
 //                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Ran test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 //                     }
 //                     post {
diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java
index aee71ac32ad..a258e4fedd3 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright 2018-2022 Payara Foundation and/or affiliates
+// Portions Copyright 2018-2024 Payara Foundation and/or affiliates
 
 /*
  * UtilHandlers.java
@@ -1164,4 +1164,16 @@ public static String escapePropertyValue(String str){
     }
 
     private static final String PATH_SEPARATOR = "${path.separator}";
+
+    @Handler(id = "gf.sanitiseProperty",
+            input = {
+                    @HandlerInput(name = "systemProperty", type = String.class, required = true)
+            },
+            output = {
+                    @HandlerOutput(name = "result", type = String.class)
+            }
+    )
+    public static void sanitiseProperty(HandlerContext handlerCtx) {
+        handlerCtx.setOutputValue("result", escapePropertyValue(((String)handlerCtx.getInputValue("systemProperty"))));
+    }
 }
diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java
index 4d5a270076d..1a2e143cba2 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2017-2021] [Payara Foundation and/or its affiliates]
+// Portions Copyright [2017-2024] [Payara Foundation and/or its affiliates]
 
 package org.glassfish.admingui.common.util;
 
@@ -190,12 +190,12 @@ public static Map<String, Object> restRequest(String endpoint, Map<String, Objec
         Logger logger = GuiUtil.getLogger();
         if (logger.isLoggable(Level.FINEST)) {
             Map<String, Object> maskedAttr = maskOffPassword(attrs);
-            logger.log(Level.FINEST,
-                       GuiUtil.getCommonMessage("LOG_REST_REQUEST_INFO",
-                                                new Object[]{
-                        endpoint,
-                        (useData && "post".equals(method)) ? data : attrs, method
-                    }));
+            logger.log(Level.FINEST, GuiUtil.getCommonMessage("LOG_REST_REQUEST_INFO",
+                new Object[]{
+                    endpoint,
+                    (useData && "post".equals(method)) ? data : maskedAttr, method
+                })
+            );
         }
 
         // Execute the request...
diff --git a/appserver/admingui/common/src/main/resources/configuration/sysInstanceValues.jsf b/appserver/admingui/common/src/main/resources/configuration/sysInstanceValues.jsf
index b60e08bbd40..e88891fb328 100644
--- a/appserver/admingui/common/src/main/resources/configuration/sysInstanceValues.jsf
+++ b/appserver/admingui/common/src/main/resources/configuration/sysInstanceValues.jsf
@@ -38,7 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
-    Portions Copyright [2020] [Payara Foundation and/or its affiliates]
+    Portions Copyright [2020-2024] [Payara Foundation and/or its affiliates]
 -->
 
 <!initPage
@@ -59,8 +59,8 @@
             setPageSessionAttribute(key="selfUrl", value="#{pageSession.parentUrl}/system-properties");
             gf.restRequest(endpoint="#{sessionScope.REST_URL}/configs/config/#{pageSession.configName}/system-property/#{pageSession.propName}", 
             method="get", result="#{requestScope.result}");
-            setPageSessionAttribute(key="defaultValue", value="#{requestScope.result.data.extraProperties.entity.value}");
-
+            gf.sanitiseProperty(systemProperty="#{requestScope.result.data.extraProperties.entity.value}", result="#{currentVal}");
+            setPageSessionAttribute(key="defaultValue", value="#{currentVal}");
             // Get instance to cluster mapping
             createMap(result="#{requestScope.instanceMapping}");
             gf.restRequest(endpoint="#{sessionScope.REST_URL}/clusters/cluster", method="get", result="#{requestScope.clusterResult}");
diff --git a/appserver/admingui/common/src/main/resources/configuration/systemProperties.jsf b/appserver/admingui/common/src/main/resources/configuration/systemProperties.jsf
index ef2ee7663ba..c44eaa59343 100644
--- a/appserver/admingui/common/src/main/resources/configuration/systemProperties.jsf
+++ b/appserver/admingui/common/src/main/resources/configuration/systemProperties.jsf
@@ -38,6 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
+    Portions Copyright [2018-2024] [Payara Foundation and/or its affiliates]
 -->
 
 <sun:table id="sysPropsTable" style="padding: 10pt" title="$resource{i18n.common.AdditionalProperties}"
@@ -62,7 +63,8 @@
         foreach(var="prop", list="#{pageSession.sysProps}") {
             createMap(result="#{row}");
             mapPut(map="#{row}", key="name", value="#{prop.name}");
-            mapPut(map="#{row}", key="currentValue", value="#{!empty prop.value ? prop.value : prop.defaultValue}");
+            gf.sanitiseProperty(systemProperty="#{!empty prop.value ? prop.value : prop.defaultValue}", result="#{currentVal}");
+            mapPut(map="#{row}", key="currentValue", value="#{currentVal}");
             mapPut(map="#{row}", key="overrideValue", value="#{!empty prop.value ? prop.value : ''}");
             listAdd(list="#{pageSession.tableList}", value="#{row}");
         }
diff --git a/appserver/admingui/corba/src/main/resources/iiopServerPageNode.jsf b/appserver/admingui/corba/src/main/resources/iiopServerPageNode.jsf
index 78785f0a6b4..481167b4f93 100644
--- a/appserver/admingui/corba/src/main/resources/iiopServerPageNode.jsf
+++ b/appserver/admingui/corba/src/main/resources/iiopServerPageNode.jsf
@@ -38,6 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
+    Portions Copyright [2018-2024] [Payara Foundation and/or its affiliates]
 -->
 
 <!-- iiopServerPageNode.jsf -->
@@ -59,6 +60,8 @@
             listAdd(value="#{pageSession.iiopListenerAttrs.data.extraProperties.entity['port']}" list="#{pageSession.iiopPortsList}");
         }
         gf.resolveTokens(tokens="#{pageSession.iiopPortsList}" endPoint="#{sessionScope.REST_URL}/servers/server/#{pageSession.instanceName}" resolvedTokens="#{pageSession.iiopResolvedPortsList}");
-        convertListToCommaString(list="#{pageSession.iiopResolvedPortsList}" commaString="#{pageSession.iiopPorts}");
+        convertListToCommaString(list="#{pageSession.iiopResolvedPortsList}" commaString="#{iiopPorts}");
+        gf.sanitiseProperty(systemProperty="#{iiopPorts}", result="#{pageSession.iiopPorts}");
+
     />
 </sun:property> 
diff --git a/appserver/admingui/payara-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java b/appserver/admingui/payara-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java
index 3ba9ea96d98..6afcda7ddf0 100644
--- a/appserver/admingui/payara-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java
+++ b/appserver/admingui/payara-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java
@@ -1,4 +1,4 @@
-/* 
+/*
  *     Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved.
  * 
  *     The contents of this file are subject to the terms of either the GNU
@@ -164,13 +164,14 @@ public static void sendAsadminCommandToSelectedInstances(HandlerContext handlerC
             command = splitCommand[0];
 
             // Convert the parameters into a space-separated string
-            String parameters = "";
+            String parameters;
+            StringBuilder paramBuilder = new StringBuilder();
             for (int i = 1; i < splitCommand.length; i++) {
-                parameters += splitCommand[i] + " ";
+                paramBuilder.append(splitCommand[i]).append(" ");
             }
 
             // Remove any trailing spaces
-            parameters = parameters.trim();
+            parameters = paramBuilder.toString().trim();
 
             // Get the parameters from each row, and send the asadmin command
             for (Map row : selectedRows) {
diff --git a/appserver/admingui/web/src/main/resources/configuration/httpListenerTabs.inc b/appserver/admingui/web/src/main/resources/configuration/httpListenerTabs.inc
index bac61847017..b9eaecef73a 100644
--- a/appserver/admingui/web/src/main/resources/configuration/httpListenerTabs.inc
+++ b/appserver/admingui/web/src/main/resources/configuration/httpListenerTabs.inc
@@ -39,6 +39,7 @@
     holder.
 
 -->
+<!-- Portions Copyright [2024] [Payara Foundation and/or its affiliates] -->
 
 <sun:tabSet id="listenerTabs" immediate="$boolean{true}" selected="#{sessionScope.httpListenerTabs}">
     <sun:tab id="generalTab" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.networkListener.listenerTab}" toolTip="$resource{i18n_web.grizzly.networkListener.listenerTab} Tab" >
@@ -47,7 +48,10 @@
         gf.redirect(page="#{request.contextPath}/web/configuration/httpListenerEdit.jsf?configName=#{configName}&name=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");
         />
     </sun:tab>
-    <sun:tab id="sslTab" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+    <sun:tab id="sslTab" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" rendered="#{pageSession.protocolMap['securityEnabled']}">
+        <!beforeCreate
+            gf.getEntityAttrs(endpoint="#{sessionScope.REST_URL}/configs/config/#{configName}/network-config/protocols/protocol/#{pageSession.encodedProtocolName}" valueMap="#{pageSession.protocolMap}");
+        />
         <!command
         setSessionAttribute(key="httpListenerTabs" value="sslTab");
         gf.redirect(page="#{request.contextPath}/web/configuration/httpListenerSSL.jsf?configName=#{configName}&name=#{pageSession.encodedProtocolName}&listenerName=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");
diff --git a/appserver/admingui/web/src/main/resources/grizzly/listenerTabs.inc b/appserver/admingui/web/src/main/resources/grizzly/listenerTabs.inc
index 25c56e3e25c..f9f5944eb3d 100644
--- a/appserver/admingui/web/src/main/resources/grizzly/listenerTabs.inc
+++ b/appserver/admingui/web/src/main/resources/grizzly/listenerTabs.inc
@@ -39,6 +39,7 @@
     holder.
 
 -->
+<!-- Portions Copyright [2024] [Payara Foundation and/or its affiliates] -->
 
 <!-- grizzly/listenerTabs.inc -->
 
@@ -49,7 +50,10 @@
         gf.redirect(page="#{request.contextPath}/web/grizzly/networkListenerEdit.jsf?configName=#{configName}&name=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");
         />
     </sun:tab>
-    <sun:tab id="sslTab" rendered="#{showSSLTab}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+    <sun:tab id="sslTab" rendered="#{showSSLTab and empty pageSession.protocolMap['securityEnabled'] ? true : pageSession.protocolMap['securityEnabled']}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+        <!beforeCreate
+            gf.getEntityAttrs(endpoint="#{sessionScope.REST_URL}/configs/config/#{configName}/network-config/protocols/protocol/#{pageSession.encodedName}" valueMap="#{pageSession.protocolMap}");
+        />
         <!command
         setSessionAttribute(key="listenerTabs" value="sslTab");
         gf.redirect(page="#{request.contextPath}/web/grizzly/listenerSSLEdit.jsf?configName=#{configName}&name=#{pageSession.encodedProtocolName}&listenerName=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");
diff --git a/appserver/admingui/web/src/main/resources/grizzly/protocolTabs.inc b/appserver/admingui/web/src/main/resources/grizzly/protocolTabs.inc
index f939c297f5a..2c3516ae139 100644
--- a/appserver/admingui/web/src/main/resources/grizzly/protocolTabs.inc
+++ b/appserver/admingui/web/src/main/resources/grizzly/protocolTabs.inc
@@ -39,6 +39,7 @@
     holder.
 
 -->
+<!-- Portions Copyright [2024] [Payara Foundation and/or its affiliates] -->
 
 <!-- grizzly/protocolTabs.jsf -->
 
@@ -49,7 +50,10 @@
         gf.redirect(page="#{request.contextPath}/web/grizzly/protocolEdit.jsf?configName=#{configName}&name=#{pageSession.encodedName}&cancelTo=#{pageSession.cancelTo}");
         />
     </sun:tab>
-    <sun:tab id="sslTab" rendered="#{showSSLTab}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+    <sun:tab id="sslTab" rendered="#{showSSLTab and empty pageSession.protocolMap['securityEnabled'] ? true : pageSession.protocolMap['securityEnabled']}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+        <!beforeCreate
+            gf.getEntityAttrs(endpoint="#{sessionScope.REST_URL}/configs/config/#{configName}/network-config/protocols/protocol/#{pageSession.encodedName}" valueMap="#{pageSession.protocolMap}");
+        />
         <!command
         setSessionAttribute(key="protocolTabs" value="sslTab");
         gf.redirect(page="#{request.contextPath}/web/grizzly/protocolSSLEdit.jsf?configName=#{configName}&name=#{pageSession.encodedName}&cancelTo=#{pageSession.cancelTo}");
diff --git a/appserver/admingui/web/src/main/resources/serverPageNode.jsf b/appserver/admingui/web/src/main/resources/serverPageNode.jsf
index ab6559143b8..eea135da593 100644
--- a/appserver/admingui/web/src/main/resources/serverPageNode.jsf
+++ b/appserver/admingui/web/src/main/resources/serverPageNode.jsf
@@ -38,7 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
-    Portions Copyright [2018] [Payara Foundation and/or its affiliates]
+    Portions Copyright [2018-2024] [Payara Foundation and/or its affiliates]
 -->
 
 <!-- serverPageNode.jsf -->
@@ -60,6 +60,7 @@
             listAdd(value="#{pageSession.tmpPort}" list="#{pageSession.httpPortsList}");
         }
         gf.resolveTokens(tokens="#{pageSession.httpPortsList}" endPoint="#{sessionScope.REST_URL}/servers/server/#{pageSession.instanceName}" resolvedTokens="#{pageSession.httpResolvedPortsList}");
-        convertListToCommaString(list="#{pageSession.httpResolvedPortsList}" commaString="#{pageSession.httpPorts}");
+        convertListToCommaString(list="#{pageSession.httpResolvedPortsList}" commaString="#{portList}");
+        gf.sanitiseProperty(systemProperty="#{portList}", result="#{pageSession.httpPorts}");
     />
 </sun:property> 
diff --git a/appserver/concurrent/concurrent-impl/pom.xml b/appserver/concurrent/concurrent-impl/pom.xml
index ab09c80149e..8b5deb91b39 100644
--- a/appserver/concurrent/concurrent-impl/pom.xml
+++ b/appserver/concurrent/concurrent-impl/pom.xml
@@ -114,7 +114,7 @@
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>5.3.0</version>
+            <version>5.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/appserver/extras/docker-images/pom.xml b/appserver/extras/docker-images/pom.xml
index ba1156e4659..312af6b21f3 100644
--- a/appserver/extras/docker-images/pom.xml
+++ b/appserver/extras/docker-images/pom.xml
@@ -57,7 +57,7 @@
         <docker.noCache>true</docker.noCache>
 
         <docker.java.repository>azul/zulu-openjdk</docker.java.repository>
-        <docker.jdk21.tag>21.0.3-jdk</docker.jdk21.tag>
+        <docker.jdk21.tag>21.0.4-jdk</docker.jdk21.tag>
 
         <!-- List of platform architectures which we wish to build Docker images for -
                 shouldn't have anything not provided as an option by ${docker.java.repository}.
@@ -87,7 +87,7 @@
                 <plugin>
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.44.0</version>
+                    <version>0.45.0</version>
                     <extensions>true</extensions>
                     <configuration>
                         <verbose>true</verbose>
diff --git a/appserver/extras/docker-images/tests/pom.xml b/appserver/extras/docker-images/tests/pom.xml
index bfd3bfe4fdf..29986487787 100644
--- a/appserver/extras/docker-images/tests/pom.xml
+++ b/appserver/extras/docker-images/tests/pom.xml
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.19.7</version>
+            <version>1.20.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>org.jboss.shrinkwrap.resolver</groupId>
             <artifactId>shrinkwrap-resolver-impl-maven-archive</artifactId>
-            <version>3.3.0</version>
+            <version>3.3.1</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
diff --git a/appserver/jdbc/jdbc-config/pom.xml b/appserver/jdbc/jdbc-config/pom.xml
index 60798b3856c..fb79830a78c 100644
--- a/appserver/jdbc/jdbc-config/pom.xml
+++ b/appserver/jdbc/jdbc-config/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>5.3.0</version>
+            <version>5.4.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/appserver/pom.xml b/appserver/pom.xml
index ee1ac4a36ca..5f0c1fc6db3 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -85,7 +85,7 @@
         <nimbus-jose-jwt.version>9.40</nimbus-jose-jwt.version>
         <accessors-smart.version>2.5.1</accessors-smart.version>
         <json-smart.version>2.5.1</json-smart.version>
-        <reactor-core.version>3.6.8</reactor-core.version>
+        <reactor-core.version>3.6.9</reactor-core.version>
         <reactive-streams.version>1.0.4</reactive-streams.version>
         <jcip-annotations.version>1.0-1</jcip-annotations.version>
         
diff --git a/appserver/tests/fish372-tests/datagrid-tests/pom.xml b/appserver/tests/fish372-tests/datagrid-tests/pom.xml
index 187d8addcff..ac589bfe934 100644
--- a/appserver/tests/fish372-tests/datagrid-tests/pom.xml
+++ b/appserver/tests/fish372-tests/datagrid-tests/pom.xml
@@ -62,7 +62,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.2.5</version>
+        <version>3.5.0</version>
         <configuration>
           <useSystemClassLoader>false</useSystemClassLoader>
           <forkCount>0</forkCount>
@@ -186,7 +186,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>3.3.1</version>
+        <version>3.5.0</version>
         <executions>
           <execution>
             <id>integration-test</id>
diff --git a/appserver/tests/payara-samples/pom.xml b/appserver/tests/payara-samples/pom.xml
index 2188486da03..3bc668ed811 100644
--- a/appserver/tests/payara-samples/pom.xml
+++ b/appserver/tests/payara-samples/pom.xml
@@ -307,7 +307,7 @@
             <dependency>
                 <groupId>org.jboss.shrinkwrap.resolver</groupId>
                 <artifactId>shrinkwrap-resolver-bom</artifactId>
-                <version>3.3.0</version>
+                <version>3.3.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -347,7 +347,7 @@
             <dependency>
                 <groupId>io.smallrye.config</groupId>
                 <artifactId>smallrye-config-repackaged</artifactId>
-                <version>3.9.0</version>
+                <version>3.9.1</version>
                 <classifier>jakartaee9</classifier>
                 <scope>test</scope>
                 <exclusions>
diff --git a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml
index cede7c88824..df8058ac5eb 100644
--- a/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml
+++ b/appserver/tests/payara-samples/repackaged/smallrye-config-repackaged/pom.xml
@@ -47,7 +47,7 @@
     </parent>
     <groupId>io.smallrye.config</groupId>
     <artifactId>smallrye-config-repackaged</artifactId>
-    <version>3.9.0</version>
+    <version>3.9.1</version>
     <name>Payara Samples - Payara - smallrye-config repackaged as a module</name>
 
     <build>
@@ -140,19 +140,19 @@
         <dependency>
             <groupId>io.smallrye.common</groupId>
             <artifactId>smallrye-common-annotation</artifactId>
-            <version>2.5.0</version>
+            <version>2.6.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.smallrye.common</groupId>
             <artifactId>smallrye-common-expression</artifactId>
-            <version>2.5.0</version>
+            <version>2.6.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.smallrye.common</groupId>
             <artifactId>smallrye-common-function</artifactId>
-            <version>1.8.0</version>
+            <version>2.6.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/appserver/tests/payara-samples/samples/cleanboot/pom.xml b/appserver/tests/payara-samples/samples/cleanboot/pom.xml
index f509325bd35..0bed7c77897 100644
--- a/appserver/tests/payara-samples/samples/cleanboot/pom.xml
+++ b/appserver/tests/payara-samples/samples/cleanboot/pom.xml
@@ -41,7 +41,7 @@
     </parent>
 
     <properties>
-      <playwright.version>1.45.0</playwright.version>
+      <playwright.version>1.46.0</playwright.version>
     </properties>
 
 
@@ -80,7 +80,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>3.3.0</version>
+                        <version>3.4.1</version>
                         <executions>
                           <execution>
                             <id>install-playwright-dependencies</id>
diff --git a/appserver/tests/payara-samples/samples/concurrency/pom.xml b/appserver/tests/payara-samples/samples/concurrency/pom.xml
index 33142f6253e..d970dc1730d 100644
--- a/appserver/tests/payara-samples/samples/concurrency/pom.xml
+++ b/appserver/tests/payara-samples/samples/concurrency/pom.xml
@@ -58,10 +58,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <failOnMissingWebXml>false</failOnMissingWebXml>
         <arquillian-bom.version>1.9.1.Final</arquillian-bom.version>
-        <junit-jupiter.version>5.10.3</junit-jupiter.version>
+        <junit-jupiter.version>5.11.0</junit-jupiter.version>
         <arquillian-payara.version>3.0.alpha4</arquillian-payara.version>
         <jakarta-concurrent.version>3.0.3</jakarta-concurrent.version>
-        <shrinkwrap.version>3.3.0</shrinkwrap.version>
+        <shrinkwrap.version>3.3.1</shrinkwrap.version>
     </properties>
 
     <dependencyManagement>
@@ -138,7 +138,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.5</version>
+                <version>3.5.0</version>
             </plugin>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
diff --git a/appserver/tests/payara-samples/samples/reproducers/pom.xml b/appserver/tests/payara-samples/samples/reproducers/pom.xml
index 8f19aa04b40..be377b39bfd 100644
--- a/appserver/tests/payara-samples/samples/reproducers/pom.xml
+++ b/appserver/tests/payara-samples/samples/reproducers/pom.xml
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.13</version>
+            <version>2.0.16</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap.resolver</groupId>
diff --git a/appserver/tests/payara-samples/samples/use-bundled-jsf-primefaces/pom.xml b/appserver/tests/payara-samples/samples/use-bundled-jsf-primefaces/pom.xml
index 6db112e5069..23409d8a5fe 100644
--- a/appserver/tests/payara-samples/samples/use-bundled-jsf-primefaces/pom.xml
+++ b/appserver/tests/payara-samples/samples/use-bundled-jsf-primefaces/pom.xml
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>org.primefaces</groupId>
             <artifactId>primefaces</artifactId>
-            <version>14.0.2</version>
+            <version>14.0.5</version>
             <classifier>jakarta</classifier>
         </dependency>
 
diff --git a/appserver/tests/quicklook/pom.xml b/appserver/tests/quicklook/pom.xml
index 7defb033f2b..2c203d120c8 100644
--- a/appserver/tests/quicklook/pom.xml
+++ b/appserver/tests/quicklook/pom.xml
@@ -205,7 +205,7 @@
                     <dependency>
                         <groupId>commons-codec</groupId>
                         <artifactId>commons-codec</artifactId>
-                        <version>1.3</version>
+                        <version>1.17.1</version>
                     </dependency>
                     <dependency>
                         <groupId>org.testng</groupId>
@@ -231,12 +231,12 @@
                     <dependency>
                         <groupId>org.apache.ant</groupId>
                         <artifactId>ant-junit</artifactId>
-                        <version>1.10.14</version>
+                        <version>1.10.15</version>
                     </dependency>
                     <dependency>
                         <groupId>org.apache.ant</groupId>
                         <artifactId>ant-apache-regexp</artifactId>
-                        <version>1.10.14</version>
+                        <version>1.10.15</version>
                         <scope>runtime</scope>
                     </dependency>
                     <dependency>
diff --git a/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishInjectionProvider.java b/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishInjectionProvider.java
index 6e5922e63de..ac26fd7f7b4 100644
--- a/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishInjectionProvider.java
+++ b/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishInjectionProvider.java
@@ -37,13 +37,14 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
+// Portions Copyright 2024 Payara Foundation and/or its affiliates
 
 package org.glassfish.faces.integration;
 
 import static com.sun.enterprise.web.Constants.DEPLOYMENT_CONTEXT_ATTRIBUTE;
 import static com.sun.enterprise.web.Constants.ENABLE_HA_ATTRIBUTE;
 import static com.sun.enterprise.web.Constants.IS_DISTRIBUTABLE_ATTRIBUTE;
-import static com.sun.faces.config.WebConfiguration.BooleanWebContextInitParameter.EnableAgressiveSessionDirtying;
+import static com.sun.faces.config.WebConfiguration.BooleanWebContextInitParameter.EnableDistributable;
 import static java.lang.Boolean.TRUE;
 import static java.security.AccessController.doPrivileged;
 import static java.util.logging.Level.FINE;
@@ -460,7 +461,7 @@ public void enableHighAvailability(ServletContext ctx) {
         // 2> Was deployed with --availabilityenabled --target <clustername>
         
         WebConfiguration config = WebConfiguration.getInstance(ctx);
-        if (!config.isSet(EnableAgressiveSessionDirtying)) {
+        if (!config.isSet(EnableDistributable)) {
             Object isDistributableObj = ctx.getAttribute(IS_DISTRIBUTABLE_ATTRIBUTE);
             Object enableHAObj = ctx.getAttribute(ENABLE_HA_ATTRIBUTE);
             
@@ -473,8 +474,8 @@ public void enableHighAvailability(ServletContext ctx) {
                 }
                 
                 if (isDistributable && enableHA) {
-                    LOGGER.fine("setting the EnableAgressiveSessionDirtying to true");
-                    config.overrideContextInitParameter(EnableAgressiveSessionDirtying, TRUE);
+                    LOGGER.fine("setting EnableDistributable to true");
+                    config.overrideContextInitParameter(EnableDistributable, TRUE);
                 }
             }
         }
diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java
index a84ece1ec7a..42758ba328c 100644
--- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java
+++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java
@@ -2303,9 +2303,9 @@ protected void addChild(Container child, boolean isProgrammatic,
         Wrapper oldJspServlet = null;
 
         // Allow webapp to override JspServlet inherited from global web.xml.
-        boolean isJspServlet = "jsp".equals(wrapperName);
+        boolean isJspServlet = Constants.JSP_SERVLET_NAME.equals(wrapperName);
         if (isJspServlet) {
-            oldJspServlet = (Wrapper) findChild("jsp");
+            oldJspServlet = (Wrapper) findChild(Constants.JSP_SERVLET_NAME);
             if (oldJspServlet != null) {
                 removeChild(oldJspServlet);
             }
@@ -3238,7 +3238,7 @@ public void addInstanceListener(InstanceListener listener) {
     public void addJspMapping(String pattern) {
         String servletName = findServletMapping("*.jsp");
         if (servletName == null) {
-            servletName = "jsp";
+            servletName = Constants.JSP_SERVLET_NAME;
         }
 
         if( findChild(servletName) != null) {
@@ -5766,6 +5766,8 @@ public synchronized void start() throws LifecycleException {
         } catch (Throwable t) {
             log.log(Level.SEVERE, LogFacade.STARTUP_CONTEXT_FAILED_EXCEPTION, getName());
             try {
+                // ensure that all JSP resources are released in stop() method below
+                forceLoadJspServlet();
                 stop();
             } catch (Throwable tt) {
                 log.log(Level.SEVERE, LogFacade.CLEANUP_FAILED_EXCEPTION, tt);
@@ -5951,7 +5953,11 @@ public synchronized void stop(boolean isShutdown)
 
             if ((manager != null) && (manager instanceof Lifecycle)) {
                 if(manager instanceof StandardManager) {
-                    ((StandardManager)manager).stop(isShutdown);
+                    try {
+                        ((StandardManager)manager).stop(isShutdown);
+                    } catch (LifecycleException e) {
+                        log.log(Level.INFO, e.getMessage());
+                    }
                 } else {
                     ((Lifecycle)manager).stop();
                 }
@@ -8132,4 +8138,20 @@ private File getExtractedMetaInfResourcePath(String path) {
         }
         return null;
     }
+
+
+    /**
+     * Force loading of the JSP servlet. This is needed in case of
+     * initialization failure, so the JSP servlet would be unloaded properly
+     * and release all of its resources
+     *
+     * @throws ServletException
+     */
+    private void forceLoadJspServlet() throws ServletException {
+        Container jspServlet = findChild(Constants.JSP_SERVLET_NAME);
+        if (jspServlet instanceof Wrapper) {
+            Wrapper jspServletWrapper = (Wrapper) jspServlet;
+            jspServletWrapper.load();
+        }
+    }
 }
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java
index cc27e187be2..36d3dc4587c 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2016-2022] [Payara Foundation and/or its affiliates]
+// Portions Copyright [2016-2024] [Payara Foundation and/or its affiliates]
 
 package com.sun.enterprise.web;
 
@@ -232,6 +232,9 @@ public class WebContainer implements org.glassfish.api.container.Container, Post
     @Inject
     private LoggingRuntime loggingRuntime;
 
+    @Inject
+    private Deployment deployment;
+
     private final Map<String, WebConnector> connectorMap = new HashMap<>();
 
     private EmbeddedWebContainer _embedded;
@@ -2058,7 +2061,7 @@ public void unloadWebModule(String contextRoot, String appName, String virtualSe
             }
         }
 
-        if (!hasBeenUndeployed) {
+        if (!hasBeenUndeployed && deployment.getCurrentDeploymentContext() == null) {
             logger.log(Level.SEVERE, LogFacade.UNDEPLOY_ERROR, contextRoot);
         }
     }
diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/FileDirContext.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/FileDirContext.java
index 85201de234d..f616e5123bd 100644
--- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/FileDirContext.java
+++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/FileDirContext.java
@@ -59,6 +59,7 @@
 
 package org.apache.naming.resources;
 
+import java.nio.file.LinkOption;
 import java.text.MessageFormat;
 import java.util.*;
 import java.util.logging.Logger;
@@ -927,7 +928,7 @@ private File validate(File baseFile, String name, String keyName, Map<String, Fi
             // Check that this file belongs to our root path
             String canPath = null;
             try {
-                canPath = normalize(file.toPath().toRealPath().toString());
+                canPath = normalize(file.toPath().toRealPath(LinkOption.NOFOLLOW_LINKS).toString());
             } catch (IOException e) {
             }
             if (canPath == null || (!canPath.startsWith(canonicalBase) && !allowLinking)) {
diff --git a/appserver/web/weld-integration/pom.xml b/appserver/web/weld-integration/pom.xml
index 9b29bc79dfd..c463bdd689c 100644
--- a/appserver/web/weld-integration/pom.xml
+++ b/appserver/web/weld-integration/pom.xml
@@ -201,7 +201,7 @@
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>5.3.0</version>
+            <version>5.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/pom.xml b/core/pom.xml
index c2d1284ea44..dfbfd7cd8d6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -122,7 +122,7 @@
         <stax-api.version>1.0-2</stax-api.version>
         <jbi.version>1.0</jbi.version>
         <okhttp3-version>4.12.0</okhttp3-version>
-        <kotlin-version>2.0.0</kotlin-version>
+        <kotlin-version>2.0.20</kotlin-version>
         
         <!-- implementation and build dependencies -->
         <glassfish-management-api.version>3.2.3.payara-p1</glassfish-management-api.version>
@@ -168,18 +168,18 @@
         <maven.clean.plugin.version>3.4.0</maven.clean.plugin.version>
         <maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
         <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
-        <maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version>
+        <maven.surefire.plugin.version>3.5.0</maven.surefire.plugin.version>
         <maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
         <maven.release.plugin.version>3.1.1</maven.release.plugin.version>
         <maven.dependency.plugin.version>3.7.1</maven.dependency.plugin.version>
         <maven.gpg.plugin.version>3.2.4</maven.gpg.plugin.version>
-        <maven.deploy.plugin.version>3.1.2</maven.deploy.plugin.version>
+        <maven.deploy.plugin.version>3.1.3</maven.deploy.plugin.version>
         <maven.source.plugin.version>3.2.1</maven.source.plugin.version>
-        <maven.javadoc.plugin.version>3.7.0</maven.javadoc.plugin.version>
-        <maven.install.plugin.version>3.1.2</maven.install.plugin.version>
+        <maven.javadoc.plugin.version>3.10.0</maven.javadoc.plugin.version>
+        <maven.install.plugin.version>3.1.3</maven.install.plugin.version>
         <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
-        <maven.failsafe.plugin.version>3.3.1</maven.failsafe.plugin.version>
-        <maven.site.plugin.version>3.12.1</maven.site.plugin.version>
+        <maven.failsafe.plugin.version>3.5.0</maven.failsafe.plugin.version>
+        <maven.site.plugin.version>3.20.0</maven.site.plugin.version>
         <glassfishbuild.version>3.2.20.payara-p2</glassfishbuild.version>
         <maven.antrun.plugin.version>3.1.0</maven.antrun.plugin.version>
         <maven.assembly.plugin.version>3.7.1</maven.assembly.plugin.version>
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestManagementAdapter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestManagementAdapter.java
index 7ad2ad0b9e2..98cfb581fca 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestManagementAdapter.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestManagementAdapter.java
@@ -37,8 +37,12 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
+// Portions Copyright [2024] Payara Foundation and/or affiliates
+
 package org.glassfish.admin.rest.adapter;
 
+import org.glassfish.grizzly.http.server.Request;
+import org.glassfish.grizzly.http.server.Response;
 import org.jvnet.hk2.annotations.Service;
 
 import org.glassfish.admin.restconnector.Constants;
@@ -55,4 +59,11 @@ public RestManagementAdapter() {
         setRestResourceProvider(new RestManagementResourceProvider());
     }
 
+    @Override
+    public void service(Request req, Response res) {
+        req.setServerName(req.getLocalName());
+        req.setServerPort(req.getLocalPort());
+        super.service(req, res);
+    }
+
 }
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java
index 1d6b13cf98b..e8bc6cdb9ef 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2019] Payara Foundation and/or affiliates
+// Portions Copyright [2024] Payara Foundation and/or affiliates
 
 package org.glassfish.admin.rest.readers;
 
@@ -112,7 +112,7 @@ public double getDouble(String key) throws InputException {
         try {
             return o instanceof Number ?
                 ((Number)o).doubleValue() :
-                    Double.valueOf((String) o);
+                Double.parseDouble((String) o);
         } catch (Exception e) {
             throw new InputException("InputObject[" + quote(key) +
                 "] is not a number.");
diff --git a/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java b/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java
index 3b881122faf..6dab0489ded 100644
--- a/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java
+++ b/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java
@@ -78,6 +78,8 @@ private LogDomains() {}
      */
     public static final String RESOURCE_BUNDLE = "LogStrings";
 
+    public static final String RESOURCE_BUNDLE_MESSAGES = "LogMessages";
+
     /**
      * Field
      */
@@ -363,26 +365,33 @@ public static Logger getLogger(final Class clazz, final String namePrefix, final
         return logManager.getLogger(cLogger.getName());
     }
 
-    private static ResourceBundle getResourceBundle(final String name, final Class clazz,
-            final ClassLoader resourceBundleLoader) {
-        final ResourceBundle classBundle = findResourceBundle(name, clazz, resourceBundleLoader);
+    private static ResourceBundle getResourceBundle (final String name, final Class<?> clazz, final ClassLoader resourceBundleLoader) {
+        ResourceBundle classBundle = findResourceBundle(name, clazz, resourceBundleLoader);
+        if (classBundle == null) { // EJB uses LogMessages instead of LogStrings, check for this file if necessary.
+            classBundle = findResourceBundle(name, clazz, resourceBundleLoader, RESOURCE_BUNDLE_MESSAGES);
+        }
+
         if (classBundle != null) {
             return classBundle;
         }
+
         Logger.getAnonymousLogger().log(Level.INFO, "Cannot find the resource bundle for the name {0} for {1} using {2}", new Object[]{name, clazz, resourceBundleLoader});
         return null;
     }
 
-    private static ResourceBundle findResourceBundle(final String name, final Class clazz,
-            final ClassLoader classLoader) {
-        final ResourceBundle packageRootBundle = tryTofindResourceBundle(name, classLoader);
+    private static ResourceBundle findResourceBundle (final String name, final Class<?> clazz, final ClassLoader classLoader) {
+        return findResourceBundle(name, clazz, classLoader, LogDomains.RESOURCE_BUNDLE);
+    }
+
+    private static ResourceBundle findResourceBundle (final String name, final Class<?> clazz, final ClassLoader classLoader, final String fileSuffix) {
+        final ResourceBundle packageRootBundle = tryToFindResourceBundle(name, classLoader, fileSuffix);
         if (packageRootBundle != null) {
             return packageRootBundle;
         }
         // not found. Ok, let's try to go through the class's package tree
         final StringBuilder rbPackage = new StringBuilder(clazz.getPackage().getName());
         while (true) {
-            final ResourceBundle subPkgBundle = tryTofindResourceBundle(rbPackage.toString(), classLoader);
+            final ResourceBundle subPkgBundle = tryToFindResourceBundle(rbPackage.toString(), classLoader, fileSuffix);
             if (subPkgBundle != null) {
                 return subPkgBundle;
             }
@@ -402,9 +411,9 @@ private static String getLoggerName(Class clazz, String logDomainsConstantName)
         return loggerName;
     }
 
-    private static ResourceBundle tryTofindResourceBundle(final String name, final ClassLoader classLoader) {
+    private static ResourceBundle tryToFindResourceBundle (final String name, final ClassLoader classLoader, final String fileSuffix) {
         try {
-            return ResourceBundle.getBundle(name + "." + LogDomains.RESOURCE_BUNDLE, Locale.getDefault(), classLoader);
+            return ResourceBundle.getBundle(name + "." + fileSuffix, Locale.getDefault(), classLoader);
         } catch (MissingResourceException e) {
             return null;
         }
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java
index 22b7005d698..ceeed0c4b69 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java
@@ -649,7 +649,7 @@ public void initialize(ApplicationInfo appInfo, Collection<? extends Sniffer> sn
             currentDeploymentContext.get().pop();
         }
     }
-
+    
     @Override
     public ApplicationInfo deploy(final ExtendedDeploymentContext context) {
         return deploy(null, context);
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLoaderService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLoaderService.java
index d4fd077e2d5..ef9d0bef519 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLoaderService.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLoaderService.java
@@ -46,6 +46,7 @@
 import com.sun.enterprise.util.io.FileUtils;
 import com.sun.enterprise.admin.report.HTMLActionReporter;
 import com.sun.enterprise.v3.bootstrap.BootCommandService;
+import fish.payara.enterprise.config.serverbeans.DeploymentGroup;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -408,7 +409,7 @@ public List<Deployment.ApplicationDeployment> processApplication(Application app
 
                     DeployCommandParameters deploymentParams =
                         app.getDeployParameters(appRef);
-                    deploymentParams.target = server.getName();
+                    deploymentParams.target = validateAndGetTargetName(appName, server.getName());
                     deploymentParams.origin = DeployCommandParameters.Origin.load;
                     deploymentParams.command = DeployCommandParameters.Command.startup_server;
                     if (domain.isAppReferencedByPaaSTarget(appName)) {
@@ -462,6 +463,29 @@ public List<Deployment.ApplicationDeployment> processApplication(Application app
         return appDeployments;
     }
 
+    /**
+     * Evaluate Target name against Deployment groups and returns correct name for deployment process
+     * @param appName application name
+     * @param serverName specified server name to evaluate
+     * @return String that represents target name
+     */
+    public String validateAndGetTargetName(String appName, String serverName) {
+        List<String> targets = domain.getAllReferencedTargetsForApplication(appName);
+        if (targets.isEmpty()) {
+            return serverName;
+        }
+
+        String targetName = targets.get(0);
+        java.util.Optional<DeploymentGroup> optDG = domain.getDeploymentGroups().getDeploymentGroup().
+                stream().filter(d -> d.getName().equals(targetName)).findAny();
+
+        if (optDG.isPresent()) {
+            return optDG.get().getName();
+        }
+
+        return targetName;
+    }
+
 
     public String toString() {
         return "Application Loader";
@@ -636,4 +660,4 @@ private boolean loadAppOnDAS(String appName) {
         }
         return false;
     }
-}
+}
\ No newline at end of file
diff --git a/nucleus/packager/nucleus-jersey/pom.xml b/nucleus/packager/nucleus-jersey/pom.xml
index f6ec892ce85..de5449e2c36 100644
--- a/nucleus/packager/nucleus-jersey/pom.xml
+++ b/nucleus/packager/nucleus-jersey/pom.xml
@@ -138,6 +138,10 @@
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>stax2-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
diff --git a/nucleus/payara-modules/asadmin-recorder/src/main/java/fish/payara/asadmin/recorder/AsadminRecorderService.java b/nucleus/payara-modules/asadmin-recorder/src/main/java/fish/payara/asadmin/recorder/AsadminRecorderService.java
index 35e59a57e49..421afa66672 100644
--- a/nucleus/payara-modules/asadmin-recorder/src/main/java/fish/payara/asadmin/recorder/AsadminRecorderService.java
+++ b/nucleus/payara-modules/asadmin-recorder/src/main/java/fish/payara/asadmin/recorder/AsadminRecorderService.java
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2016-2021 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016-2024 Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -107,12 +107,12 @@ public void event(Event event) {
 
     private String constructAsadminCommand(String commandName, ParameterMap parameters) {
 
-        String asadminCommand = commandName;
-        String mandatoryOption = "";
+        StringBuilder asadminCommand = new StringBuilder(commandName);
+        StringBuilder mandatoryOption = new StringBuilder();
 
         if (Boolean.parseBoolean(asadminRecorderConfiguration.prependEnabled()) && prependedOptions != null) {
             for (String s : prependedOptions) {
-                asadminCommand += " " + s;
+                asadminCommand.append(" ").append(s);
             }
         }
 
@@ -123,21 +123,21 @@ private String constructAsadminCommand(String commandName, ParameterMap paramete
                     // This can have sub-parameters, so loop through and add spaces
                     // between the sub-parameters.
                     for (int i = 0; i < parameter.getValue().size(); i++) {
-                        mandatoryOption += parameter.getValue().get(i);
+                        mandatoryOption.append(parameter.getValue().get(i));
                         if (i != (parameter.getValue().size() - 1)) {
-                            mandatoryOption += " ";
+                            mandatoryOption.append(" ");
                         }
                     }
                 } else {
-                    asadminCommand += " --" + parameter.getKey() + "=" + parameter.getValue().get(0);
+                    asadminCommand.append(" --").append(parameter.getKey()).append("=").append(parameter.getValue().get(0));
                 }
             }
         }
 
-        asadminCommand += " " + mandatoryOption;
-        asadminCommand += "\n";
+        asadminCommand.append(" ").append(mandatoryOption);
+        asadminCommand.append("\n");
 
-        return asadminCommand;
+        return asadminCommand.toString();
     }
 
     /**
diff --git a/nucleus/payara-modules/payara-executor-service/src/main/java/fish/payara/nucleus/executorservice/PayaraExecutorService.java b/nucleus/payara-modules/payara-executor-service/src/main/java/fish/payara/nucleus/executorservice/PayaraExecutorService.java
index 79c5bd48971..92c3be3069c 100644
--- a/nucleus/payara-modules/payara-executor-service/src/main/java/fish/payara/nucleus/executorservice/PayaraExecutorService.java
+++ b/nucleus/payara-modules/payara-executor-service/src/main/java/fish/payara/nucleus/executorservice/PayaraExecutorService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- *    Copyright (c) [2017-2022] Payara Foundation and/or its affiliates. All rights reserved.
+ *    Copyright (c) [2017-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  *     The contents of this file are subject to the terms of either the GNU
  *     General Public License Version 2 only ("GPL") or the Common Development
@@ -137,8 +137,10 @@ public void event(Event event) {
             if (null == threadPoolExecutor) {
                 initialiseThreadPools();
             }
-        } else if (event.is(EventTypes.SERVER_SHUTDOWN)) {
+        } else if (event.is(EventTypes.PREPARE_SHUTDOWN)) {
             terminateThreadPools();
+        } else if (event.is(EventTypes.SERVER_SHUTDOWN)) {
+            awaitTerminationOfThreadPools();
         }
     }
 
@@ -149,7 +151,13 @@ private void terminateThreadPools() {
         }
         threadPoolExecutor.shutdown();
         scheduledThreadPoolExecutor.shutdown();
+    }
 
+    private void awaitTerminationOfThreadPools() {
+        if (threadPoolExecutor == null) {
+            // we didn't initialize yet
+            return;
+        }
         // Wait until the schedulers actually terminate
         try {
           threadPoolExecutor.awaitTermination(5, TimeUnit.SECONDS);
@@ -189,9 +197,6 @@ private void initialiseThreadPools() {
                             Logger.getLogger(PayaraExecutorService.class.getName()).log(SEVERE, "Uncaught exception in Payara Scheduled Executor thread ", thrwbl));
                         return t;
             });
-            scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
-            
-            
         } else {
             int threadPoolExecutorQueueSize = Integer.valueOf(payaraExecutorServiceConfiguration.getThreadPoolExecutorQueueSize());
             
@@ -224,9 +229,9 @@ public void uncaughtException(Thread thread, Throwable thrwbl) {
                         });
                         return t;
             });
-            scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
         }
-        
+        scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
+        scheduledThreadPoolExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
     }
 
     public <T> Future<T> submit(Callable<T> task) {
diff --git a/nucleus/pom.xml b/nucleus/pom.xml
index e841009c2a3..8cb1f076bfc 100644
--- a/nucleus/pom.xml
+++ b/nucleus/pom.xml
@@ -88,7 +88,7 @@
         <!-- on Hudson and RE, ${build.number} gets replaced by real build ID -->
         <build.id>${build.number}</build.id>
         <maven.eclipse.plugin.version>2.10</maven.eclipse.plugin.version>
-        <maven.invoker.plugin.version>3.6.1</maven.invoker.plugin.version>
+        <maven.invoker.plugin.version>3.8.0</maven.invoker.plugin.version>
         <maven.war.plugin.version>3.4.0</maven.war.plugin.version>
         <maven.makepkgs.plugin.version>0.6.2</maven.makepkgs.plugin.version>
         <maven.jaxb2.plugin.version>0.15.3</maven.jaxb2.plugin.version>
@@ -96,7 +96,7 @@
 
         <maven.jaxws.plugin.version>2.6</maven.jaxws.plugin.version>
         <maven.apt.plugin.version>1.0-alpha-5</maven.apt.plugin.version>
-        <maven.plugin.api.version>3.9.8</maven.plugin.api.version>
+        <maven.plugin.api.version>3.9.9</maven.plugin.api.version>
 
         <!-- Servlet -->
         <grizzly-npn-osgi.version>2.0.0</grizzly-npn-osgi.version>
@@ -115,7 +115,7 @@
 
         <!-- Apache Felix is an open source implementation of the OSGi Core Release 8 framework specification. -->
         <org.apache.felix.main.version>7.0.5</org.apache.felix.main.version>
-        <org.apache.felix.webconsole.version>5.0.2</org.apache.felix.webconsole.version>
+        <org.apache.felix.webconsole.version>5.0.6</org.apache.felix.webconsole.version>
         <org.apache.felix.eventadmin.version>1.6.4</org.apache.felix.eventadmin.version>
         <org.apache.felix.shell.version>1.4.3</org.apache.felix.shell.version>
         <org.apache.felix.gogo.runtime.version>1.1.6</org.apache.felix.gogo.runtime.version>
@@ -137,8 +137,7 @@
 
         <!-- Build -->
         <nucleus.install.dir.name>nucleus</nucleus.install.dir.name>
-        <ant.version>1.10.14</ant.version>
-        <ant-launcher.version>1.10.14</ant-launcher.version>
+        <ant.version>1.10.15</ant.version>
         <javadoc.options>-Xdoclint:none</javadoc.options>
 
         <!-- Debug / analysis -->
@@ -785,7 +784,7 @@ Parent is ${project.parent}</echo>
             <dependency>
                 <groupId>org.hamcrest</groupId>
                 <artifactId>hamcrest</artifactId>
-                <version>2.2</version>
+                <version>3.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -807,7 +806,7 @@ Parent is ${project.parent}</echo>
             <dependency>
                 <groupId>org.apache.ant</groupId>
                 <artifactId>ant-launcher</artifactId>
-                <version>${ant-launcher.version}</version>
+                <version>${ant.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.sun</groupId>
diff --git a/pom.xml b/pom.xml
index cad7585db1d..2cfce22f517 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,11 +162,11 @@
         <!-- BOM-referenced versions -->
 
         <osgi-resource-locator.version>1.0.3</osgi-resource-locator.version>
-        <snakeyaml.version>2.2</snakeyaml.version>
-        <mojarra.version>4.0.0.payara-p2</mojarra.version>
+        <snakeyaml.version>2.3</snakeyaml.version>
+        <mojarra.version>4.0.7.payara-p1</mojarra.version>
         <jaxb-extra-osgi.version>2.3.0</jaxb-extra-osgi.version>
 
-        <yasson.version>3.0.3</yasson.version>
+        <yasson.version>3.0.4</yasson.version>
         <eclipselink.version>5.0.0-B02</eclipselink.version>
         <eclipselink.asm.version>9.7.0</eclipselink.asm.version>
         <openmq.version>6.3.0.payara-p3</openmq.version>