allow to pull ES from local repo - part 2

jakelandis · jakelandis · commit db92d1d721c9 · 2019-07-03T18:22:22.000-05:00
diff --git a/qa/build.gradle b/qa/build.gradle
@@ -32,7 +32,6 @@ subprojects {
     // a local repo if we're currently in the release manager (unlikely, but be future proof).
     buildscript {
         boolean localRepo = project.getProperties().containsKey("localRepo")
-        localRepo = false // TODO: Remove this once we can safely depend on build-tools again.
         repositories {
             jcenter()
             mavenCentral()
@@ -44,11 +43,12 @@ subprojects {
             }
         }
         dependencies {
-            if (localRepo) {
-                classpath name: "build-tools-${version}"
-            } else {
+            //// TODO: Uncomment this once we can safely depend on build-tools again.
+//            if (localRepo) {
+//                classpath name: "build-tools-${version}"
+//            } else {
                 classpath group: 'org.elasticsearch.gradle', name: 'build-tools', version: project.ext.buildToolsVersion
-            }
+//            }
         }
     }
 }
diff --git a/qa/kerberos/build.gradle b/qa/kerberos/build.gradle
@@ -40,7 +40,6 @@ configurations {
 }
 
 boolean localRepo = project.getProperties().containsKey("localRepo")
-localRepo = false // TODO: Remove this once we can safely depend on build-tools again.
 
 dependencies {
     compile project(":elasticsearch-hadoop-mr")

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ subprojects {`
`32`	`32`	`// a local repo if we're currently in the release manager (unlikely, but be future proof).`
`33`	`33`	`buildscript {`
`34`	`34`	`boolean localRepo = project.getProperties().containsKey("localRepo")`
`35`		`- localRepo = false // TODO: Remove this once we can safely depend on build-tools again.`
`36`	`35`	`repositories {`
`37`	`36`	`jcenter()`
`38`	`37`	`mavenCentral()`
`@@ -44,11 +43,12 @@ subprojects {`
`44`	`43`	`}`
`45`	`44`	`}`
`46`	`45`	`dependencies {`
`47`		`- if (localRepo) {`
`48`		`- classpath name: "build-tools-${version}"`
`49`		`- } else {`
	`46`	`+ //// TODO: Uncomment this once we can safely depend on build-tools again.`
	`47`	`+// if (localRepo) {`
	`48`	`+// classpath name: "build-tools-${version}"`
	`49`	`+// } else {`
`50`	`50`	`classpath group: 'org.elasticsearch.gradle', name: 'build-tools', version: project.ext.buildToolsVersion`
`51`		`- }`
	`51`	`+// }`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ configurations {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`boolean localRepo = project.getProperties().containsKey("localRepo")`
`43`		`-localRepo = false // TODO: Remove this once we can safely depend on build-tools again.`
`44`	`43`
`45`	`44`	`dependencies {`
`46`	`45`	`compile project(":elasticsearch-hadoop-mr")`