Merge pull request #6905 from Viii3/FISH-8142-Update-Mojarra

FISH-8142 Update Mojarra
payara · Aug 29, 2024 · 2f7e3d9 · 2f7e3d9
2 parents c5b087a + f911f2a
commit 2f7e3d9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...f-connector/src/main/java/org/glassfish/faces/integration/GlassFishInjectionProvider.java b/...f-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/pom.xml b/pom.xml
@@ -153,7 +153,7 @@
         <osgi-resource-locator.version>1.0.3</osgi-resource-locator.version>
         <snakeyaml.version>2.2</snakeyaml.version>
         <jakarta.servlet.jsp.jstl.version>3.0.1</jakarta.servlet.jsp.jstl.version>
-        <mojarra.version>4.0.0.payara-p2</mojarra.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.4</yasson.version>