Merge pull request #6866 from Pandrex247/FISH-9184-Release

FISH-9184 Revert "FISH-8142 Upgrade Mojarra to 4.0.7 with patches reapplied"
payara · Aug 7, 2024 · 0204837 · 0204837
2 parents c0c1cb6 + ddb92ee
commit 0204837
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 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,14 +37,13 @@
  * 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.EnableDistributable;
+import static com.sun.faces.config.WebConfiguration.BooleanWebContextInitParameter.EnableAgressiveSessionDirtying;
 import static java.lang.Boolean.TRUE;
 import static java.security.AccessController.doPrivileged;
 import static java.util.logging.Level.FINE;
@@ -461,7 +460,7 @@ public void enableHighAvailability(ServletContext ctx) {
         // 2> Was deployed with --availabilityenabled --target <clustername>
 
         WebConfiguration config = WebConfiguration.getInstance(ctx);
-        if (!config.isSet(EnableDistributable)) {
+        if (!config.isSet(EnableAgressiveSessionDirtying)) {
             Object isDistributableObj = ctx.getAttribute(IS_DISTRIBUTABLE_ATTRIBUTE);
             Object enableHAObj = ctx.getAttribute(ENABLE_HA_ATTRIBUTE);
 
@@ -474,8 +473,8 @@ public void enableHighAvailability(ServletContext ctx) {
                 }
 
                 if (isDistributable && enableHA) {
-                    LOGGER.fine("setting EnableDistributable to true");
-                    config.overrideContextInitParameter(EnableDistributable, TRUE);
+                    LOGGER.fine("setting the EnableAgressiveSessionDirtying to true");
+                    config.overrideContextInitParameter(EnableAgressiveSessionDirtying, 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.7.payara-p1</mojarra.version>
+        <mojarra.version>4.0.0.payara-p2</mojarra.version>
         <jaxb-extra-osgi.version>2.3.0</jaxb-extra-osgi.version>
 
         <yasson.version>3.0.3</yasson.version>