honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve more Gradle task validation warnings (#47825) 

(cherry picked from commit 82e3d5ea31101f4c27e69162684c3aa4fb2193a4)

# Conflicts:
#	buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy
This commit is contained in:
Mark Vieira 2019-10-09 15:42:49 -07:00
parent 0360a18f61
commit 5825d2df83
No known key found for this signature in database
GPG Key ID: CA947EF7E6D4B105
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy
View File

@ -23,6 +23,7 @@ import groovy.transform.PackageScope
import org.elasticsearch.gradle.doc.SnippetsTask.Snippet import org.elasticsearch.gradle.doc.SnippetsTask.Snippet
import org.gradle.api.InvalidUserDataException import org.gradle.api.InvalidUserDataException
import org.gradle.api.tasks.Input import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.OutputDirectory import org.gradle.api.tasks.OutputDirectory
import java.nio.file.Files import java.nio.file.Files
@ -58,6 +59,9 @@ class RestTestsFromSnippetsTask extends SnippetsTask {
@OutputDirectory @OutputDirectory
File testRoot = project.file('build/rest') File testRoot = project.file('build/rest')
@Internal
Set<String> names = new HashSet<>()
RestTestsFromSnippetsTask() { RestTestsFromSnippetsTask() {
project.afterEvaluate { project.afterEvaluate {
// Wait to set this so testRoot can be customized // Wait to set this so testRoot can be customized

1
buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchCluster.java
View File

@ -104,6 +104,7 @@ public class ElasticsearchCluster implements TestClusterConfiguration, Named {
} }
} }
@Internal
ElasticsearchNode getFirstNode() { ElasticsearchNode getFirstNode() {
return nodes.getAt(clusterName + "-0"); return nodes.getAt(clusterName + "-0");
} }

1
buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
View File

@ -183,6 +183,7 @@ public class ElasticsearchNode implements TestClusterConfiguration {
return distributions.get(currentDistro).getVersion(); return distributions.get(currentDistro).getVersion();
} }
@Internal
public Path getDistroDir() { public Path getDistroDir() {
return workingDir.resolve("distro").resolve(getVersion() + "-" + testDistribution); return workingDir.resolve("distro").resolve(getVersion() + "-" + testDistribution);
} }