Merge branch '2.5.x'

Closes gh-28662
2021-11-12 23:40:35 +00:00
parent 3ba8184cb1 5e4a502b2d
commit 2a342ef416
43 changed files with 470 additions and 147 deletions
--- a/spring-boot-project/spring-boot-parent/build.gradle
+++ b/spring-boot-project/spring-boot-parent/build.gradle
@@ -41,6 +41,13 @@ bom {
 			]
 		}
 	}
+	library("Jakarta Inject", "1.0.5") {
+		group("jakarta.inject") {
+			modules = [
+				"jakarta.inject-api"
+			]
+		}
+	}
 	library("JLine", "2.11") {
 		prohibit("[2.12,)") {
 			because "it contains breaking changes"