Merge branch '3.1.x' into 3.2.x

scottfrederick · scottfrederick · commit 83efe763f3d8 · 2024-02-27T13:29:23.000-06:00
Closes gh-39771
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/build.gradle
@@ -10,9 +10,7 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-jersey"))
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat"))
 
-	if (JavaVersion.current().java9Compatible) {
-		runtimeOnly("jakarta.xml.bind:jakarta.xml.bind-api")
-	}
+	runtimeOnly("jakarta.xml.bind:jakarta.xml.bind-api")
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 }

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,7 @@ dependencies {`
`10`	`10`	`implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-jersey"))`
`11`	`11`	`implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat"))`
`12`	`12`
`13`		`- if (JavaVersion.current().java9Compatible) {`
`14`		`- runtimeOnly("jakarta.xml.bind:jakarta.xml.bind-api")`
`15`		`- }`
	`13`	`+ runtimeOnly("jakarta.xml.bind:jakarta.xml.bind-api")`
`16`	`14`
`17`	`15`	`testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))`
`18`	`16`	`}`