You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2022/06/21 22:40:20 UTC
[shiro] 01/01: Update Spring, jetty, slf4j, and hazelcast dependencies
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a commit to branch shiro-19-bump-deps
in repository https://gitbox.apache.org/repos/asf/shiro.git
commit 2e88dcfae996233213d7fe67ac079c054c856a69
Author: Brian Demers <bd...@apache.org>
AuthorDate: Tue Jun 21 18:40:09 2022 -0400
Update Spring, jetty, slf4j, and hazelcast dependencies
---
pom.xml | 13 +++++++------
.../org/apache/shiro/samples/RestrictedErrorController.java | 8 ++------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 54b5a8ef..aef58451 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,20 +91,20 @@
modules' OSGi metadata: -->
<ehcache.version>2.6.11</ehcache.version>
<!-- Don't change this version without also changing the shiro-hazelcast and shiro-features OSGi metadata: -->
- <hazelcast.version>3.12.6</hazelcast.version>
+ <hazelcast.version>3.12.12</hazelcast.version>
<hsqldb.version>2.5.0</hsqldb.version>
<javax.annotation.api.version>1.3.2</javax.annotation.api.version>
<jdk.version>1.8</jdk.version>
- <jetty.version>9.4.27.v20200227</jetty.version>
+ <jetty.version>9.4.47.v20220610</jetty.version>
<owasp.java.encoder.version>1.2.2</owasp.java.encoder.version>
<!-- Don't change this version without also changing the shiro-quartz and shiro-features
modules' OSGi metadata: -->
<quartz.version>2.3.2</quartz.version>
- <slf4j.version>1.7.26</slf4j.version>
- <logback.version>1.2.10</logback.version>
+ <slf4j.version>1.7.36</slf4j.version>
+ <logback.version>1.2.11</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.20</spring.version>
+ <spring-boot.version>2.7.0</spring-boot.version>
<guice.version>4.2.2</guice.version>
<jaxrs.api.version>2.0.1</jaxrs.api.version>
<htmlunit.version>2.39.0</htmlunit.version>
@@ -1478,6 +1478,7 @@
<artifactId>dependency-check-maven</artifactId>
<inherited>false</inherited>
<configuration>
+ <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
<suppressionFile>${root.dir}/src/owasp-suppression.xml</suppressionFile>
</configuration>
<executions>
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 53603e04..2da2373a 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,9 @@ 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";
}