Skip to content

Commit a2de34e

Browse files
authored
Update gradle wrapper to Gradle 6.7 (7.x backport) (#63909)
- Ignore Memory Manager thread in Gradle thread filter - Update gradle wrapper to 6.7 GA release - Fix deprecation: Instead of depending on a configuration, a configuration should extend that one
1 parent 3ccd515 commit a2de34e

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.6.1
1+
6.7

buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleThreadsFilter.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ public class GradleThreadsFilter implements ThreadFilter {
3030

3131
@Override
3232
public boolean reject(Thread t) {
33-
return t.getName().startsWith("Exec process") || t.getName().startsWith("File watcher consumer");
33+
return t.getName().startsWith("Exec process")
34+
|| t.getName().startsWith("File watcher consumer")
35+
|| t.getName().startsWith("Memory manager");
36+
3437
}
3538
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionSha256Sum=11657af6356b7587bfb37287b5992e94a9686d5c8a0a1b60b87b9928a2decde5
6+
distributionSha256Sum=0080de8491f0918e4f529a6db6820fa0b9e818ee2386117f4394f95feb1d5583

x-pack/plugin/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ subprojects {
2626
afterEvaluate {
2727
if (project.plugins.hasPlugin(PluginBuildPlugin)) {
2828
// see the root Gradle file for additional logic regarding this configuration
29-
project.configurations.create('featureAwarePlugin')
30-
project.dependencies.add('featureAwarePlugin', project.configurations.compileClasspath)
29+
def featureAwarePluginConfiguration = project.configurations.create('featureAwarePlugin')
30+
featureAwarePluginConfiguration.extendsFrom(project.configurations.compileClasspath)
3131
project.dependencies.add('featureAwarePlugin', project(':x-pack:test:feature-aware'))
3232
project.dependencies.add('featureAwarePlugin', project.sourceSets.main.output.getClassesDirs())
3333

@@ -49,7 +49,7 @@ subprojects {
4949
final FileCollection classDirectories = project.files(files).filter { it.exists() }
5050

5151
doFirst {
52-
args('-cp', project.configurations.featureAwarePlugin.asPath, 'org.elasticsearch.xpack.test.feature_aware.FeatureAwareCheck')
52+
args('-cp', featureAwarePluginConfiguration.asPath, 'org.elasticsearch.xpack.test.feature_aware.FeatureAwareCheck')
5353
classDirectories.each { args it.getAbsolutePath() }
5454
}
5555
doLast {

0 commit comments

Comments
 (0)