From db4873a2920a242d4223a754e59f43684b1a62b4 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Tue, 20 Oct 2020 09:46:28 +0200 Subject: [PATCH 1/2] Update gradle wrapper to Gradle 6.7 (#62386) - Ignore Memory Manager thread in Gradle thread filter - Update gradle wrapper to 6.7 GA release --- buildSrc/src/main/resources/minimumGradleVersion | 2 +- .../org/elasticsearch/gradle/test/GradleThreadsFilter.java | 5 ++++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/resources/minimumGradleVersion b/buildSrc/src/main/resources/minimumGradleVersion index ba92e72f5775b..5840475a6c30a 100644 --- a/buildSrc/src/main/resources/minimumGradleVersion +++ b/buildSrc/src/main/resources/minimumGradleVersion @@ -1 +1 @@ -6.6.1 \ No newline at end of file +6.7 \ No newline at end of file diff --git a/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleThreadsFilter.java b/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleThreadsFilter.java index e216c123001e3..99268a800d2d7 100644 --- a/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleThreadsFilter.java +++ b/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleThreadsFilter.java @@ -30,6 +30,9 @@ public class GradleThreadsFilter implements ThreadFilter { @Override public boolean reject(Thread t) { - return t.getName().startsWith("Exec process") || t.getName().startsWith("File watcher consumer"); + return t.getName().startsWith("Exec process") + || t.getName().startsWith("File watcher consumer") + || t.getName().startsWith("Memory manager"); + } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c2d86efbc66d..0cb16492aa0be 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionSha256Sum=11657af6356b7587bfb37287b5992e94a9686d5c8a0a1b60b87b9928a2decde5 +distributionSha256Sum=0080de8491f0918e4f529a6db6820fa0b9e818ee2386117f4394f95feb1d5583 From b894b44b27f2e039fb639e56547d08999e19e809 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Wed, 21 Oct 2020 16:15:13 +0200 Subject: [PATCH 2/2] Fix gradle deprecation - Instead of depending on a configuration, a configuration should extend that one --- x-pack/plugin/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x-pack/plugin/build.gradle b/x-pack/plugin/build.gradle index f6b0eaf115bf8..977ab422a36f8 100644 --- a/x-pack/plugin/build.gradle +++ b/x-pack/plugin/build.gradle @@ -26,8 +26,8 @@ subprojects { afterEvaluate { if (project.plugins.hasPlugin(PluginBuildPlugin)) { // see the root Gradle file for additional logic regarding this configuration - project.configurations.create('featureAwarePlugin') - project.dependencies.add('featureAwarePlugin', project.configurations.compileClasspath) + def featureAwarePluginConfiguration = project.configurations.create('featureAwarePlugin') + featureAwarePluginConfiguration.extendsFrom(project.configurations.compileClasspath) project.dependencies.add('featureAwarePlugin', project(':x-pack:test:feature-aware')) project.dependencies.add('featureAwarePlugin', project.sourceSets.main.output.getClassesDirs()) @@ -49,7 +49,7 @@ subprojects { final FileCollection classDirectories = project.files(files).filter { it.exists() } doFirst { - args('-cp', project.configurations.featureAwarePlugin.asPath, 'org.elasticsearch.xpack.test.feature_aware.FeatureAwareCheck') + args('-cp', featureAwarePluginConfiguration.asPath, 'org.elasticsearch.xpack.test.feature_aware.FeatureAwareCheck') classDirectories.each { args it.getAbsolutePath() } } doLast {