Spring/spring-authorization-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to jakarta.servlet-api:5.0.0

Browse Source 
Closes gh-838
This commit is contained in:
Joe Grandja
2022-08-01 14:31:37 -04:00
parent 395cdbd620
commit a3019b775f
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
buildSrc/src/main/java/org/springframework/gradle/classpath/CheckClasspathForProhibitedDependencies.java
View File

@@ -78,10 +78,9 @@ public class CheckClasspathForProhibitedDependencies extends DefaultTask {
if (group.equals("javax.money")) {
return false;
}
// TODO: Uncomment the following lines when upgrading to Spring Framework 6
// if (group.startsWith("javax")) {
// return true;
// }
if (group.startsWith("javax")) {
return true;
}
if (group.equals("commons-logging")) {
return true;
}

2
dependencies/spring-authorization-server-dependencies.gradle vendored
View File

@@ -12,7 +12,7 @@ dependencies {
api platform("com.fasterxml.jackson:jackson-bom:2.13.3")
constraints {
api "com.nimbusds:nimbus-jose-jwt:9.22"
api "javax.servlet:javax.servlet-api:4.0.1"
api "jakarta.servlet:jakarta.servlet-api:5.0.0"
api "junit:junit:4.13.2"
api "org.assertj:assertj-core:3.22.0"
api "org.mockito:mockito-core:4.5.1"

2
oauth2-authorization-server/spring-security-oauth2-authorization-server.gradle
View File

@@ -29,5 +29,5 @@ dependencies {
testRuntimeOnly "org.hsqldb:hsqldb"
provided "javax.servlet:javax.servlet-api"
provided "jakarta.servlet:jakarta.servlet-api"
}