Skip to content

Commit c35bf98

Browse files
authored
Update Gradle wrapper to 9.2.0 (#136155)
* Fix deprecation about registerFeature for without java plugin applied * Fix usage of internal api * Fix test artifact requirements for serverless
1 parent 298c76c commit c35bf98

File tree

17 files changed

+25
-18
lines changed

17 files changed

+25
-18
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=b84e04fa845fecba48551f425957641074fcc00a88a84d2aae5808743b35fc85
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
3+
distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import org.gradle.api.Plugin;
1313
import org.gradle.api.Project;
14+
import org.gradle.api.plugins.JavaPlugin;
1415
import org.gradle.api.provider.ProviderFactory;
1516

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

2627
@Override
2728
public void apply(Project project) {
29+
project.getPlugins().apply(JavaPlugin.class);
2830
project.getPlugins().apply(ElasticsearchJavaBasePlugin.class);
2931
project.getExtensions().create("testArtifacts", InternalTestArtifactExtension.class, project, providerFactory);
3032
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ public void apply(final Project project) {
5353

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

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

6363
// create a compileOnly configuration as others might expect it
64-
project.getConfigurations().create("compileOnly");
64+
project.getConfigurations().maybeCreate("compileOnly");
6565
RestTestUtil.setupJavaRestTestDependenciesDefaults(project, testSourceSet);
6666

6767
EclipseModel eclipse = project.getExtensions().getByType(EclipseModel.class);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.1.0
1+
9.2.0

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ tasks.named('zipAggregation').configure {
7777
destinationDirectory.set(layout.buildDirectory.dir("distributions"));
7878

7979
dependsOn gradle.includedBuild('build-tools').task(':zipElasticPublication')
80-
from(zipTree(gradle.includedBuild('build-tools').task(':zipElasticPublication').resolveTask().archiveFile.get()))
80+
from(zipTree("build-tools/build/nmcp/zip/publicationElastic.zip"))
8181
}
8282

8383
/**

gradle/wrapper/gradle-wrapper.jar

176 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=b84e04fa845fecba48551f425957641074fcc00a88a84d2aae5808743b35fc85
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
3+
distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

jira-projects.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

plugins/examples/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=b84e04fa845fecba48551f425957641074fcc00a88a84d2aae5808743b35fc85
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
3+
distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

qa/repository-multi-version/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
1111

1212
apply plugin: 'elasticsearch.internal-testclusters'
13-
apply plugin: 'elasticsearch.standalone-rest-test'
1413
apply plugin: 'elasticsearch.internal-test-artifact'
14+
apply plugin: 'elasticsearch.standalone-rest-test'
1515

1616
apply plugin: 'elasticsearch.bwc-test'
1717

@@ -75,3 +75,7 @@ buildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName ->
7575
dependsOn tasks.named("${baseName}#Step4NewClusterTest")
7676
}
7777
}
78+
79+
tasks.named('testTestingConventions').configure {
80+
suffixes = ["IT"]
81+
}

0 commit comments

Comments
 (0)