Merge branch 'master' into watcher_reporting_email_warning

Author: jakelandis

.ci/init.gradle

@@ -77,15 +77,18 @@ projectsLoaded {
     }
 }
 
-if (System.env.GRADLE_BUILD_CACHE_URL != null) {
+final String buildCacheUrl = System.getProperty('org.elasticsearch.build.cache.url')
+final boolean buildCachePush = Boolean.valueOf(System.getProperty('org.elasticsearch.build.cache.push', 'false'))
+
+if (buildCacheUrl) {
     final Map<String,String> buildCacheCredentials = vault.logical()
             .read("secret/elasticsearch-ci/gradle-build-cache")
             .getData();
     gradle.settingsEvaluated { settings ->
         settings.buildCache {
             remote(HttpBuildCache) {
-                url = System.getenv('GRADLE_BUILD_CACHE_URL')
-                push = Boolean.valueOf(System.getenv('GRADLE_BUILD_CACHE_PUSH') ?: 'false')
+                url = buildCacheUrl
+                push = buildCachePush
                 credentials {
                         username = buildCacheCredentials.get("username")
                         password = buildCacheCredentials.get("password")

Vagrantfile

@@ -41,6 +41,16 @@ Vagrant.configure(2) do |config|
   # the elasticsearch project called vagrant....
   config.vm.synced_folder '.', '/vagrant', disabled: true
   config.vm.synced_folder '.', '/elasticsearch'
+  # TODO: make these syncs work for windows!!!
+  config.vm.synced_folder "#{Dir.home}/.vagrant/gradle/caches/jars-3", "/root/.gradle/caches/jars-3",
+      create: true,
+      owner: "vagrant"
+  config.vm.synced_folder "#{Dir.home}/.vagrant/gradle/caches/modules-2", "/root/.gradle/caches/modules-2",
+      create: true,
+      owner: "vagrant"
+  config.vm.synced_folder "#{Dir.home}/.gradle/wrapper", "/root/.gradle/wrapper",
+      create: true,
+      owner: "vagrant"
 
   # Expose project directory. Note that VAGRANT_CWD may not be the same as Dir.pwd
   PROJECT_DIR = ENV['VAGRANT_PROJECT_DIR'] || Dir.pwd
@@ -376,22 +386,17 @@ export ZIP=/elasticsearch/distribution/zip/build/distributions
 export TAR=/elasticsearch/distribution/tar/build/distributions
 export RPM=/elasticsearch/distribution/rpm/build/distributions
 export DEB=/elasticsearch/distribution/deb/build/distributions
-export BATS=/project/build/bats
-export BATS_UTILS=/project/build/packaging/bats/utils
-export BATS_TESTS=/project/build/packaging/bats/tests
-export PACKAGING_ARCHIVES=/project/build/packaging/archives
 export PACKAGING_TESTS=/project/build/packaging/tests
 VARS
     cat \<\<SUDOERS_VARS > /etc/sudoers.d/elasticsearch_vars
 Defaults   env_keep += "ZIP"
 Defaults   env_keep += "TAR"
 Defaults   env_keep += "RPM"
 Defaults   env_keep += "DEB"
-Defaults   env_keep += "BATS"
-Defaults   env_keep += "BATS_UTILS"
-Defaults   env_keep += "BATS_TESTS"
 Defaults   env_keep += "PACKAGING_ARCHIVES"
 Defaults   env_keep += "PACKAGING_TESTS"
+Defaults   env_keep += "BATS_UTILS"
+Defaults   env_keep += "BATS_TESTS"
 Defaults   env_keep += "JAVA_HOME"
 Defaults   env_keep += "SYSTEM_JAVA_HOME"
 SUDOERS_VARS

build.gradle

@@ -24,12 +24,15 @@ import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.BwcVersions
 import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.plugin.PluginBuildPlugin
+import org.elasticsearch.gradle.tool.Boilerplate
 import org.gradle.util.GradleVersion
 import org.gradle.util.DistributionLocator
 import org.gradle.plugins.ide.eclipse.model.SourceFolder
 
+import static org.elasticsearch.gradle.tool.Boilerplate.maybeConfigure
+
 plugins {
-    id 'com.gradle.build-scan' version '2.3'
+    id 'com.gradle.build-scan' version '2.4'
     id 'base'
     id 'elasticsearch.global-build-info'
 }
@@ -209,7 +212,7 @@ task branchConsistency {
 
 allprojects {
   // ignore missing javadocs
-  tasks.withType(Javadoc) { Javadoc javadoc ->
+  tasks.withType(Javadoc).configureEach { Javadoc javadoc ->
     // the -quiet here is because of a bug in gradle, in that adding a string option
     // by itself is not added to the options. By adding quiet, both this option and
     // the "value" -quiet is added, separated by a space. This is ok since the javadoc
@@ -326,13 +329,9 @@ allprojects {
     }
   }
 
-  task cleanIdeaBuildDir(type: Delete) {
-    delete 'build-idea'
+  tasks.named('cleanIdea') {
+      delete 'build-idea'
   }
-  cleanIdeaBuildDir.setGroup("ide")
-  cleanIdeaBuildDir.setDescription("Deletes the IDEA build directory.")
-
-  tasks.cleanIdea.dependsOn(cleanIdeaBuildDir)
 }
 
 idea {
@@ -387,29 +386,20 @@ allprojects {
 
   String lineSeparator = Os.isFamily(Os.FAMILY_WINDOWS) ? '\\\\r\\\\n' : '\\\\n'
   String licenseHeader = licenseHeaderFile.getText('UTF-8').replace(System.lineSeparator(), lineSeparator)
-  task copyEclipseSettings(type: Copy) {
+  tasks.register('copyEclipseSettings', Copy) {
+    mustRunAfter 'wipeEclipseSettings'
     // TODO: "package this up" for external builds
     from new File(project.rootDir, 'buildSrc/src/main/resources/eclipse.settings')
     into '.settings'
     filter{ it.replaceAll('@@LICENSE_HEADER_TEXT@@', licenseHeader)}
   }
   // otherwise .settings is not nuked entirely
-  task wipeEclipseSettings(type: Delete) {
+  tasks.register('wipeEclipseSettings', Delete) {
     delete '.settings'
   }
-  tasks.cleanEclipse.dependsOn(wipeEclipseSettings)
+  tasks.named('cleanEclipse') { dependsOn 'wipeEclipseSettings' }
   // otherwise the eclipse merging is *super confusing*
-  tasks.eclipse.dependsOn(cleanEclipse, copyEclipseSettings)
-
-  // work arround https://github.com/gradle/gradle/issues/6582 
-  tasks.eclipseProject.mustRunAfter tasks.cleanEclipseProject
-  tasks.matching { it.name == 'eclipseClasspath' }.all {
-    it.mustRunAfter { tasks.cleanEclipseClasspath }
-  }
-  tasks.matching { it.name == 'eclipseJdt' }.all {
-    it.mustRunAfter { tasks.cleanEclipseJdt }
-  }
-  tasks.copyEclipseSettings.mustRunAfter tasks.wipeEclipseSettings
+  tasks.named('eclipse') { dependsOn 'cleanEclipse', 'copyEclipseSettings' }
 }
 
 allprojects {
@@ -474,13 +464,11 @@ gradle.projectsEvaluated {
      * need to publish artifacts for them.
      */
     if (project.name.equals('qa') || project.path.contains(':qa:')) {
-      Task assemble = project.tasks.findByName('assemble')
-      if (assemble) {
-        assemble.enabled = false
+      maybeConfigure(project.tasks, 'assemble') {
+        it.enabled = false
       }
-      Task dependenciesInfo = project.tasks.findByName('dependenciesInfo')
-      if (dependenciesInfo) {
-        dependenciesInfo.enabled = false
+      maybeConfigure(project.tasks, 'dependenciesInfo') {
+        it.enabled = false
       }
     }
   }
@@ -502,7 +490,7 @@ gradle.projectsEvaluated {
 }
 
 allprojects {
-  task resolveAllDependencies {
+  tasks.register('resolveAllDependencies') {
       dependsOn tasks.matching { it.name == "pullFixture"}
       doLast {
         configurations.findAll { it.isCanBeResolved() }.each { it.resolve() }
@@ -532,13 +520,13 @@ allprojects {
     }
   }
 
-  task checkPart1
-  task checkPart2 
-  tasks.matching { it.name == "check" }.all { check ->
-    if (check.path.startsWith(":x-pack:")) {
-      checkPart2.dependsOn check
-    } else {
-      checkPart1.dependsOn check
-    }
-  } 
+  def checkPart1 = tasks.register('checkPart1')
+  def checkPart2 = tasks.register('checkPart2')
+  plugins.withId('lifecycle-base') {
+      if (project.path.startsWith(":x-pack:")) {
+          checkPart2.configure { dependsOn 'check' }
+      } else {
+          checkPart1.configure { dependsOn 'check' }
+      }
+  }
 }

buildSrc/build.gradle

@@ -67,6 +67,7 @@ if (JavaVersion.current() < JavaVersion.VERSION_11) {
 }
 
 allprojects {
+  apply plugin: 'java'
   targetCompatibility = '11'
   sourceCompatibility = '11'
 }
@@ -76,20 +77,13 @@ sourceSets {
     minimumRuntime { }
 }
 
-configurations {
-  reaper
-}
-
 compileMinimumRuntimeJava {
     targetCompatibility = 8
     sourceCompatibility = 8
 }
 
 jar {
     from sourceSets.minimumRuntime.output
-    into('META-INF') {
-        from configurations.reaper
-    }
 }
 
 javadoc {
@@ -127,7 +121,6 @@ dependencies {
   testCompile "junit:junit:${props.getProperty('junit')}"
   testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${props.getProperty('randomizedrunner')}"
   testCompile 'com.github.tomakehurst:wiremock-jre8-standalone:2.23.2'
-  reaper project('reaper')
   minimumRuntimeCompile "junit:junit:${props.getProperty('junit')}"
   minimumRuntimeCompile localGroovy()
   minimumRuntimeCompile gradleApi()
@@ -143,6 +136,10 @@ if (project == rootProject) {
       mavenLocal()
     }
   }
+  dependencies {
+    // add this so the runtime classpath so Gradle will properly track it as a build runtime classpath input
+    runtimeOnly project('reaper')
+  }
   // only run tests as build-tools
   test.enabled = false
 }
@@ -172,9 +169,11 @@ if (project != rootProject) {
 
   configurations {
     distribution
+    reaper
   }
 
   dependencies {
+    reaper project('reaper')
     distribution project(':distribution:archives:windows-zip')
     distribution project(':distribution:archives:oss-windows-zip')
     distribution project(':distribution:archives:darwin-tar')
@@ -186,6 +185,9 @@ if (project != rootProject) {
   // for external projects we want to remove the marker file indicating we are running the Elasticsearch project
   processResources {
       exclude 'buildSrc.marker'
+      into('META-INF') {
+          from configurations.reaper
+      }
   }
 
   String localDownloads = "${rootProject.buildDir}/local-downloads"

buildSrc/reaper/build.gradle

@@ -1,6 +1,5 @@
-apply plugin: 'java'
-
 jar {
+    archiveName = "${project.name}.jar"
     manifest {
         attributes 'Main-Class': 'org.elasticsearch.gradle.reaper.Reaper'
     }