Merge branch '2.2.x' into 2.3.x

Closes gh-23567

Author: mbhave

spring-boot-project/spring-boot-docs/src/docs/asciidoc/appendix-configuration-metadata.adoc

@@ -737,16 +737,7 @@ If you have defined `@ConfigurationProperties` in your application, make sure to
 	</project>
 ----
 
-With Gradle 4.5 and earlier, the dependency should be declared in the `compileOnly` configuration, as shown in the following example:
-
-[source,groovy,indent=0,subs="verbatim,quotes,attributes"]
-----
-	dependencies {
-		compileOnly "org.springframework.boot:spring-boot-configuration-processor"
-	}
-----
-
-With Gradle 4.6 and later, the dependency should be declared in the `annotationProcessor` configuration, as shown in the following example:
+With Gradle, the dependency should be declared in the `annotationProcessor` configuration, as shown in the following example:
 
 [source,groovy,indent=0,subs="verbatim,quotes,attributes"]
 ----