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

[7.x] Upgrade Gradle docker-compose plugin (#58873)

This commit is contained in:
Mark Vieira 2020-07-01 16:08:46 -07:00 committed by GitHub
parent 5e49ee800e
commit 402110c557
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/build.gradle
View File

@ -100,7 +100,7 @@ dependencies {
api "org.elasticsearch:jna:5.5.0" api "org.elasticsearch:jna:5.5.0"
api 'com.github.jengelman.gradle.plugins:shadow:5.1.0' api 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
api 'de.thetaphi:forbiddenapis:3.0' api 'de.thetaphi:forbiddenapis:3.0'
api 'com.avast.gradle:gradle-docker-compose-plugin:0.8.12' api 'com.avast.gradle:gradle-docker-compose-plugin:0.12.1'
api 'org.apache.maven:maven-model:3.6.2' api 'org.apache.maven:maven-model:3.6.2'
api 'com.networknt:json-schema-validator:1.0.36' api 'com.networknt:json-schema-validator:1.0.36'

3
buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportService.java
View File

@ -336,8 +336,7 @@ public abstract class DockerSupportService implements BuildService<DockerSupport
Result lastCommand Result lastCommand
) { ) {
this.isAvailable = isAvailable; this.isAvailable = isAvailable;
// TODO: This is temporary, and should be removed when https://github.com/elastic/elasticsearch/issues/58795 is resolved this.isComposeAvailable = isComposeAvailable;
this.isComposeAvailable = false; // isComposeAvailable;
this.isVersionHighEnough = isVersionHighEnough; this.isVersionHighEnough = isVersionHighEnough;
this.path = path; this.path = path;
this.version = version; this.version = version;