Skip to content

Commit f4e505e

Browse files
breskebybreskeby
authored
Update Gradle wrapper to 8.13 (#122421) (#123875)
* Fix Gradle Deprecation warning as declaring an is- property with a Boolean type has been deprecated. * Make use of new layout.settingsFolder api to address some cross project references * Fix buildParams snapshot check for multiprojet projects (cherry picked from commit e19b226) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java # docs/build.gradle # qa/entitlements/build.gradle # x-pack/qa/multi-project/core-rest-tests-with-multiple-projects/build.gradle # x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/build.gradle
1 parent d85bd53 commit f4e505e

File tree

64 files changed

+102
-101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+102
-101
lines changed

‎build-tools-internal/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
3+
distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/distribution/archives/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ subprojects {
3434
}
3535

3636
def calculateBranchVersion() {
37-
File f = rootProject.file(".git/refs/heads/origin")
37+
File f = layout.settingsDirectory.file(".git/refs/heads/origin").asFile
3838
def branchName = f.list()?.first().trim()
3939
return branchName + ".1"
4040

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void apply(Project project) {
3939
project.getPluginManager().apply(JarHellPrecommitPlugin.class);
4040
project.getPluginManager().apply(ElasticsearchJavaPlugin.class);
4141
project.getPluginManager().apply(HistoricalFeaturesMetadataPlugin.class);
42-
boolean isCi = project.getRootProject().getExtensions().getByType(BuildParameterExtension.class).isCi();
42+
boolean isCi = project.getRootProject().getExtensions().getByType(BuildParameterExtension.class).getCi();
4343
// Clear default dependencies added by public PluginBuildPlugin as we add our
4444
// own project dependencies for internal builds
4545
// TODO remove once we removed default dependencies from PluginBuildPlugin

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaBasePlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public void configureCompile(Project project) {
161161
compileTask.getConventionMapping().map("sourceCompatibility", () -> java.getSourceCompatibility().toString());
162162
compileTask.getConventionMapping().map("targetCompatibility", () -> java.getTargetCompatibility().toString());
163163
compileOptions.getRelease().set(releaseVersionProviderFromCompileTask(project, compileTask));
164-
compileOptions.setIncremental(buildParams.isCi() == false);
164+
compileOptions.setIncremental(buildParams.getCi() == false);
165165
});
166166
// also apply release flag to groovy, which is used in build-tools
167167
project.getTasks().withType(GroovyCompile.class).configureEach(compileTask -> {

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void apply(Project project) {
7272
project.getPlugins().apply(JvmToolchainsPlugin.class);
7373
toolChainService = project.getExtensions().getByType(JavaToolchainService.class);
7474
var buildParams = loadBuildParams(project).get();
75-
Boolean isCi = buildParams.isCi();
75+
Boolean isCi = buildParams.getCi();
7676
buildParams.getBwcVersions().forPreviousUnreleased((BwcVersions.UnreleasedVersionInfo unreleasedVersion) -> {
7777
configureBwcProject(
7878
project.project(unreleasedVersion.gradleProjectPath()),
@@ -346,7 +346,7 @@ static void createBuildBwcTask(
346346
} else {
347347
c.getOutputs().files(expectedOutputFile);
348348
}
349-
c.getOutputs().doNotCacheIf("BWC distribution caching is disabled for local builds", task -> buildParams.isCi() == false);
349+
c.getOutputs().doNotCacheIf("BWC distribution caching is disabled for local builds", task -> buildParams.getCi() == false);
350350
c.getArgs().add("-p");
351351
c.getArgs().add(projectPath);
352352
c.getArgs().add(assembleTaskName);

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalTestClustersPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void apply(Project project) {
3030
TestClustersPlugin testClustersPlugin = project.getPlugins().apply(TestClustersPlugin.class);
3131
testClustersPlugin.setRuntimeJava(buildParams.getRuntimeJavaHome());
3232
testClustersPlugin.setIsReleasedVersion(
33-
version -> (version.equals(VersionProperties.getElasticsearchVersion()) && buildParams.isSnapshotBuild() == false)
33+
version -> (version.equals(VersionProperties.getElasticsearchVersion()) && buildParams.getSnapshotBuild() == false)
3434
|| buildParams.getBwcVersions().unreleasedInfo(version) == null
3535
);
3636

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void apply(Project project) {
4040
.getSharedServices()
4141
.registerIfAbsent(DOCKER_SUPPORT_SERVICE_NAME, DockerSupportService.class, spec -> spec.parameters(params -> {
4242
params.setExclusionsFile(new File(project.getRootDir(), DOCKER_ON_LINUX_EXCLUSIONS_FILE));
43-
params.getIsCI().set(buildParams.isCi());
43+
params.getIsCI().set(buildParams.getCi());
4444
}));
4545

4646
// Ensure that if we are trying to run any DockerBuildTask tasks, we assert an available Docker installation exists

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/BuildParameterExtension.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ public interface BuildParameterExtension {
5454

5555
String getTestSeed();
5656

57-
Boolean isCi();
57+
Boolean getCi();
5858

5959
Integer getDefaultParallel();
6060

61-
Boolean isSnapshotBuild();
61+
Boolean getSnapshotBuild();
6262

6363
BwcVersions getBwcVersions();
6464

6565
Provider<BwcVersions> getBwcVersionsProvider();
6666

6767
Random getRandom();
6868

69-
Boolean isGraalVmRuntime();
69+
Boolean getGraalVmRuntime();
7070
}

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/DefaultBuildParameterExtension.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public abstract class DefaultBuildParameterExtension implements BuildParameterEx
4242
private final String testSeed;
4343
private final Boolean isCi;
4444
private final Integer defaultParallel;
45-
private final Boolean isSnapshotBuild;
45+
private final Boolean snapshotBuild;
4646

4747
// not final for testing
4848
private Provider<BwcVersions> bwcVersions;
@@ -81,7 +81,7 @@ public DefaultBuildParameterExtension(
8181
this.testSeed = testSeed;
8282
this.isCi = isCi;
8383
this.defaultParallel = defaultParallel;
84-
this.isSnapshotBuild = isSnapshotBuild;
84+
this.snapshotBuild = isSnapshotBuild;
8585
this.bwcVersions = cache(providers, bwcVersions);
8686
this.gitOrigin = gitOrigin;
8787
}
@@ -183,7 +183,7 @@ public String getTestSeed() {
183183
}
184184

185185
@Override
186-
public Boolean isCi() {
186+
public Boolean getCi() {
187187
return isCi;
188188
}
189189

@@ -193,8 +193,8 @@ public Integer getDefaultParallel() {
193193
}
194194

195195
@Override
196-
public Boolean isSnapshotBuild() {
197-
return isSnapshotBuild;
196+
public Boolean getSnapshotBuild() {
197+
return snapshotBuild;
198198
}
199199

200200
@Override
@@ -208,7 +208,7 @@ public Random getRandom() {
208208
}
209209

210210
@Override
211-
public Boolean isGraalVmRuntime() {
211+
public Boolean getGraalVmRuntime() {
212212
return runtimeJavaDetails.get().toLowerCase().contains("graalvm");
213213
}
214214

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/MutedTestPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void apply(Project project) {
5151
}
5252

5353
// Don't fail when all tests are ignored when running in CI
54-
filter.setFailOnNoMatchingTests(buildParams.isCi() == false);
54+
filter.setFailOnNoMatchingTests(buildParams.getCi() == false);
5555
});
5656
});
5757
}

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixturesDeployPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void apply(Project project) {
3333
var buildParams = loadBuildParams(project).get();
3434
NamedDomainObjectContainer<TestFixtureDeployment> fixtures = project.container(TestFixtureDeployment.class);
3535
project.getExtensions().add("dockerFixtures", fixtures);
36-
registerDeployTaskPerFixture(project, fixtures, buildParams.isCi());
36+
registerDeployTaskPerFixture(project, fixtures, buildParams.getCi());
3737
project.getTasks().register(DEPLOY_FIXTURE_TASK_NAME, task -> task.dependsOn(project.getTasks().withType(DockerBuildTask.class)));
3838
}
3939

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixturesPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void apply(Project project) {
131131

132132
tasks.withType(ComposeUp.class).named("composeUp").configure(t -> {
133133
// Avoid running docker-compose tasks in parallel in CI due to some issues on certain Linux distributions
134-
if (buildParams.isCi()) {
134+
if (buildParams.getCi()) {
135135
t.usesService(dockerComposeThrottle);
136136
t.usesService(dockerSupport);
137137
}

‎build-tools-internal/src/main/resources/minimumGradleVersion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.12.1
1+
8.13

‎client/rest/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ base {
3737

3838
// LLRC is licenses under Apache 2.0
3939
projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
40-
licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
40+
licenseFile.set(layout.getSettingsDirectory().file('licenses/APACHE-LICENSE-2.0.txt').asFile)
4141

4242
dependencies {
4343
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"

‎client/sniffer/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ base {
3333

3434
// rest client sniffer is licenses under Apache 2.0
3535
projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
36-
licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
36+
licenseFile.set(layout.getSettingsDirectory().file('licenses/APACHE-LICENSE-2.0.txt').asFile)
3737

3838
dependencies {
3939
api project(":client:rest")

‎client/test/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ group = "${group}.client.test"
1919

2020
// rest client sniffer is licenses under Apache 2.0
2121
projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
22-
licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
22+
licenseFile.set(layout.getSettingsDirectory().file('licenses/APACHE-LICENSE-2.0.txt').asFile)
2323

2424
dependencies {
2525
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"

‎distribution/archives/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ CopySpec archiveFiles(String distributionType, String os, String architecture, b
5757
pluginsDir.getParent()
5858
}
5959
}
60-
from(rootProject.projectDir) {
60+
from(layout.settingsDirectory.asFile) {
6161
filePermissions {
6262
unix(0644)
6363
}
6464
include 'README.asciidoc'
6565
}
66-
from(rootProject.file('licenses')) {
66+
from(layout.settingsDirectory.file('licenses').asFile) {
6767
include isTestDistro ? 'AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt' : 'ELASTIC-LICENSE-2.0.txt'
6868
filePermissions {
6969
unix(0644)

‎distribution/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
377377
exclude "**/platform/${excludePlatform}/**"
378378
}
379379
}
380-
if (buildParams.isSnapshotBuild()) {
380+
if (buildParams.getSnapshotBuild()) {
381381
from(buildExternalTestModulesTaskProvider)
382382
}
383383
if (project.path.startsWith(':distribution:packages')) {
@@ -518,9 +518,9 @@ subprojects {
518518

519519
String licenseText
520520
if (isTestDistro) {
521-
licenseText = rootProject.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').getText('UTF-8')
521+
licenseText = layout.settingsDirectory.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile.getText('UTF-8')
522522
} else {
523-
licenseText = rootProject.file('licenses/ELASTIC-LICENSE-2.0.txt').getText('UTF-8')
523+
licenseText = layout.settingsDirectory.file('licenses/ELASTIC-LICENSE-2.0.txt').asFile.getText('UTF-8')
524524
}
525525
// license text needs to be indented with a single space
526526
licenseText = ' ' + licenseText.replace('\n', '\n ')

‎distribution/docker/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ ext.expansions = { Architecture architecture, DockerBase base ->
119119
// the image. When developing the Docker images, it's very tedious to completely rebuild
120120
// an image for every single change. Therefore, outside of CI, we fix the
121121
// build time to midnight so that the Docker build cache is usable.
122-
def buildDate = buildParams.isCi() ? buildParams.buildDate : buildParams.buildDate.truncatedTo(ChronoUnit.DAYS).toString()
122+
def buildDate = buildParams.ci ? buildParams.buildDate : buildParams.buildDate.truncatedTo(ChronoUnit.DAYS).toString()
123123

124124
return [
125125
'arch' : architecture.classifier,
@@ -385,7 +385,7 @@ void addBuildDockerImageTask(Architecture architecture, DockerBase base) {
385385

386386
dockerContext.fileProvider(transformTask.map { Sync task -> task.getDestinationDir() })
387387

388-
noCache = buildParams.isCi()
388+
noCache = buildParams.ci
389389
tags = generateTags(base, architecture)
390390
platforms.add(architecture.dockerPlatform)
391391

@@ -477,7 +477,7 @@ void addBuildEssDockerImageTask(Architecture architecture) {
477477

478478
dockerContext.fileProvider(buildContextTask.map { it.getDestinationDir() })
479479

480-
noCache = buildParams.isCi()
480+
noCache = buildParams.ci
481481
baseImages = []
482482
tags = generateTags(dockerBase, architecture)
483483
platforms.add(architecture.dockerPlatform)

‎distribution/packages/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import java.util.regex.Pattern
4444
*/
4545

4646
plugins {
47-
id "com.netflix.nebula.ospackage-base" version "11.10.1"
47+
alias(buildLibs.plugins.ospackage)
4848
}
4949

5050
['deb', 'rpm'].each { type ->
@@ -175,7 +175,7 @@ def commonPackageConfig(String type, String architecture) {
175175
} else {
176176
assert type == 'rpm'
177177
into('/usr/share/elasticsearch') {
178-
from(rootProject.file('licenses')) {
178+
from(layout.settingsDirectory.file('licenses').asFile) {
179179
include 'ELASTIC-LICENSE-2.0.txt'
180180
rename { 'LICENSE.txt' }
181181
}
@@ -301,7 +301,7 @@ ospackage {
301301
url = 'https://www.elastic.co/'
302302

303303
// signing setup
304-
if (project.hasProperty('signing.password') && buildParams.isSnapshotBuild() == false) {
304+
if (project.hasProperty('signing.password') && buildParams.snapshotBuild == false) {
305305
signingKeyId = project.hasProperty('signing.keyId') ? project.property('signing.keyId') : 'D88E42B4'
306306
signingKeyPassphrase = project.property('signing.password')
307307
signingKeyRingFile = project.hasProperty('signing.secretKeyRingFile') ?

‎docs/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ext.docsFileTree = fileTree(projectDir) {
3737
}
3838

3939
tasks.named("yamlRestTest") {
40-
if (buildParams.isSnapshotBuild() == false) {
40+
if (buildParams.snapshotBuild == false) {
4141
// LOOKUP is not available in snapshots
4242
systemProperty 'tests.rest.blacklist', [
4343
"reference/esql/processing-commands/lookup/esql-lookup-example"
@@ -82,7 +82,7 @@ testClusters.matching { it.name == "yamlRestTest"}.configureEach {
8282
setting 'xpack.license.self_generated.type', 'trial'
8383
setting 'indices.lifecycle.history_index_enabled', 'false'
8484
keystorePassword 'keystore-password'
85-
if (buildParams.isSnapshotBuild() == false) {
85+
if (buildParams.snapshotBuild == false) {
8686
requiresFeature 'es.failure_store_feature_flag_enabled', new Version(8, 12, 0)
8787
}
8888
}

‎gradle/build.versions.toml

+3
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,6 @@ spock-platform = { group = "org.spockframework", name="spock-bom", version.ref="
4747
spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
4848
wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.23.2"
4949
xmlunit-core = "org.xmlunit:xmlunit-core:2.8.2"
50+
51+
[plugins]
52+
ospackage = { id = "com.netflix.nebula.ospackage-base", version = "11.11.1" }

‎gradle/verification-metadata.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -939,9 +939,9 @@
939939
<sha256 value="d694edd7bae3bc1a8e0dae2f5a22c479ff04d6b9bfcb0ab751a42f02e02d2100" origin="Generated by Gradle"/>
940940
</artifact>
941941
</component>
942-
<component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="11.10.1">
943-
<artifact name="gradle-ospackage-plugin-11.10.1.jar">
944-
<sha256 value="8f1daf5885f1a8f6bcab00bf9b52cf484d87da7839e9bbd327a94af27df5dacc" origin="Generated by Gradle"/>
942+
<component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="11.11.1">
943+
<artifact name="gradle-ospackage-plugin-11.11.1.jar">
944+
<sha256 value="34027ac840adb81b80de43082ce335a6518875217a38ac0204d5a84dc669b7ac" origin="Generated by Gradle"/>
945945
</artifact>
946946
</component>
947947
<component group="com.netflix.nebula" name="nebula-gradle-interop" version="2.0.0">

‎gradle/wrapper/gradle-wrapper.jar

122 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
3+
distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎gradlew

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ fi
205205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206206

207207
# Collect all arguments for the java command:
208-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209209
# and any embedded shellness will be escaped.
210210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211211
# treated as '${Hostname}' itself on the command line.

‎libs/h3/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ tasks.named('forbiddenApisMain').configure {
3636
}
3737

3838
ext.projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
39-
licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
39+
licenseFile.set(layout.settingsDirectory.file('licenses/APACHE-LICENSE-2.0.txt').asFile)
4040

4141
tasks.withType(LicenseHeadersTask.class).configureEach {
4242
approvedLicenses = ['Apache', 'Generated', 'Vendored']

‎libs/tdigest/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ tasks.named('forbiddenApisMain').configure {
3737
}
3838

3939
ext.projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
40-
licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
40+
licenseFile.set(layout.settingsDirectory.file('licenses/APACHE-LICENSE-2.0.txt').asFile)
4141

4242
tasks.withType(LicenseHeadersTask.class).configureEach {
4343
approvedLicenses = ['Apache', 'Generated', 'Vendored']

‎modules/aggregations/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ restResources {
2828
}
2929
}
3030

31-
if (buildParams.isSnapshotBuild() == false) {
31+
if (buildParams.snapshotBuild == false) {
3232
tasks.named("test").configure {
3333
systemProperty 'es.index_mode_feature_flag_registered', 'true'
3434
}

‎modules/data-streams/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if (buildParams.inFipsJvm){
3535
tasks.named("yamlRestTest").configure{enabled = false }
3636
}
3737

38-
if (buildParams.isSnapshotBuild() == false) {
38+
if (buildParams.snapshotBuild == false) {
3939
tasks.withType(Test).configureEach {
4040
systemProperty 'es.failure_store_feature_flag_enabled', 'true'
4141
}

‎modules/legacy-geo/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
testImplementation project(":test:framework")
2727
}
2828

29-
if (buildParams.isSnapshotBuild() == false) {
29+
if (buildParams.snapshotBuild == false) {
3030
tasks.named("test").configure {
3131
systemProperty 'es.index_mode_feature_flag_registered', 'true'
3232
}

0 commit comments

Comments
 (0)