This is an automated email from the ASF dual-hosted git repository. bdemers pushed a commit to branch update-spring in repository https://gitbox.apache.org/repos/asf/shiro.git
commit e42177b4d15224f8a5006bb442a39be1c9efd087 Author: Brian Demers <[email protected]> AuthorDate: Thu Mar 31 15:33:50 2022 -0400 Update Spring v5.1.18 Spring Boot v2.5.12 --- pom.xml | 4 ++-- .../java/org/apache/shiro/samples/RestrictedErrorController.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index cbe939c..ecd71ce 100644 --- a/pom.xml +++ b/pom.xml @@ -108,8 +108,8 @@ <slf4j.version>1.7.26</slf4j.version> <logback.version>1.2.10</logback.version> <log4j.version>2.17.1</log4j.version> - <spring.version>5.2.8.RELEASE</spring.version> - <spring-boot.version>2.3.2.RELEASE</spring-boot.version> + <spring.version>5.3.18</spring.version> + <spring-boot.version>2.5.12</spring-boot.version> <guice.version>4.2.3</guice.version> <jaxrs.api.version>2.1.6</jaxrs.api.version> <htmlunit.version>2.39.0</htmlunit.version> diff --git a/samples/spring-boot-web/src/main/java/org/apache/shiro/samples/RestrictedErrorController.java b/samples/spring-boot-web/src/main/java/org/apache/shiro/samples/RestrictedErrorController.java index 53603e0..97c1baa 100644 --- a/samples/spring-boot-web/src/main/java/org/apache/shiro/samples/RestrictedErrorController.java +++ b/samples/spring-boot-web/src/main/java/org/apache/shiro/samples/RestrictedErrorController.java @@ -19,6 +19,7 @@ package org.apache.shiro.samples; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.web.error.ErrorAttributeOptions; import org.springframework.boot.web.servlet.error.ErrorAttributes; import org.springframework.boot.web.servlet.error.ErrorController; import org.springframework.stereotype.Controller; @@ -38,14 +39,15 @@ public class RestrictedErrorController implements ErrorController { @Autowired private ErrorAttributes errorAttributes; - @Override public String getErrorPath() { return ERROR_PATH; } @RequestMapping(ERROR_PATH) String error(HttpServletRequest request, Model model) { - Map<String, Object> errorMap = errorAttributes.getErrorAttributes(new ServletWebRequest(request), false); + Map<String, Object> errorMap = errorAttributes.getErrorAttributes( + new ServletWebRequest(request), + ErrorAttributeOptions.of(ErrorAttributeOptions.Include.MESSAGE)); model.addAttribute("errors", errorMap); return "error"; }
