iter

elastic · Apr 17, 2018 · a98747a · a98747a
1 parent d82b740
commit a98747a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
@@ -223,20 +223,33 @@ class BuildPlugin implements Plugin<Project> {
     }
 
     /** Add a check before gradle execution phase which ensures java home for the given java version is set. */
-    static void requireJavaHome(Project project, Task task, int version) {
-        project.gradle.taskGraph.whenReady { TaskExecutionGraph taskGraph ->
-            if (taskGraph.hasTask(task)) {
-                if (project.javaVersions.get(version) == null) {
-                    throw new GradleException("JAVA${version}_HOME required to run task ${task.path}")
+    static void requireJavaHome(Task task, int version) {
+        Project rootProject = task.project.rootProject // use root project for global accounting
+        if (rootProject.hasProperty('requiredJavaVersions') == false) {
+            rootProject.rootProject.ext.requiredJavaVersions = [:].withDefault{key -> return []}
+            rootProject.gradle.taskGraph.whenReady { TaskExecutionGraph taskGraph ->
+                List<String> messages = []
+                for (entry in rootProject.requiredJavaVersions) {
+                    if (rootProject.javaVersions.get(entry.key) != null) {
+                        continue
+                    }
+                    List<String> tasks = entry.value.findAll { taskGraph.hasTask(it) }.collect { "  ${it.path}" }
+                    if (tasks.isEmpty() == false) {
+                        messages.add("JAVA${entry.key}_HOME required to run tasks:\n${tasks.join('\n')}")
+                    }
+                }
+                if (messages.isEmpty() == false) {
+                    throw new GradleException(messages.join('\n'))
                 }
             }
         }
+        rootProject.requiredJavaVersions.get(version).add(task)
     }
 
     /** A convenience method for getting java home for a version of java and requiring that version for the given task to execute */
-    static String getJavaHome(final Project project, final Task task, final int version) {
-        requireJavaHome(project, task, version)
-        return project.javaVersions.get(version)
+    static String getJavaHome(final Task task, final int version) {
+        requireJavaHome(task, version)
+        return task.project.javaVersions.get(version)
     }
 
     private static String findRuntimeJavaHome(final String compilerJavaHome) {

diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
@@ -609,7 +609,7 @@ class ClusterFormationTasks {
 
         Task start = project.tasks.create(name: name, type: DefaultTask, dependsOn: setup)
         if (node.javaVersion != null) {
-            BuildPlugin.requireJavaHome(project, start, node.javaVersion)
+            BuildPlugin.requireJavaHome(start, node.javaVersion)
         }
         start.doLast(elasticsearchRunner)
         return start

diff --git a/distribution/bwc/build.gradle b/distribution/bwc/build.gradle
@@ -147,9 +147,9 @@ subprojects {
     workingDir = checkoutDir
     if (["5.6", "6.0", "6.1"].contains(bwcBranch)) {
       // we are building branches that are officially built with JDK 8, push JAVA8_HOME to JAVA_HOME for these builds
-      environment('JAVA_HOME', getJavaHome(project, it, 8))
+      environment('JAVA_HOME', getJavaHome(it, 8))
     } else if ("6.2".equals(bwcBranch)) {
-      environment('JAVA_HOME', getJavaHome(project, it, 9))
+      environment('JAVA_HOME', getJavaHome(it, 9))
     } else {
       environment('JAVA_HOME', project.compilerJavaHome)
     }

diff --git a/qa/reindex-from-old/build.gradle b/qa/reindex-from-old/build.gradle
@@ -77,7 +77,7 @@ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
       dependsOn unzip
       executable = new File(project.runtimeJavaHome, 'bin/java')
       env 'CLASSPATH', "${ -> project.configurations.oldesFixture.asPath }"
-      env 'JAVA_HOME', getJavaHome(project, it, 7)
+      env 'JAVA_HOME', getJavaHome(it, 7)
       args 'oldes.OldElasticsearch',
            baseDir,
            unzip.temporaryDir,