Эх сурвалжийг харах

Update to jakarta.servlet-api:5.0.0

Closes gh-838
Joe Grandja 3 жил өмнө
parent
commit
a3019b775f

+ 3 - 4
buildSrc/src/main/java/org/springframework/gradle/classpath/CheckClasspathForProhibitedDependencies.java

@@ -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;
 		}

+ 1 - 1
dependencies/spring-authorization-server-dependencies.gradle

@@ -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"

+ 1 - 1
oauth2-authorization-server/spring-security-oauth2-authorization-server.gradle

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