Merge branch '3.1.x'

Closes gh-38358

Author: wilkinsona

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -83,7 +83,7 @@ bom {
 			]
 		}
 	}
-	library("AspectJ", "1.9.20") {
+	library("AspectJ", "1.9.20.1") {
 		group("org.aspectj") {
 			modules = [
 				"aspectjrt",