From 9b12d2d7cbc3618d8c8cfdcd68a08bc15d4524d2 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Wed, 28 Oct 2020 20:18:36 +0000
Subject: [PATCH] Ensure that additional metadata is available to annotation
 processor

Fixes gh-23934
---
 .../context/properties/ConfigurationPropertiesPlugin.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/java/org/springframework/boot/build/context/properties/ConfigurationPropertiesPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/context/properties/ConfigurationPropertiesPlugin.java
index 81f51281fb4..9c0e52f5b70 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/context/properties/ConfigurationPropertiesPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/context/properties/ConfigurationPropertiesPlugin.java
@@ -23,6 +23,7 @@ import java.util.stream.Collectors;
 
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
+import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginConvention;
@@ -37,7 +38,10 @@ import org.springframework.util.StringUtils;
  *
  * <ul>
  * <li>Adding a dependency on the configuration properties annotation processor.
- * <li>Configure the additional metadata locations annotation processor compiler argument
+ * <li>Configuring the additional metadata locations annotation processor compiler
+ * argument.
+ * <li>Adding the outputs of the processResources task as inputs of the compileJava task
+ * to ensure that the additional metadata is available when the annotation processor runs.
  * <li>Defining an artifact for the resulting configuration property metadata so that it
  * can be consumed by downstream projects.
  * </ul>
@@ -83,6 +87,7 @@ public class ConfigurationPropertiesPlugin implements Plugin<Project> {
 	private void configureAdditionalMetadataLocationsCompilerArgument(Project project) {
 		JavaCompile compileJava = project.getTasks().withType(JavaCompile.class)
 				.getByName(JavaPlugin.COMPILE_JAVA_TASK_NAME);
+		((Task) compileJava).getInputs().files(project.getTasks().getByName(JavaPlugin.PROCESS_RESOURCES_TASK_NAME));
 		SourceSet mainSourceSet = project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets()
 				.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
 		compileJava.getOptions().getCompilerArgs()