From 0227ac5690fb78341b521056d5fac1bb3f129812 Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Thu, 18 Apr 2019 11:15:34 -0700 Subject: [PATCH] Fix issue with subproject test task dependencies (#41321) (#41351) --- .../elasticsearch/gradle/precommit/TestingConventionsTasks.java | 2 +- x-pack/plugin/sql/qa/security/build.gradle | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/TestingConventionsTasks.java b/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/TestingConventionsTasks.java index b2228f5c1b1..95ad323ceda 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/TestingConventionsTasks.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/TestingConventionsTasks.java @@ -65,7 +65,7 @@ public class TestingConventionsTasks extends DefaultTask { public TestingConventionsTasks() { setDescription("Tests various testing conventions"); // Run only after everything is compiled - Boilerplate.getJavaSourceSets(getProject()).all(sourceSet -> dependsOn(sourceSet.getClassesTaskName())); + Boilerplate.getJavaSourceSets(getProject()).all(sourceSet -> dependsOn(sourceSet.getOutput().getClassesDirs())); naming = getProject().container(TestingConventionRule.class); } diff --git a/x-pack/plugin/sql/qa/security/build.gradle b/x-pack/plugin/sql/qa/security/build.gradle index 525acaf99d6..a0e6e82ed4d 100644 --- a/x-pack/plugin/sql/qa/security/build.gradle +++ b/x-pack/plugin/sql/qa/security/build.gradle @@ -15,6 +15,7 @@ subprojects { test { mainProject.sourceSets.test.output.classesDirs.each { dir -> output.addClassesDir { dir } + output.builtBy(mainProject.tasks.testClasses) } runtimeClasspath += mainProject.sourceSets.test.output }