Update to jakarta.servlet-api:5.0.0

jgrandja · jgrandja · commit a3019b775fd1 · 2022-08-02T09:42:34.000-04:00
Closes gh-838
diff --git a/buildSrc/src/main/java/org/springframework/gradle/classpath/CheckClasspathForProhibitedDependencies.java b/buildSrc/src/main/java/org/springframework/gradle/classpath/CheckClasspathForProhibitedDependencies.java
@@ -78,10 +78,9 @@ private boolean prohibited(ModuleVersionIdentifier id) {
 		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;
 		}
diff --git a/dependencies/spring-authorization-server-dependencies.gradle b/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"
diff --git a/oauth2-authorization-server/spring-security-oauth2-authorization-server.gradle b/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"
 }

Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,9 @@ private boolean prohibited(ModuleVersionIdentifier id) {`
`78`	`78`	`if (group.equals("javax.money")) {`
`79`	`79`	`return false;`
`80`	`80`	`}`
`81`		`- // TODO: Uncomment the following lines when upgrading to Spring Framework 6`
`82`		`-// if (group.startsWith("javax")) {`
`83`		`-// return true;`
`84`		`-// }`
	`81`	`+ if (group.startsWith("javax")) {`
	`82`	`+ return true;`
	`83`	`+ }`
`85`	`84`	`if (group.equals("commons-logging")) {`
`86`	`85`	`return true;`
`87`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,5 @@ dependencies {`
`29`	`29`
`30`	`30`	`testRuntimeOnly "org.hsqldb:hsqldb"`
`31`	`31`
`32`		`- provided "javax.servlet:javax.servlet-api"`
	`32`	`+ provided "jakarta.servlet:jakarta.servlet-api"`
`33`	`33`	`}`