Skip to content

Update Gradle wrapper to 9.2.0 #136155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 13, 2025
Merged

Update Gradle wrapper to 9.2.0 #136155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c87e768
Update Gradle wrapper to 9.2.0-rc-1
breskeby Oct 8, 2025
6d101ec
Update Gradle wrapper to 9.2.0-rc-1
breskeby Oct 8, 2025
4b6c0a9
Fix deprecation about registerFeature for without java plugin applied
breskeby Oct 8, 2025
fb52469
Fix usage of internal api
breskeby Oct 8, 2025
f57d838
Fix test artifact requirements for serverless
breskeby Oct 14, 2025
81c90b4
Fix test artifact requirements for serverless
breskeby Oct 14, 2025
f7239ac
Update Gradle wrapper to 9.2.0-rc-2
breskeby Oct 20, 2025
f384352
Update Gradle wrapper to 9.2.0
breskeby Nov 11, 2025
9dd7bfa
Merge branch 'main' into update-gradle-wrapper-920
breskeby Nov 11, 2025
6c16412
Merge branch 'main' into update-gradle-wrapper-920
breskeby Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-tools-internal/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=b84e04fa845fecba48551f425957641074fcc00a88a84d2aae5808743b35fc85
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 2 additions & 0 deletions ...ernal/src/main/java/org/elasticsearch/gradle/internal/InternalTestArtifactBasePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.provider.ProviderFactory;

import javax.inject.Inject;
Expand All @@ -25,6 +26,7 @@ public InternalTestArtifactBasePlugin(ProviderFactory providerFactory) {

@Override
public void apply(Project project) {
project.getPlugins().apply(JavaPlugin.class);
Copy link
Contributor Author

@breskeby breskeby Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

javaPluginExtension.registerFeature that is done in InternalTestArtifactExtension requires now the java plugin to be applied. this is why we add the java plugin here.

project.getPlugins().apply(ElasticsearchJavaBasePlugin.class);
project.getExtensions().create("testArtifacts", InternalTestArtifactExtension.class, project, providerFactory);
}
Expand Down
4 changes: 2 additions & 2 deletions ...ternal/src/main/java/org/elasticsearch/gradle/internal/test/StandaloneRestTestPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ public void apply(final Project project) {

// only setup tests to build
SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
final SourceSet testSourceSet = sourceSets.create("test");
final SourceSet testSourceSet = sourceSets.maybeCreate("test");

project.getTasks().withType(Test.class).configureEach(test -> {
test.setTestClassesDirs(testSourceSet.getOutput().getClassesDirs());
test.setClasspath(testSourceSet.getRuntimeClasspath());
});

// create a compileOnly configuration as others might expect it
project.getConfigurations().create("compileOnly");
project.getConfigurations().maybeCreate("compileOnly");
RestTestUtil.setupJavaRestTestDependenciesDefaults(project, testSourceSet);

EclipseModel eclipse = project.getExtensions().getByType(EclipseModel.class);
Expand Down
2 changes: 1 addition & 1 deletion build-tools-internal/src/main/resources/minimumGradleVersion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.1.0
9.2.0
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ tasks.named('zipAggregation').configure {
destinationDirectory.set(layout.buildDirectory.dir("distributions"));

dependsOn gradle.includedBuild('build-tools').task(':zipElasticPublication')
from(zipTree(gradle.includedBuild('build-tools').task(':zipElasticPublication').resolveTask().archiveFile.get()))
Copy link
Contributor Author

@breskeby breskeby Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

resolveTask is not available anymore (private api). therefore we use a less generic solution now by passing the full path.

from(zipTree("build-tools/build/nmcp/zip/publicationElastic.zip"))
}

/**
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=b84e04fa845fecba48551f425957641074fcc00a88a84d2aae5808743b35fc85
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
1 change: 1 addition & 0 deletions jira-projects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
4 changes: 2 additions & 2 deletions plugins/examples/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=b84e04fa845fecba48551f425957641074fcc00a88a84d2aae5808743b35fc85
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 5 additions & 1 deletion qa/repository-multi-version/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask

apply plugin: 'elasticsearch.internal-testclusters'
apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.internal-test-artifact'
apply plugin: 'elasticsearch.standalone-rest-test'

apply plugin: 'elasticsearch.bwc-test'

Expand Down Expand Up @@ -75,3 +75,7 @@ buildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName ->
dependsOn tasks.named("${baseName}#Step4NewClusterTest")
}
}

tasks.named('testTestingConventions').configure {
suffixes = ["IT"]
}
2 changes: 1 addition & 1 deletion x-pack/plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
import org.elasticsearch.gradle.util.GradleUtils

apply plugin: 'elasticsearch.internal-test-artifact'
apply plugin: 'elasticsearch.internal-yaml-rest-test'
apply plugin: 'elasticsearch.yaml-rest-compat-test'
apply plugin: 'elasticsearch.validate-rest-spec'
apply plugin: 'elasticsearch.internal-test-artifact'

base {
archivesName = 'x-pack'
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugin/downsample/qa/mixed-cluster/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import org.elasticsearch.gradle.VersionProperties
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask

apply plugin: 'elasticsearch.internal-yaml-rest-test'
apply plugin: 'elasticsearch.internal-test-artifact'
apply plugin: 'elasticsearch.bwc-test'


Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugin/downsample/qa/rest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* 2.0.
*/

apply plugin: 'elasticsearch.internal-test-artifact'
apply plugin: 'elasticsearch.internal-yaml-rest-test'
apply plugin: 'elasticsearch.yaml-rest-compat-test'
apply plugin: 'elasticsearch.internal-test-artifact'

dependencies {
testImplementation project(':test:test-clusters')
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugin/eql/qa/rest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/


apply plugin: 'elasticsearch.internal-test-artifact'
apply plugin: 'elasticsearch.internal-java-rest-test'
apply plugin: 'elasticsearch.internal-yaml-rest-test'
apply plugin: 'elasticsearch.yaml-rest-compat-test'
apply plugin: 'elasticsearch.internal-test-artifact'

restResources {
restApi {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import org.elasticsearch.gradle.VersionProperties
import org.elasticsearch.gradle.util.GradleUtils
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask

apply plugin: 'elasticsearch.internal-test-artifact'
apply plugin: 'elasticsearch.internal-java-rest-test'
apply plugin: 'elasticsearch.internal-yaml-rest-test'
apply plugin: 'elasticsearch.internal-test-artifact'
apply plugin: 'elasticsearch.bwc-test'
apply plugin: 'elasticsearch.bc-upgrade-test'
apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugin/esql/qa/server/multi-node/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import org.elasticsearch.gradle.util.GradleUtils

apply plugin: 'elasticsearch.internal-test-artifact'
apply plugin: 'elasticsearch.internal-java-rest-test'
apply plugin: 'elasticsearch.internal-yaml-rest-test'
apply plugin: 'elasticsearch.internal-test-artifact'
apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugin/esql/qa/server/single-node/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
apply plugin: 'java'
apply plugin: 'elasticsearch.internal-java-rest-test'
apply plugin: 'elasticsearch.internal-yaml-rest-test'
// Necessary to use tests in Serverless
Expand Down