github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-17 20:05:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Reapply "Update Gradle wrapper to 8.13 (#122421)" (#123889) (#123896)

Browse source 
This reverts commit 36660f2e5f.
This commit is contained in:
Rene Groeschke 2025-03-05 08:02:13 +01:00 • committed by GitHub
parent 67d0dd4df2
commit 496c38e5a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
66 changed files with 104 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build-tools-internal/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

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

@ -34,7 +34,7 @@ subprojects {
}
def calculateBranchVersion() {
File f = rootProject.file(".git/refs/heads/origin")
File f = layout.settingsDirectory.file(".git/refs/heads/origin").asFile
def branchName = f.list()?.first().trim()
return branchName + ".1"

2
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java
View file

@ -39,7 +39,7 @@ public class BaseInternalPluginBuildPlugin implements Plugin<Project> {
project.getPluginManager().apply(JarHellPrecommitPlugin.class);
project.getPluginManager().apply(ElasticsearchJavaPlugin.class);
project.getPluginManager().apply(ClusterFeaturesMetadataPlugin.class);
boolean isCi = project.getRootProject().getExtensions().getByType(BuildParameterExtension.class).isCi();
boolean isCi = project.getRootProject().getExtensions().getByType(BuildParameterExtension.class).getCi();
// Clear default dependencies added by public PluginBuildPlugin as we add our
// own project dependencies for internal builds
// TODO remove once we removed default dependencies from PluginBuildPlugin

2
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaBasePlugin.java
View file

@ -161,7 +161,7 @@ public class ElasticsearchJavaBasePlugin implements Plugin<Project> {
compileTask.getConventionMapping().map("sourceCompatibility", () -> java.getSourceCompatibility().toString());
compileTask.getConventionMapping().map("targetCompatibility", () -> java.getTargetCompatibility().toString());
compileOptions.getRelease().set(releaseVersionProviderFromCompileTask(project, compileTask));
compileOptions.setIncremental(buildParams.isCi() == false);
compileOptions.setIncremental(buildParams.getCi() == false);
});
// also apply release flag to groovy, which is used in build-tools
project.getTasks().withType(GroovyCompile.class).configureEach(compileTask -> {

4
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java
View file

@ -73,7 +73,7 @@ public class InternalDistributionBwcSetupPlugin implements Plugin<Project> {
project.getPlugins().apply(JvmToolchainsPlugin.class);
toolChainService = project.getExtensions().getByType(JavaToolchainService.class);
var buildParams = loadBuildParams(project).get();
Boolean isCi = buildParams.isCi();
Boolean isCi = buildParams.getCi();
buildParams.getBwcVersions().forPreviousUnreleased((BwcVersions.UnreleasedVersionInfo unreleasedVersion) -> {
configureBwcProject(
project.project(unreleasedVersion.gradleProjectPath()),
@ -365,7 +365,7 @@ public class InternalDistributionBwcSetupPlugin implements Plugin<Project> {
} else {
c.getOutputs().files(expectedOutputFile);
}
c.getOutputs().doNotCacheIf("BWC distribution caching is disabled for local builds", task -> buildParams.isCi() == false);
c.getOutputs().doNotCacheIf("BWC distribution caching is disabled for local builds", task -> buildParams.getCi() == false);
c.getArgs().add("-p");
c.getArgs().add(projectPath);
c.getArgs().add(assembleTaskName);

2
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalTestClustersPlugin.java
View file

@ -30,7 +30,7 @@ public class InternalTestClustersPlugin implements Plugin<Project> {
TestClustersPlugin testClustersPlugin = project.getPlugins().apply(TestClustersPlugin.class);
testClustersPlugin.setRuntimeJava(buildParams.getRuntimeJavaHome());
testClustersPlugin.setIsReleasedVersion(
version -> (version.equals(VersionProperties.getElasticsearchVersion()) && buildParams.isSnapshotBuild() == false)
version -> (version.equals(VersionProperties.getElasticsearchVersion()) && buildParams.getSnapshotBuild() == false)
|| buildParams.getBwcVersions().unreleasedInfo(version) == null
);

2
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportPlugin.java
View file

@ -40,7 +40,7 @@ public class DockerSupportPlugin implements Plugin<Project> {
.getSharedServices()
.registerIfAbsent(DOCKER_SUPPORT_SERVICE_NAME, DockerSupportService.class, spec -> spec.parameters(params -> {
params.setExclusionsFile(new File(project.getRootDir(), DOCKER_ON_LINUX_EXCLUSIONS_FILE));
params.getIsCI().set(buildParams.isCi());
params.getIsCI().set(buildParams.getCi());
}));
// Ensure that if we are trying to run any DockerBuildTask tasks, we assert an available Docker installation exists

6
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/BuildParameterExtension.java
View file

@ -54,11 +54,11 @@ public interface BuildParameterExtension {
String getTestSeed();
Boolean isCi();
Boolean getCi();
Integer getDefaultParallel();
Boolean isSnapshotBuild();
Boolean getSnapshotBuild();
BwcVersions getBwcVersions();
@ -66,5 +66,5 @@ public interface BuildParameterExtension {
Random getRandom();
Boolean isGraalVmRuntime();
Boolean getGraalVmRuntime();
}

12
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/DefaultBuildParameterExtension.java
View file

@ -42,7 +42,7 @@ public abstract class DefaultBuildParameterExtension implements BuildParameterEx
private final String testSeed;
private final Boolean isCi;
private final Integer defaultParallel;
private final Boolean isSnapshotBuild;
private final Boolean snapshotBuild;
// not final for testing
private Provider<BwcVersions> bwcVersions;
@ -81,7 +81,7 @@ public abstract class DefaultBuildParameterExtension implements BuildParameterEx
this.testSeed = testSeed;
this.isCi = isCi;
this.defaultParallel = defaultParallel;
this.isSnapshotBuild = isSnapshotBuild;
this.snapshotBuild = isSnapshotBuild;
this.bwcVersions = cache(providers, bwcVersions);
this.gitOrigin = gitOrigin;
}
@ -183,7 +183,7 @@ public abstract class DefaultBuildParameterExtension implements BuildParameterEx
}
@Override
public Boolean isCi() {
public Boolean getCi() {
return isCi;
}
@ -193,8 +193,8 @@ public abstract class DefaultBuildParameterExtension implements BuildParameterEx
}
@Override
public Boolean isSnapshotBuild() {
return isSnapshotBuild;
public Boolean getSnapshotBuild() {
return snapshotBuild;
}
@Override
@ -208,7 +208,7 @@ public abstract class DefaultBuildParameterExtension implements BuildParameterEx
}
@Override
public Boolean isGraalVmRuntime() {
public Boolean getGraalVmRuntime() {
return runtimeJavaDetails.get().toLowerCase().contains("graalvm");
}

2
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/MutedTestPlugin.java
View file

@ -51,7 +51,7 @@ public class MutedTestPlugin implements Plugin<Project> {
}
// Don't fail when all tests are ignored when running in CI
filter.setFailOnNoMatchingTests(buildParams.isCi() == false);
filter.setFailOnNoMatchingTests(buildParams.getCi() == false);
});
});
}

2
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixturesDeployPlugin.java
View file

@ -33,7 +33,7 @@ public class TestFixturesDeployPlugin implements Plugin<Project> {
var buildParams = loadBuildParams(project).get();
NamedDomainObjectContainer<TestFixtureDeployment> fixtures = project.container(TestFixtureDeployment.class);
project.getExtensions().add("dockerFixtures", fixtures);
registerDeployTaskPerFixture(project, fixtures, buildParams.isCi());
registerDeployTaskPerFixture(project, fixtures, buildParams.getCi());
project.getTasks().register(DEPLOY_FIXTURE_TASK_NAME, task -> task.dependsOn(project.getTasks().withType(DockerBuildTask.class)));
}

2
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixturesPlugin.java
View file

@ -131,7 +131,7 @@ public class TestFixturesPlugin implements Plugin<Project> {
tasks.withType(ComposeUp.class).named("composeUp").configure(t -> {
// Avoid running docker-compose tasks in parallel in CI due to some issues on certain Linux distributions
if (buildParams.isCi()) {
if (buildParams.getCi()) {
t.usesService(dockerComposeThrottle);
t.usesService(dockerSupport);
}

2
client/rest/build.gradle
View file

@ -37,7 +37,7 @@ base {
// LLRC is licenses under Apache 2.0
projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
licenseFile.set(layout.getSettingsDirectory().file('licenses/APACHE-LICENSE-2.0.txt').asFile)
dependencies {
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"

2
client/sniffer/build.gradle
View file

@ -33,7 +33,7 @@ base {
// rest client sniffer is licenses under Apache 2.0
projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
licenseFile.set(layout.getSettingsDirectory().file('licenses/APACHE-LICENSE-2.0.txt').asFile)
dependencies {
api project(":client:rest")

2
client/test/build.gradle
View file

@ -19,7 +19,7 @@ group = "${group}.client.test"
// rest client sniffer is licenses under Apache 2.0
projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
licenseFile.set(layout.getSettingsDirectory().file('licenses/APACHE-LICENSE-2.0.txt').asFile)
dependencies {
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"

4
distribution/archives/build.gradle
View file

@ -57,13 +57,13 @@ CopySpec archiveFiles(String distributionType, String os, String architecture, b
pluginsDir.getParent()
}
}
from(rootProject.projectDir) {
from(layout.settingsDirectory.asFile) {
filePermissions {
unix(0644)
}
include 'README.asciidoc'
}
from(rootProject.file('licenses')) {
from(layout.settingsDirectory.file('licenses').asFile) {
include isTestDistro ? 'AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt' : 'ELASTIC-LICENSE-2.0.txt'
filePermissions {
unix(0644)

6
distribution/build.gradle
View file

@ -377,7 +377,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
exclude "**/platform/${excludePlatform}/**"
}
}
if (buildParams.isSnapshotBuild()) {
if (buildParams.getSnapshotBuild()) {
from(buildExternalTestModulesTaskProvider)
}
if (project.path.startsWith(':distribution:packages')) {
@ -518,9 +518,9 @@ subprojects {
String licenseText
if (isTestDistro) {
licenseText = rootProject.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').getText('UTF-8')
licenseText = layout.settingsDirectory.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile.getText('UTF-8')
} else {
licenseText = rootProject.file('licenses/ELASTIC-LICENSE-2.0.txt').getText('UTF-8')
licenseText = layout.settingsDirectory.file('licenses/ELASTIC-LICENSE-2.0.txt').asFile.getText('UTF-8')
}
// license text needs to be indented with a single space
licenseText = ' ' + licenseText.replace('\n', '\n ')

6
distribution/docker/build.gradle
View file

@ -119,7 +119,7 @@ ext.expansions = { Architecture architecture, DockerBase base ->
// the image. When developing the Docker images, it's very tedious to completely rebuild
// an image for every single change. Therefore, outside of CI, we fix the
// build time to midnight so that the Docker build cache is usable.
def buildDate = buildParams.isCi() ? buildParams.buildDate : buildParams.buildDate.truncatedTo(ChronoUnit.DAYS).toString()
def buildDate = buildParams.ci ? buildParams.buildDate : buildParams.buildDate.truncatedTo(ChronoUnit.DAYS).toString()
return [
'arch' : architecture.classifier,
@ -389,7 +389,7 @@ void addBuildDockerImageTask(Architecture architecture, DockerBase base) {
dockerContext.fileProvider(transformTask.map { Sync task -> task.getDestinationDir() })
noCache = buildParams.isCi()
noCache = buildParams.ci
tags = generateTags(base, architecture)
platforms.add(architecture.dockerPlatform)
@ -484,7 +484,7 @@ void addBuildEssDockerImageTask(Architecture architecture) {
dockerContext.fileProvider(buildContextTask.map { it.getDestinationDir() })
noCache = buildParams.isCi()
noCache = buildParams.ci
baseImages = []
tags = generateTags(dockerBase, architecture)
platforms.add(architecture.dockerPlatform)

6
distribution/packages/build.gradle
View file

@ -43,7 +43,7 @@ import java.util.regex.Pattern
*/
plugins {
id "com.netflix.nebula.ospackage-base" version "11.10.1"
alias(buildLibs.plugins.ospackage)
}
['deb', 'rpm'].each { type ->
@ -174,7 +174,7 @@ def commonPackageConfig(String type, String architecture) {
} else {
assert type == 'rpm'
into('/usr/share/elasticsearch') {
from(rootProject.file('licenses')) {
from(layout.settingsDirectory.file('licenses').asFile) {
include 'ELASTIC-LICENSE-2.0.txt'
rename { 'LICENSE.txt' }
}
@ -300,7 +300,7 @@ ospackage {
url = 'https://www.elastic.co/'
// signing setup
if (project.hasProperty('signing.password') && buildParams.isSnapshotBuild() == false) {
if (project.hasProperty('signing.password') && buildParams.snapshotBuild == false) {
signingKeyId = project.hasProperty('signing.keyId') ? project.property('signing.keyId') : 'D88E42B4'
signingKeyPassphrase = project.property('signing.password')
signingKeyRingFile = project.hasProperty('signing.secretKeyRingFile') ?

4
docs/build.gradle
View file

@ -38,7 +38,7 @@ ext.docsFileTree = fileTree(projectDir) {
tasks.named("yamlRestTest") {
enabled = false
if (buildParams.isSnapshotBuild() == false) {
if (buildParams.snapshotBuild == false) {
// LOOKUP is not available in snapshots
systemProperty 'tests.rest.blacklist', [
"reference/esql/processing-commands/lookup/esql-lookup-example"
@ -84,7 +84,7 @@ testClusters.matching { it.name == "yamlRestTest"}.configureEach {
setting 'xpack.license.self_generated.type', 'trial'
setting 'indices.lifecycle.history_index_enabled', 'false'
keystorePassword 'keystore-password'
if (buildParams.isSnapshotBuild() == false) {
if (buildParams.snapshotBuild == false) {
requiresFeature 'es.failure_store_feature_flag_enabled', new Version(8, 12, 0)
}
}

3
gradle/build.versions.toml
View file

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

6
gradle/verification-metadata.xml
View file

@ -949,9 +949,9 @@
<sha256 value="d694edd7bae3bc1a8e0dae2f5a22c479ff04d6b9bfcb0ab751a42f02e02d2100" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="11.10.1">
<artifact name="gradle-ospackage-plugin-11.10.1.jar">
<sha256 value="8f1daf5885f1a8f6bcab00bf9b52cf484d87da7839e9bbd327a94af27df5dacc" origin="Generated by Gradle"/>
<component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="11.11.1">
<artifact name="gradle-ospackage-plugin-11.11.1.jar">
<sha256 value="34027ac840adb81b80de43082ce335a6518875217a38ac0204d5a84dc669b7ac" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.netflix.nebula" name="nebula-gradle-interop" version="2.0.0">

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

2
gradlew vendored
View file

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

2
libs/h3/build.gradle
View file

@ -36,7 +36,7 @@ tasks.named('forbiddenApisMain').configure {
}
ext.projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
licenseFile.set(layout.settingsDirectory.file('licenses/APACHE-LICENSE-2.0.txt').asFile)
tasks.withType(LicenseHeadersTask.class).configureEach {
approvedLicenses = ['Apache', 'Generated', 'Vendored']

2
libs/tdigest/build.gradle
View file

@ -37,7 +37,7 @@ tasks.named('forbiddenApisMain').configure {
}
ext.projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
licenseFile.set(layout.settingsDirectory.file('licenses/APACHE-LICENSE-2.0.txt').asFile)
tasks.withType(LicenseHeadersTask.class).configureEach {
approvedLicenses = ['Apache', 'Generated', 'Vendored']

2
modules/aggregations/build.gradle
View file

@ -26,7 +26,7 @@ restResources {
}
}
if (buildParams.isSnapshotBuild() == false) {
if (buildParams.snapshotBuild == false) {
tasks.named("test").configure {
systemProperty 'es.index_mode_feature_flag_registered', 'true'
}

2
modules/data-streams/build.gradle
View file

@ -35,7 +35,7 @@ if (buildParams.inFipsJvm){
tasks.named("yamlRestTest").configure{enabled = false }
}
if (buildParams.isSnapshotBuild() == false) {
if (buildParams.snapshotBuild == false) {
tasks.withType(Test).configureEach {
systemProperty 'es.failure_store_feature_flag_enabled', 'true'
}

2
modules/legacy-geo/build.gradle
View file

@ -24,7 +24,7 @@ dependencies {
testImplementation project(":test:framework")
}
if (buildParams.isSnapshotBuild() == false) {
if (buildParams.snapshotBuild == false) {
tasks.named("test").configure {
systemProperty 'es.index_mode_feature_flag_registered', 'true'
}

2
plugins/analysis-icu/build.gradle
View file

@ -26,7 +26,7 @@ dependencies {
api "com.ibm.icu:icu4j:${versions.icu4j}"
}
if (buildParams.isSnapshotBuild() == false) {
if (buildParams.snapshotBuild == false) {
tasks.named("test").configure {
systemProperty 'es.index_mode_feature_flag_registered', 'true'
}

6
plugins/build.gradle
View file

@ -23,11 +23,9 @@ configure(subprojects.findAll { it.parent.path == project.path }) {
esplugin {
// for local ES plugins, the name of the plugin is the same as the directory
name = project.name
licenseFile = rootProject.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
noticeFile = rootProject.file('NOTICE.txt')
licenseFile = layout.settingsDirectory.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
}
parent.artifacts.add('allPlugins', tasks.named('bundlePlugin'))
}

4
plugins/examples/custom-processor/build.gradle
View file

@ -13,8 +13,8 @@ esplugin {
name = 'custom-processor'
description = 'An example plugin showing how to register a custom ingest processor'
classname ='org.elasticsearch.example.customprocessor.ExampleProcessorPlugin'
licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
noticeFile = rootProject.file('NOTICE.txt')
licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
}
dependencies {

4
plugins/examples/custom-settings/build.gradle
View file

@ -13,8 +13,8 @@ esplugin {
name = 'custom-settings'
description = 'An example plugin showing how to register custom settings'
classname ='org.elasticsearch.example.customsettings.ExampleCustomSettingsPlugin'
licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
noticeFile = rootProject.file('NOTICE.txt')
licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
}
testClusters.configureEach {

4
plugins/examples/custom-significance-heuristic/build.gradle
View file

@ -13,8 +13,8 @@ esplugin {
name = 'custom-significance-heuristic'
description = 'An example plugin showing how to write and register a custom significance heuristic'
classname ='org.elasticsearch.example.customsigheuristic.CustomSignificanceHeuristicPlugin'
licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
noticeFile = rootProject.file('NOTICE.txt')
licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
}
dependencies {

4
plugins/examples/custom-suggester/build.gradle
View file

@ -13,8 +13,8 @@ esplugin {
name = 'custom-suggester'
description = 'An example plugin showing how to write and register a custom suggester'
classname ='org.elasticsearch.example.customsuggester.CustomSuggesterPlugin'
licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
noticeFile = rootProject.file('NOTICE.txt')
licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
}
testClusters.configureEach {

4
plugins/examples/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

4
plugins/examples/painless-whitelist/build.gradle
View file

@ -14,8 +14,8 @@ esplugin {
description = 'An example whitelisting additional classes and methods in painless'
classname ='org.elasticsearch.example.painlesswhitelist.MyWhitelistPlugin'
extendedPlugins = ['lang-painless']
licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
noticeFile = rootProject.file('NOTICE.txt')
licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
}
dependencies {

4
plugins/examples/rescore/build.gradle
View file

@ -13,8 +13,8 @@ esplugin {
name = 'example-rescore'
description = 'An example plugin implementing rescore and verifying that plugins *can* implement rescore'
classname ='org.elasticsearch.example.rescore.ExampleRescorePlugin'
licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
noticeFile = rootProject.file('NOTICE.txt')
licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
}
dependencies {

4
plugins/examples/rest-handler/build.gradle
View file

@ -13,8 +13,8 @@ esplugin {
name = 'rest-handler'
description = 'An example plugin showing how to register a REST handler'
classname ='org.elasticsearch.example.resthandler.ExampleRestHandlerPlugin'
licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
noticeFile = rootProject.file('NOTICE.txt')
licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
}
dependencies {

4
plugins/examples/script-expert-scoring/build.gradle
View file

@ -13,8 +13,8 @@ esplugin {
name = 'script-expert-scoring'
description = 'An example script engine to use low level Lucene internals for expert scoring'
classname ='org.elasticsearch.example.expertscript.ExpertScriptPlugin'
licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
noticeFile = rootProject.file('NOTICE.txt')
licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
}
dependencies {

4
plugins/examples/security-authorization-engine/build.gradle
View file

@ -6,8 +6,8 @@ esplugin {
description = 'An example spi extension plugin for security that implements an Authorization Engine'
classname ='org.elasticsearch.example.AuthorizationEnginePlugin'
extendedPlugins = ['x-pack-security']
licenseFile = rootProject.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
noticeFile = rootProject.file('NOTICE.txt')
licenseFile = layout.settingsDirectory.file('AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
}
dependencies {

2
qa/lucene-index-compatibility/build.gradle
View file

@ -16,7 +16,7 @@ buildParams.bwcVersions.withLatestReadOnlyIndexCompatible { bwcVersion ->
usesBwcDistribution(bwcVersion)
// Tests rely on unreleased code in 8.18 branch
enabled = buildParams.isSnapshotBuild()
enabled = buildParams.snapshotBuild
}
}

4
qa/system-indices/build.gradle
View file

@ -14,8 +14,8 @@ esplugin {
name = 'system-indices-qa'
description = 'Plugin for performing QA of system indices'
classname ='org.elasticsearch.system.indices.SystemIndicesQA'
licenseFile = rootProject.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
noticeFile = rootProject.file('NOTICE.txt')
licenseFile = layout.settingsDirectory.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
}
testClusters.configureEach {

2
qa/verify-version-constants/build.gradle
View file

@ -38,7 +38,7 @@ buildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName ->
tasks.register("verifyDocsLuceneVersion") {
doFirst {
File docsVersionsFile = rootProject.file('docs/Versions.asciidoc')
File docsVersionsFile = layout.settingsDirectory.file('docs/Versions.asciidoc').asFile
List<String> versionLines = docsVersionsFile.readLines('UTF-8')
String docsLuceneVersion = null
for (String line : versionLines) {

2
rest-api-spec/build.gradle
View file

@ -14,7 +14,7 @@ restResources {
// REST API specifications are published under the Apache 2.0 License
ext.projectLicenses.set(['The Apache Software License, Version 2.0': providers.provider(() -> 'http://www.apache.org/licenses/LICENSE-2.0')])
licenseFile.set(rootProject.file('licenses/APACHE-LICENSE-2.0.txt'))
licenseFile.set(layout.settingsDirectory.file('licenses/APACHE-LICENSE-2.0.txt').asFile)
configurations {
// configuration to make use by external yaml rest test plugin in our examples

2
server/build.gradle
View file

@ -131,7 +131,7 @@ def generatePluginsList = tasks.register("generatePluginsList") {
sourceSets.main.output.dir(generatedResourcesDir)
sourceSets.main.compiledBy(generateModulesList, generatePluginsList)
if (buildParams.isSnapshotBuild() == false) {
if (buildParams.snapshotBuild == false) {
tasks.named("test").configure {
systemProperty 'es.index_mode_feature_flag_registered', 'true'
systemProperty 'es.failure_store_feature_flag_enabled', 'true'

2
test/external-modules/apm-integration/build.gradle
View file

@ -25,7 +25,7 @@ tasks.named("test").configure {
}
tasks.named('javaRestTest').configure {
it.onlyIf("snapshot build") { buildParams.isSnapshotBuild() }
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
}
dependencies {

4
test/external-modules/build.gradle
View file

@ -12,7 +12,7 @@ subprojects {
esplugin {
name = it.name
licenseFile = rootProject.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
noticeFile = rootProject.file('NOTICE.txt')
licenseFile = layout.settingsDirectory.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
}
}

2
test/external-modules/delayed-aggs/build.gradle
View file

@ -10,7 +10,7 @@
apply plugin: 'elasticsearch.legacy-yaml-rest-test'
tasks.named('yamlRestTest').configure {
it.onlyIf("snapshot build") { buildParams.isSnapshotBuild() }
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
}
esplugin {

2
test/external-modules/die-with-dignity/build.gradle
View file

@ -25,5 +25,5 @@ tasks.named("test").configure {
}
tasks.named('javaRestTest').configure {
it.onlyIf("snapshot build") { buildParams.isSnapshotBuild() }
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
}

2
test/external-modules/error-query/build.gradle
View file

@ -10,7 +10,7 @@
apply plugin: 'elasticsearch.legacy-yaml-rest-test'
tasks.named('yamlRestTest').configure {
it.onlyIf("snapshot build") { buildParams.isSnapshotBuild() }
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
}
esplugin {

2
test/external-modules/esql-heap-attack/build.gradle
View file

@ -20,5 +20,5 @@ esplugin {
tasks.named('javaRestTest') {
usesDefaultDistribution()
it.onlyIf("snapshot build") { buildParams.isSnapshotBuild() }
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
}

2
test/external-modules/jvm-crash/build.gradle
View file

@ -20,5 +20,5 @@ esplugin {
tasks.named('javaRestTest') {
usesDefaultDistribution()
it.onlyIf("snapshot build") { buildParams.isSnapshotBuild() }
it.onlyIf("snapshot build") { buildParams.snapshotBuild }
}

4
x-pack/build.gradle
View file

@ -26,7 +26,7 @@ subprojects {
ext.xpackModule = { String moduleName -> ":x-pack:plugin:${moduleName}" }
plugins.withType(PluginBuildPlugin).whenPluginAdded {
project.esplugin.licenseFile = rootProject.file('licenses/ELASTIC-LICENSE-2.0.txt')
project.esplugin.licenseFile = layout.settingsDirectory.file('licenses/ELASTIC-LICENSE-2.0.txt').asFile
project.esplugin.noticeFile = xpackRootProject.file('NOTICE.txt')
}
@ -40,7 +40,7 @@ subprojects {
}
project.pluginManager.withPlugin("elasticsearch.build") {
project.ext.licenseFile.set(rootProject.file('licenses/ELASTIC-LICENSE-2.0.txt'))
project.ext.licenseFile.set(layout.settingsDirectory.file('licenses/ELASTIC-LICENSE-2.0.txt').asFile)
project.ext.noticeFile.set(xpackRootProject.file('NOTICE.txt'))
}
}

2
x-pack/plugin/analytics/build.gradle
View file

@ -31,7 +31,7 @@ dependencies {
testImplementation(testArtifact(project(xpackModule('core'))))
}
if (buildParams.isSnapshotBuild() == false) {
if (buildParams.snapshotBuild == false) {
tasks.named("test").configure {
systemProperty 'es.index_mode_feature_flag_registered', 'true'
}

2
x-pack/plugin/build.gradle
View file

@ -41,7 +41,7 @@ artifacts {
def restTestBlacklist = []
// TODO: fix this rest test to not depend on a hardcoded port!
restTestBlacklist.addAll(['getting_started/10_monitor_cluster_health/*'])
if (buildParams.isSnapshotBuild() == false) {
if (buildParams.snapshotBuild == false) {
// these tests attempt to install basic/internal licenses signed against the dev/public.key
// Since there is no infrastructure in place (anytime soon) to generate licenses using the production
// private key, these tests are blacklisted in non-snapshot test runs

6
x-pack/plugin/core/build.gradle
View file

@ -99,12 +99,12 @@ tasks.named("processResources").configure {
String licenseKey = providers.systemProperty("license.key").getOrNull()
if (licenseKey != null) {
println "Using provided license key from ${licenseKey}"
} else if (buildParams.isSnapshotBuild()) {
} else if (buildParams.snapshotBuild) {
licenseKey = Paths.get(project.projectDir.path, 'snapshot.key')
} else {
throw new IllegalArgumentException('Property license.key must be set for release build')
}
File licenseKeyFile = rootProject.file(licenseKey)
File licenseKeyFile = layout.settingsDirectory.file(licenseKey).asFile
if (licenseKeyFile.exists() == false) {
throw new IllegalArgumentException('license.key at specified path [' + licenseKey + '] does not exist')
}
@ -161,7 +161,7 @@ testClusters.configureEach {
systemProperty 'es.queryable_built_in_roles_enabled', 'false'
}
if (buildParams.isSnapshotBuild() == false) {
if (buildParams.snapshotBuild == false) {
tasks.withType(Test).configureEach {
systemProperty 'es.failure_store_feature_flag_enabled', 'true'
}

2
x-pack/plugin/eql/build.gradle
View file

@ -38,7 +38,7 @@ dependencies {
* Enable QA/rest integration tests for snapshot builds only *
* TODO: Enable for all builds upon this feature release *
****************************************************************/
if (buildParams.isSnapshotBuild()) {
if (buildParams.snapshotBuild) {
addQaCheckDependencies(project)
}

4
x-pack/plugin/esql/build.gradle
View file

@ -83,7 +83,7 @@ interface Injected {
}
tasks.named("test").configure {
if (buildParams.isCi() == false) {
if (buildParams.ci == false) {
systemProperty 'generateDocs', true
def injected = project.objects.newInstance(Injected)
doFirst {
@ -153,7 +153,7 @@ tasks.named("test").configure {
* Enable QA/rest integration tests for snapshot builds only *
* TODO: Enable for all builds upon this feature release *
****************************************************************/
if (buildParams.isSnapshotBuild()) {
if (buildParams.snapshotBuild) {
addQaCheckDependencies(project)
}

2
x-pack/plugin/mapper-constant-keyword/build.gradle
View file

@ -23,7 +23,7 @@ dependencies {
compileOnly project(path: xpackModule('core'))
}
if (buildParams.isSnapshotBuild() == false) {
if (buildParams.getSnapshotBuild() == false) {
tasks.named("test").configure {
systemProperty 'es.index_mode_feature_flag_registered', 'true'
}

2
x-pack/plugin/ml/build.gradle
View file

@ -99,7 +99,7 @@ dependencies {
}
def mlCppVersion(){
return (project.gradle.parent != null && buildParams.isSnapshotBuild() == false) ?
return (project.gradle.parent != null && buildParams.snapshotBuild == false) ?
(project.version + "-SNAPSHOT") : project.version;
}

2
x-pack/plugin/spatial/build.gradle
View file

@ -33,7 +33,7 @@ testClusters.configureEach {
setting 'xpack.security.enabled', 'false'
}
if (buildParams.isSnapshotBuild() == false) {
if (buildParams.snapshotBuild == false) {
tasks.named("test").configure {
systemProperty 'es.index_mode_feature_flag_registered', 'true'
}

2
x-pack/qa/core-rest-tests-with-security/build.gradle
View file

@ -33,7 +33,7 @@ tasks.named("yamlRestTest").configure {
'index/10_with_id/Index with ID',
'indices.get_alias/10_basic/Get alias against closed indices',
];
if (buildParams.isSnapshotBuild() == false) {
if (buildParams.snapshotBuild == false) {
blacklist += [
'synonyms_privileges/10_synonyms_with_privileges/*',
'synonyms_privileges/20_synonyms_no_privileges/*'

2
x-pack/qa/multi-project/core-rest-tests-with-multiple-projects/build.gradle
View file

@ -85,7 +85,7 @@ tasks.named("yamlRestTest").configure {
'^reindex/90_remote/*',
'^reindex/95_parent_join/Reindex from remote*'
];
if (buildParams.isSnapshotBuild() == false) {
if (buildParams.snapshotBuild == false) {
blacklist += [];
}
systemProperty 'tests.rest.blacklist', blacklist.join(',')

2
x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/build.gradle
View file

@ -164,7 +164,7 @@ tasks.named("yamlRestTest").configure {
'^transform/transforms_upgrade/*',
'^voting_only_node/10_basic/*'
];
if (buildParams.isSnapshotBuild() == false) {
if (buildParams.snapshotBuild == false) {
blacklist += [];
}
systemProperty 'tests.rest.blacklist', blacklist.join(',')