Skip to content

Commit 795122b

Browse files
committed
Upgrade to Jakarta Faces 4.1.4
Closes gh-1831
1 parent 0b256e1 commit 795122b

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@ allprojects {
3131
dependency "jakarta.servlet.jsp:jakarta.servlet.jsp-api:4.0.0"
3232
dependency "jakarta.el:jakarta.el-api:5.0.1"
3333

34-
dependency "org.glassfish:jakarta.faces:4.0.6"
35-
dependency "org.apache.myfaces.core:myfaces-impl:4.0.2"
36-
dependency "org.apache.myfaces.core:myfaces-test:4.0.2"
37-
dependency "jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1"
34+
dependency "org.glassfish:jakarta.faces:4.1.4"
35+
dependency "org.apache.myfaces.core:myfaces-impl:4.1.2"
36+
dependency "org.apache.myfaces.core:myfaces-test:4.1.2"
37+
dependency "jakarta.enterprise:jakarta.enterprise.cdi-api:5.0.0-M1"
38+
dependency "jakarta.enterprise:jakarta.enterprise.cdi-el-api:5.0.0-M1"
3839

3940
dependency "jakarta.validation:jakarta.validation-api:3.1.0"
4041
dependency "org.hibernate.validator:hibernate-validator:9.1.0.Final"

spring-faces/spring-faces.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ dependencies {
2424
testImplementation("org.apache.myfaces.core:myfaces-impl")
2525
testImplementation("org.apache.myfaces.core:myfaces-test")
2626
testImplementation("jakarta.enterprise:jakarta.enterprise.cdi-api")
27+
testImplementation("jakarta.enterprise:jakarta.enterprise.cdi-el-api")
2728
testRuntimeOnly("org.apache.logging.log4j:log4j-core")
2829
testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
2930
testRuntimeOnly("org.apache.logging.log4j:log4j-jul")

spring-faces/src/main/java/org/springframework/faces/webflow/FlowActionListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.List;
2020

2121
import jakarta.faces.application.NavigationHandler;
22-
import jakarta.faces.component.ActionSource2;
22+
import jakarta.faces.component.ActionSource;
2323
import jakarta.faces.context.FacesContext;
2424
import jakarta.faces.event.AbortProcessingException;
2525
import jakarta.faces.event.ActionEvent;
@@ -71,7 +71,7 @@ public void processAction(ActionEvent actionEvent) throws AbortProcessingExcepti
7171
return;
7272
}
7373
FacesContext context = FacesContext.getCurrentInstance();
74-
ActionSource2 source = (ActionSource2) actionEvent.getSource();
74+
ActionSource source = (ActionSource) actionEvent.getSource();
7575
String eventId = null;
7676
if (source.getActionExpression() != null) {
7777
if (logger.isDebugEnabled()) {

0 commit comments

Comments
 (0)