Skip to content

Commit 85565a0

Browse files
committed
Upgrade dependencies
4.0.2 -> 4.0.6 Jakarta Faces 4.0.0 -> 4.0.2 Apache MyFaces 3.1.0 -> 3.1.1 Jakarta Servlet JSP Closes gh-1817, gh 1818
1 parent 9352f0e commit 85565a0

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ allprojects {
2828
dependencies {
2929
dependency "jakarta.servlet:jakarta.servlet-api:6.0.0"
3030
dependency "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.0"
31-
dependency "jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.0"
31+
dependency "jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.1"
3232
dependency "jakarta.el:jakarta.el-api:5.0.1"
3333

34-
dependency "org.glassfish:jakarta.faces:4.0.2"
35-
dependency "org.apache.myfaces.core:myfaces-impl:4.0.0"
36-
dependency "org.apache.myfaces.core:myfaces-test:4.0.0"
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"
3737
dependency "jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1"
3838

3939
dependency "jakarta.validation:jakarta.validation-api:3.0.2"

spring-faces/src/test/java/org/springframework/faces/webflow/JsfAjaxHandlerTests.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package org.springframework.faces.webflow;
22

3-
import static org.junit.jupiter.api.Assertions.assertEquals;
4-
import static org.junit.jupiter.api.Assertions.assertTrue;
5-
63
import org.junit.jupiter.api.AfterEach;
74
import org.junit.jupiter.api.BeforeEach;
85
import org.junit.jupiter.api.Test;
6+
97
import org.springframework.web.context.support.StaticWebApplicationContext;
108

9+
import static org.junit.jupiter.api.Assertions.assertEquals;
10+
1111
public class JsfAjaxHandlerTests {
1212

1313
private final JSFMockHelper jsfMock = new JSFMockHelper();
@@ -30,7 +30,11 @@ public void tearDown() throws Exception {
3030
@Test
3131
public void testSendAjaxRedirect() throws Exception {
3232
this.ajaxHandler.sendAjaxRedirectInternal("/target", this.jsfMock.request(), this.jsfMock.response(), false);
33-
assertTrue(this.jsfMock.contentAsString().matches("<\\?xml version='1.0' encoding='utf-8'\\?>\n<partial-response.*><redirect url=\"/target\"/></partial-response>"));
33+
34+
assertEquals(this.jsfMock.contentAsString(), """
35+
<?xml version='1.0' encoding='UTF-8'?>
36+
<partial-response><redirect url="/target"/></partial-response>""");
37+
3438
assertEquals("application/xml", this.jsfMock.response().getContentType());
3539
}
3640

0 commit comments

Comments
 (0)