From 85565a050b76b15227f8e0da0d62f58c5ae9a4e9 Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Fri, 1 Nov 2024 14:56:21 +0000 Subject: [PATCH] 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 --- build.gradle | 8 ++++---- .../faces/webflow/JsfAjaxHandlerTests.java | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index bc4e9420..5c44c5ce 100644 --- a/build.gradle +++ b/build.gradle @@ -28,12 +28,12 @@ allprojects { dependencies { dependency "jakarta.servlet:jakarta.servlet-api:6.0.0" dependency "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.0" - dependency "jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.0" + dependency "jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.1" dependency "jakarta.el:jakarta.el-api:5.0.1" - dependency "org.glassfish:jakarta.faces:4.0.2" - dependency "org.apache.myfaces.core:myfaces-impl:4.0.0" - dependency "org.apache.myfaces.core:myfaces-test:4.0.0" + dependency "org.glassfish:jakarta.faces:4.0.6" + dependency "org.apache.myfaces.core:myfaces-impl:4.0.2" + dependency "org.apache.myfaces.core:myfaces-test:4.0.2" dependency "jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1" dependency "jakarta.validation:jakarta.validation-api:3.0.2" diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/JsfAjaxHandlerTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/JsfAjaxHandlerTests.java index 4d434c50..6191f2d7 100644 --- a/spring-faces/src/test/java/org/springframework/faces/webflow/JsfAjaxHandlerTests.java +++ b/spring-faces/src/test/java/org/springframework/faces/webflow/JsfAjaxHandlerTests.java @@ -1,13 +1,13 @@ package org.springframework.faces.webflow; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import org.springframework.web.context.support.StaticWebApplicationContext; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class JsfAjaxHandlerTests { private final JSFMockHelper jsfMock = new JSFMockHelper(); @@ -30,7 +30,11 @@ public class JsfAjaxHandlerTests { @Test public void testSendAjaxRedirect() throws Exception { this.ajaxHandler.sendAjaxRedirectInternal("/target", this.jsfMock.request(), this.jsfMock.response(), false); - assertTrue(this.jsfMock.contentAsString().matches("<\\?xml version='1.0' encoding='utf-8'\\?>\n")); + + assertEquals(this.jsfMock.contentAsString(), """ + + """); + assertEquals("application/xml", this.jsfMock.response().getContentType()); }