Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 13:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to Spring Framework 6.0

Browse Source 
Issue gh-10360
This commit is contained in:
Marcus Da Coregio
2021-10-11 16:01:02 -03:00
parent 4f0cc132f6
commit db60df2f9c
549 changed files with 1241 additions and 1236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
taglibs/spring-security-taglibs.gradle
+3 -3
View File
@@ -12,10 +12,10 @@ dependencies {
api 'org.springframework:spring-expression'
api 'org.springframework:spring-web'
provided 'javax.servlet.jsp:javax.servlet.jsp-api'
provided 'javax.servlet:javax.servlet-api'
provided 'jakarta.servlet.jsp:jakarta.servlet.jsp-api'
provided 'jakarta.servlet:jakarta.servlet-api'
testRuntimeOnly 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
testRuntimeOnly 'jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api'
testImplementation "org.assertj:assertj-core"
testImplementation "org.junit.jupiter:junit-jupiter-api"
taglibs/src/main/java/org/springframework/security/taglibs/TagLibConfig.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.springframework.security.taglibs;
import javax.servlet.jsp.tagext.Tag;
import jakarta.servlet.jsp.tagext.Tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
taglibs/src/main/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTag.java
+4 -4
View File
@@ -19,10 +19,10 @@ package org.springframework.security.taglibs.authz;
import java.io.IOException;
import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.context.ApplicationContext;
import org.springframework.core.GenericTypeResolver;
taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java
+5 -5
View File
@@ -20,11 +20,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.tagext.TagSupport;
import jakarta.servlet.ServletContext;
import jakarta.servlet.jsp.JspException;
import jakarta.servlet.jsp.PageContext;
import jakarta.servlet.jsp.tagext.Tag;
import jakarta.servlet.jsp.tagext.TagSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java
+6 -6
View File
@@ -18,10 +18,10 @@ package org.springframework.security.taglibs.authz;
import java.io.IOException;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.tagext.TagSupport;
import jakarta.servlet.jsp.JspException;
import jakarta.servlet.jsp.PageContext;
import jakarta.servlet.jsp.tagext.Tag;
import jakarta.servlet.jsp.tagext.TagSupport;
import org.springframework.beans.BeanWrapperImpl;
import org.springframework.beans.BeansException;
@@ -32,8 +32,8 @@ import org.springframework.security.web.util.TextEscapeUtils;
import org.springframework.web.util.TagUtils;
/**
* An {@link javax.servlet.jsp.tagext.Tag} implementation that allows convenient access to
* the current <code>Authentication</code> object.
* An {@link jakarta.servlet.jsp.tagext.Tag} implementation that allows convenient access
* to the current <code>Authentication</code> object.
* <p>
* Whilst JSPs can access the <code>SecurityContext</code> directly, this tag avoids
* handling <code>null</code> conditions.
taglibs/src/main/java/org/springframework/security/taglibs/authz/JspAuthorizeTag.java
+6 -6
View File
@@ -19,12 +19,12 @@ package org.springframework.security.taglibs.authz;
import java.io.IOException;
import java.util.List;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.Tag;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.jsp.JspException;
import jakarta.servlet.jsp.PageContext;
import jakarta.servlet.jsp.tagext.Tag;
import org.springframework.expression.BeanResolver;
import org.springframework.expression.ConstructorResolver;
taglibs/src/main/java/org/springframework/security/taglibs/csrf/AbstractCsrfTag.java
+2 -2
View File
@@ -18,8 +18,8 @@ package org.springframework.security.taglibs.csrf;
import java.io.IOException;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
import jakarta.servlet.jsp.JspException;
import jakarta.servlet.jsp.tagext.TagSupport;
import org.springframework.security.web.csrf.CsrfToken;
taglibs/src/test/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTagTests.java
+3 -3
View File
@@ -19,9 +19,9 @@ package org.springframework.security.taglibs.authz;
import java.io.IOException;
import java.util.Collections;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
taglibs/src/test/java/org/springframework/security/taglibs/authz/AccessControlListTagTests.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.springframework.security.taglibs.authz;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.jsp.tagext.Tag;
import jakarta.servlet.ServletContext;
import jakarta.servlet.jsp.tagext.Tag;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java
+2 -2
View File
@@ -16,8 +16,8 @@
package org.springframework.security.taglibs.authz;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
import jakarta.servlet.jsp.JspException;
import jakarta.servlet.jsp.tagext.Tag;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java
+2 -2
View File
@@ -16,8 +16,8 @@
package org.springframework.security.taglibs.authz;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
import jakarta.servlet.jsp.JspException;
import jakarta.servlet.jsp.tagext.Tag;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
taglibs/src/test/java/org/springframework/security/taglibs/csrf/AbstractCsrfTagTests.java
+2 -2
View File
@@ -18,8 +18,8 @@ package org.springframework.security.taglibs.csrf;
import java.io.UnsupportedEncodingException;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
import jakarta.servlet.jsp.JspException;
import jakarta.servlet.jsp.tagext.Tag;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;