From ac8a9515a3c8bfb4ad769bc410ce1ebebd286002 Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Thu, 30 May 2019 08:38:17 -0700 Subject: [PATCH] Remove usage of deprecated compare gradle builds plugin (#42687) --- build.gradle | 25 ------------------- .../elasticsearch/gradle/BuildPlugin.groovy | 4 --- 2 files changed, 29 deletions(-) diff --git a/build.gradle b/build.gradle index 9b4aa3ed9c7..93659101d84 100644 --- a/build.gradle +++ b/build.gradle @@ -552,31 +552,6 @@ gradle.projectsEvaluated { } } -if (System.properties.get("build.compare") != null) { - apply plugin: 'compare-gradle-builds' - compareGradleBuilds { - ext.referenceProject = System.properties.get("build.compare") - doFirst { - if (file(referenceProject).exists() == false) { - throw new GradleException( - "Use git worktree to check out a version to compare against to ../elasticsearch_build_reference" - ) - } - } - sourceBuild { - gradleVersion = gradle.getGradleVersion() - projectDir = referenceProject - tasks = ["clean", "assemble"] - arguments = ["-Dbuild.compare_friendly=true"] - } - targetBuild { - tasks = ["clean", "assemble"] - // use -Dorg.gradle.java.home= to alter jdk versions - arguments = ["-Dbuild.compare_friendly=true"] - } - } -} - allprojects { task resolveAllDependencies { dependsOn tasks.matching { it.name == "pullFixture"} diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy index d86cfdae2db..1f713e9f1be 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy @@ -922,10 +922,6 @@ class BuildPlugin implements Plugin { jarTask.manifest.attributes('Change': shortHash) } } - // Force manifest entries that change by nature to a constant to be able to compare builds more effectively - if (System.properties.getProperty("build.compare_friendly", "false") == "true") { - jarTask.manifest.getAttributes().clear() - } } // add license/notice files project.afterEvaluate {