Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

shiro 19 bump deps #363

Merged
merged 1 commit into from Jun 22, 2022
Merged

shiro 19 bump deps #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
8 changes: 2 additions & 6 deletions ...les/spring-boot-web/src/main/java/org/apache/shiro/samples/RestrictedErrorController.java
View file
Open in desktop
Expand Up @@ -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;
Expand All @@ -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";
}
Expand Down