logstash/trunk/build.patch

   1 diff --git a/build.gradle b/build.gradle
   2 index 5b2275e..67312d6 100644
   3 --- a/build.gradle
   4 +++ b/build.gradle
   5 @@ -111,7 +111,6 @@ def isReleaseBuild = System.getenv('RELEASE') == "1" || versionQualifier
   6  clean {
   7    delete "${projectDir}/Gemfile"
   8    delete "${projectDir}/Gemfile.lock"
   9 -  delete "${projectDir}/vendor"
  10    delete "${projectDir}/.bundle"
  11    delete "${projectDir}/qa/integration/Gemfile.lock"
  12    delete "${projectDir}/qa/integration/.bundle"
  13 @@ -346,7 +345,7 @@ task downloadEs(type: Download) {
  14      // in the normal PR type builds it is plain '7.0.0'
  15      // in the build invoked by the release manager it is '7.0.0-alpha1' etc.
  16      // the artifacts-api will return JSON like this: `{"versions":["5.6.13-SNAPSHOT","6.4.3-SNAPSHOT","6.5.0-SNAPSHOT","6.6.0-SNAPSHOT","7.0.0-alpha1-SNAPSHOT"]}`
  17 -
  18 +
  19      String qualifiedVersion = dlVersions['versions'].grep(isReleaseBuild ? ~/^${version}$/ : ~/^${version}-SNAPSHOT/)[0]
  20
  21      if (qualifiedVersion == null) {
  22 diff --git a/rubyUtils.gradle b/rubyUtils.gradle
  23 index 6f0eec4..08a35f6 100644
  24 --- a/rubyUtils.gradle
  25 +++ b/rubyUtils.gradle
  26 @@ -190,7 +190,7 @@ task downloadJRuby(type: Download) {
  27
  28  downloadJRuby.onlyIf { customJRubyDir == "" }
  29
  30 -task verifyFile(dependsOn: downloadJRuby, type: Verify) {
  31 +task verifyFile(type: Verify) {
  32      description "Verify the SHA1 of the download JRuby artifact"
  33      inputs.file(jrubyTarPath)
  34      outputs.file(jrubyTarPath)
  35 @@ -202,36 +202,7 @@ task verifyFile(dependsOn: downloadJRuby, type: Verify) {
  36  verifyFile.onlyIf { customJRubyDir == "" }
  37  verifyFile.onlyIf { doChecksum }
  38
  39 -task buildCustomJRuby(type: Exec) {
  40 -    description "Build tar.gz and .jar artifacts from JRuby source directory"
  41 -    workingDir (customJRubyDir == "" ? "./" : customJRubyDir)
  42 -    commandLine './mvnw', 'clean', 'install', '-Pdist', '-Pcomplete'
  43 -    standardOutput = new ByteArrayOutputStream()
  44 -    errorOutput = new ByteArrayOutputStream()
  45 -    ext.output = {
  46 -        standardOutput.toString() + errorOutput.toString()
  47 -    }
  48 -}
  49 -
  50 -buildCustomJRuby.onlyIf { customJRubyDir != "" }
  51 -
  52 -task installCustomJRuby(dependsOn: buildCustomJRuby, type: Copy) {
  53 -    description "Install custom built JRuby in the vendor directory"
  54 -    inputs.file(customJRubyTar)
  55 -    outputs.dir("${projectDir}/vendor/jruby")
  56 -    from tarTree(customJRubyTar == "" ? jrubyTarPath : customJRubyTar)
  57 -    eachFile { f ->
  58 -        f.path = f.path.replaceFirst("^jruby-${customJRubyVersion}", '')
  59 -    }
  60 -    exclude "**/stdlib/rdoc/**"
  61 -    includeEmptyDirs = false
  62 -    into "${projectDir}/vendor/jruby"
  63 -}
  64 -
  65 -installCustomJRuby.onlyIf { customJRubyDir != "" }
  66 -
  67 -
  68 -task downloadAndInstallJRuby(dependsOn: [verifyFile, installCustomJRuby], type: Copy) {
  69 +task downloadAndInstallJRuby(dependsOn: [verifyFile], type: Copy) {
  70      description "Install JRuby in the vendor directory"
  71      inputs.file(jrubyTarPath)
  72      outputs.dir("${projectDir}/vendor/jruby")