Merge branch '2.3.x'

Closes gh-23568

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

@@ -713,16 +713,31 @@ With Maven the dependency should be declared as optional, as shown in the follow
 	</dependency>
 ----
 
-With Gradle 4.5 and earlier, the dependency should be declared in the `compileOnly` configuration, as shown in the following example:
+If you have defined `@ConfigurationProperties` in your application, make sure to configure the `spring-boot-maven-plugin` to prevent the `repackage` goal from adding the dependency into the fat jar:
 
-[source,groovy,indent=0,subs="verbatim,quotes,attributes"]
+[source,xml,indent=0,subs="verbatim,quotes,attributes"]
 ----
-	dependencies {
+	<project>
-		compileOnly "org.springframework.boot:spring-boot-configuration-processor"
+		<build>
-	}
+			<plugins>
+				<plugin>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-maven-plugin</artifactId>
+					<configuration>
+						<excludes>
+							<exclude>
+								<groupId>org.springframework.boot</groupId>
+								<artifactId>spring-boot-configuration-processor</artifactId>
+							</exclude>
+						</excludes>
+					</configuration>
+				</plugin>
+			</plugins>
+		</build>
+	</project>
 ----
 
-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"]
 ----