Skip to content

Commit d29050d

Browse files
committed
Update Gradle wrapper to 9.2.0 (elastic#136155)
* Fix deprecation about registerFeature for without java plugin applied * Fix usage of internal api * Fix test artifact requirements for serverless (cherry picked from commit c35bf98) # Conflicts: # x-pack/plugin/downsample/qa/rest/build.gradle # x-pack/plugin/eql/qa/rest/build.gradle # x-pack/plugin/esql/qa/server/multi-node/build.gradle
1 parent 704615c commit d29050d

File tree

16 files changed

+28
-16
lines changed

16 files changed

+28
-16
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
@@ -78,7 +78,7 @@ tasks.named('zipAggregation').configure {
7878
destinationDirectory.set(layout.buildDirectory.dir("distributions"));
7979

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

8484
/**

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

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
@@ -11,8 +11,8 @@ import org.elasticsearch.gradle.internal.info.BuildParams
1111
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
1212

1313
apply plugin: 'elasticsearch.internal-testclusters'
14-
apply plugin: 'elasticsearch.standalone-rest-test'
1514
apply plugin: 'elasticsearch.internal-test-artifact'
15+
apply plugin: 'elasticsearch.standalone-rest-test'
1616

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

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

x-pack/plugin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import org.elasticsearch.gradle.internal.info.BuildParams
44
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
55
import org.elasticsearch.gradle.util.GradleUtils
66

7+
apply plugin: 'elasticsearch.internal-test-artifact'
78
apply plugin: 'elasticsearch.internal-yaml-rest-test'
89
apply plugin: 'elasticsearch.yaml-rest-compat-test'
910
apply plugin: 'elasticsearch.validate-rest-spec'
10-
apply plugin: 'elasticsearch.internal-test-artifact'
1111

1212
base {
1313
archivesName = 'x-pack'

0 commit comments

Comments
 (0)