Fix failed dependency resolution with external build-tools users (#45107

)
elastic · Aug 5, 2019 · 86c4a69 · 86c4a69
1 parent 277033a
commit 86c4a69
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestIntegTestTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestIntegTestTask.groovy
@@ -18,9 +18,10 @@
  */
 package org.elasticsearch.gradle.test
 
-
+import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.testclusters.ElasticsearchCluster
 import org.elasticsearch.gradle.testclusters.TestClustersPlugin
+import org.elasticsearch.gradle.tool.ClasspathUtils
 import org.gradle.api.DefaultTask
 import org.gradle.api.Task
 import org.gradle.api.execution.TaskExecutionAdapter
@@ -244,7 +245,8 @@ class RestIntegTestTask extends DefaultTask {
             restSpec
         }
         project.dependencies {
-            restSpec project.project(':rest-api-spec')
+            restSpec ClasspathUtils.isElasticsearchProject() ? project.project(':rest-api-spec') :
+                    "org.elasticsearch.rest-api-spec:${VersionProperties.elasticsearch}"
         }
         Task copyRestSpec = project.tasks.findByName('copyRestSpec')
         if (copyRestSpec != null) {