honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-23 13:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Vieira 2019-08-05 15:52:46 -07:00 committed by GitHub
parent b5f88120b5
commit 87fb487299
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestIntegTestTask.groovy
View File

@ -18,9 +18,10 @@
*/ */
package org.elasticsearch.gradle.test package org.elasticsearch.gradle.test
import org.elasticsearch.gradle.VersionProperties
import org.elasticsearch.gradle.testclusters.ElasticsearchCluster import org.elasticsearch.gradle.testclusters.ElasticsearchCluster
import org.elasticsearch.gradle.testclusters.TestClustersPlugin import org.elasticsearch.gradle.testclusters.TestClustersPlugin
import org.elasticsearch.gradle.tool.ClasspathUtils
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.Task import org.gradle.api.Task
import org.gradle.api.execution.TaskExecutionAdapter import org.gradle.api.execution.TaskExecutionAdapter
@ -242,7 +243,8 @@ class RestIntegTestTask extends DefaultTask {
restSpec restSpec
} }
project.dependencies { 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') Task copyRestSpec = project.tasks.findByName('copyRestSpec')
if (copyRestSpec != null) { if (copyRestSpec != null) {