Update Gradle wrapper to 9.0.0 #132932

breskeby · 2025-08-14T14:54:52Z

Updating to the latest Gradle GA version to keep our build uptodate

elasticsearchmachine · 2025-08-14T14:55:18Z

Pinging @elastic/es-delivery (Team:Delivery)

breskeby · 2025-08-14T14:56:51Z

gradle/build.versions.toml

 jackson = "2.15.0"
 junit5 = "5.12.1"
-spock = "2.1-groovy-3.0"
+spock = "2.3-groovy-4.0"


required due to groovy update within gradle

breskeby · 2025-08-18T07:40:07Z

...oovy/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPluginFuncTest.groovy

-            include ':consumer'
-            include ':producer-tar'
-        """
+        subProject("consumer")


gradle throws error if the project folder does not exist yet. therefore tweaks to our tests in that area.

breskeby · 2025-08-18T07:40:41Z

.../src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractRestResourcesFuncTest.groovy

        """

-        subProject(":distribution:archives:integ-test-zip") << "configurations.create('extracted')\n"
-        subProject(":distribution:archives:integ-test-zip") << "configurations.create('default')\n"


manual creating default configuration is deprecated now

breskeby · 2025-08-18T07:41:02Z

.../integTest/groovy/org/elasticsearch/gradle/internal/SymbolicLinkPreservingTarFuncTest.groovy

  from fileTree("archiveRoot")

  into('config') {
-    dirMode 0750


that APi has been removed

breskeby · 2025-08-18T07:41:38Z

build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/AntTask.groovy


 package org.elasticsearch.gradle.internal

+import groovy.ant.AntBuilder


packages for some groovy util classes have moved

breskeby · 2025-08-18T07:43:04Z

...a/org/elasticsearch/gradle/internal/test/rest/compat/compat/RestCompatTestTransformTask.java

     * @param value  the value used in the replacement. For example "bar"
     */
    public void replaceValueInMatch(String subKey, Object value) {
-        getTransformations().add(new ReplaceValueInMatch(subKey, MAPPER.convertValue(value, JsonNode.class)));


JsonNode cannot be serialized anymore due to restrictions to the serializer. (details in commit messages). therefore we wrap this in a serializable class

Is it simply because JsonNode doesn't implement java.io.Serializable?
Could you use BaseJsonNode? As far as I can see this is the only subclass of the JsonNode and implement Serializable. This way we could potentially avoid having SerializableJsonNode class.

No its not that. its the fact that NodeSerialisation relies on ObjectInputStream#.readFully which is unsupported by the gradle serialization. Usually serializing any more complex class often results in a hassle in Gradle therefore should be avoided as it causes this kind of unexpected behaviour

I misinterpreted the change. I thought SerializableJsonNode is just a wrapper on JsonNode, but it actually stores the original value and only change it to JsonNode when toJsonNode() is called.
Is there any risk related to the value not being Serializable? Would it make sense to changed if from Object to Serializable?

breskeby · 2025-08-18T08:02:00Z

gradle/build.versions.toml

 httpclient5 = "org.apache.httpcomponents.client5:httpclient5:5.4.2"
 idea-ext = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.4"
-javaparser = "com.github.javaparser:javaparser-core:3.18.0"
+javaparser = "com.github.javaparser:javaparser-core:3.27.0"


saw some flakyness around this with the update. so pushed a new version that has fixed this. My assumption is there is some caching /serialization issue

jozala

Thank you for adding the comments. This is super helpful.
In general it looks good.
I've left two comments in the code for the potential minor improvements and one question.

jozala · 2025-08-19T11:42:17Z

...rc/main/java/org/elasticsearch/gradle/internal/test/rest/transform/SerializableJsonNode.java

+        YAMLFactory YAML_FACTORY = new YAMLFactory();
+        ObjectMapper MAPPER = new ObjectMapper(YAML_FACTORY);


If you decide to keep using JsonNode (see previous comment).

I would consider moving the MAPPER to the static field of the class. I assume the construction of the object is not very costly, but since it is called multiple times it it still beneficial.
ObjectMapper is thread-safe.

yeah there'is a overhead with this. but should only be triggered by execution time which means we don't need to deal with this class at configuration time at all. I'll take another look on using a static field usually I try to avoid those for avoiding unpredicted state in the gradle daemon / classloading issues

jozala · 2025-08-19T11:55:19Z

...a/org/elasticsearch/gradle/internal/test/rest/compat/compat/RestCompatTestTransformTask.java

     * @param value  the value used in the replacement. For example "bar"
     */
    public void replaceValueInMatch(String subKey, Object value) {
-        getTransformations().add(new ReplaceValueInMatch(subKey, MAPPER.convertValue(value, JsonNode.class)));


Is it simply because JsonNode doesn't implement java.io.Serializable?
Could you use BaseJsonNode? As far as I can see this is the only subclass of the JsonNode and implement Serializable. This way we could potentially avoid having SerializableJsonNode class.

jozala · 2025-08-19T12:08:02Z

...rnal/src/main/java/org/elasticsearch/gradle/internal/release/ExtractCurrentVersionsTask.java

 import javax.inject.Inject;

-public class ExtractCurrentVersionsTask extends AbstractVersionsTask {
+public abstract class ExtractCurrentVersionsTask extends AbstractVersionsTask {


Do I understand correctly that you've changed the tasks classes to be abstract, to make them compatible with lazy configuration?

actually i don't remember why i did that here. it should not be required to be lazy task compatible. Let me change that back or find out why that was required

To keep supporting configuration cache we need to avoid Serializing JsonNode instances

elasticsearchmachine · 2025-08-19T20:25:45Z

💔 Backport failed

Status	Branch	Result
❌	8.17	Commit could not be cherrypicked due to conflicts
❌	8.18	Commit could not be cherrypicked due to conflicts
❌	9.0	Commit could not be cherrypicked due to conflicts
✅	9.1
❌	8.19	Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 132932

Updating to the latest Gradle GA version to keep our build uptodate * Rework RestCompatTestTransformTask to CC compatibility * Fix build integration tests due to api changes * Updating javaparser

Updating to the latest Gradle GA version to keep our build uptodate * Rework RestCompatTestTransformTask to CC compatibility * Fix build integration tests due to api changes * Updating javaparser (cherry picked from commit 8e2c948) # Conflicts: # build-tools-internal/src/main/resources/minimumGradleVersion # gradle/build.versions.toml # gradle/verification-metadata.xml

Updating to the latest Gradle GA version to keep our build uptodate * Rework RestCompatTestTransformTask to CC compatibility * Fix build integration tests due to api changes * Updating javaparser (cherry picked from commit 8e2c948) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/idea/IdeaXmlUtil.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/RestCompatTestTransformTask.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/close_to/ReplaceValueInCloseTo.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceIsTrue.java # build-tools-internal/src/main/resources/minimumGradleVersion # build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/close_to/ReplaceValueInCloseToTests.java

Updating to the latest Gradle GA version to keep our build uptodate * Rework RestCompatTestTransformTask to CC compatibility * Fix build integration tests due to api changes * Updating javaparser (cherry picked from commit 8e2c948) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/idea/IdeaXmlUtil.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/RestCompatTestTransformTask.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/close_to/ReplaceValueInCloseTo.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceIsTrue.java # build-tools-internal/src/main/resources/minimumGradleVersion # build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/close_to/ReplaceValueInCloseToTests.java # gradle/build.versions.toml # gradle/verification-metadata.xml

breskeby · 2025-08-19T20:55:46Z

💔 Some backports could not be created

Status	Branch	Result
✅	9.0
✅	8.19
✅	8.18
❌	8.17	Conflict resolution was aborted by the user

Manual backport

To create the backport manually run:

backport --pr 132932

Questions ?

Please refer to the Backport tool documentation

Updating to the latest Gradle GA version to keep our build uptodate * Rework RestCompatTestTransformTask to CC compatibility * Fix build integration tests due to api changes * Updating javaparser (cherry picked from commit 8e2c948) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/idea/IdeaXmlUtil.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/RestCompatTestTransformTask.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/close_to/ReplaceValueInCloseTo.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceIsTrue.java # build-tools-internal/src/main/resources/minimumGradleVersion # build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/close_to/ReplaceValueInCloseToTests.java

Updating to the latest Gradle GA version to keep our build uptodate * Rework RestCompatTestTransformTask to CC compatibility * Fix build integration tests due to api changes * Updating javaparser (cherry picked from commit 8e2c948) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/idea/IdeaXmlUtil.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/RestCompatTestTransformTask.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/close_to/ReplaceValueInCloseTo.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceIsTrue.java # build-tools-internal/src/main/resources/minimumGradleVersion # build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/close_to/ReplaceValueInCloseToTests.java # gradle/build.versions.toml # gradle/verification-metadata.xml

Updating to the latest Gradle GA version to keep our build uptodate * Rework RestCompatTestTransformTask to CC compatibility * Fix build integration tests due to api changes * Updating javaparser (cherry picked from commit 8e2c948) # Conflicts: # build-tools-internal/src/main/resources/minimumGradleVersion # gradle/build.versions.toml # gradle/verification-metadata.xml

* Update Gradle wrapper to 9.0.0 (#132932) Updating to the latest Gradle GA version to keep our build uptodate * Rework RestCompatTestTransformTask to CC compatibility * Fix build integration tests due to api changes * Updating javaparser (cherry picked from commit 8e2c948) # Conflicts: # build-tools-internal/src/main/resources/minimumGradleVersion # gradle/build.versions.toml # gradle/verification-metadata.xml * Fix verification data

* Update Gradle wrapper to 9.0.0 (#132932) Updating to the latest Gradle GA version to keep our build uptodate * Rework RestCompatTestTransformTask to CC compatibility * Fix build integration tests due to api changes * Updating javaparser (cherry picked from commit 8e2c948) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/idea/IdeaXmlUtil.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/RestCompatTestTransformTask.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/close_to/ReplaceValueInCloseTo.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceIsTrue.java # build-tools-internal/src/main/resources/minimumGradleVersion # build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/close_to/ReplaceValueInCloseToTests.java # gradle/build.versions.toml # gradle/verification-metadata.xml * Fix merge issues * More fixes lost in backports * Fix docker bin context copy

* Update Gradle wrapper to 9.0.0 (#132932) Updating to the latest Gradle GA version to keep our build uptodate * Rework RestCompatTestTransformTask to CC compatibility * Fix build integration tests due to api changes * Updating javaparser (cherry picked from commit 8e2c948) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/idea/IdeaXmlUtil.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/RestCompatTestTransformTask.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/close_to/ReplaceValueInCloseTo.java # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceIsTrue.java # build-tools-internal/src/main/resources/minimumGradleVersion # build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/close_to/ReplaceValueInCloseToTests.java * Fix merge conflict * More fixes lost in backports * Fix docker bin context copy

Updating to the latest Gradle GA version to keep our build uptodate * Rework RestCompatTestTransformTask to CC compatibility * Fix build integration tests due to api changes * Updating javaparser

breskeby requested a review from a team as a code owner August 14, 2025 14:54

breskeby self-assigned this Aug 14, 2025

breskeby commented Aug 14, 2025

View reviewed changes

breskeby mentioned this pull request Aug 14, 2025

Update Gradle wrapper to 9.0.0 #128470

Closed

elasticsearchmachine added the serverless-linked Added by automation, don't add manually label Aug 14, 2025

breskeby commented Aug 18, 2025

View reviewed changes

breskeby force-pushed the update-gradle-wrapper-900 branch from bf41c69 to e4db346 Compare August 18, 2025 08:25

breskeby requested a review from jozala August 18, 2025 08:26

jozala approved these changes Aug 19, 2025

View reviewed changes

breskeby added 4 commits August 19, 2025 15:09

Update Gradle wrapper to 9.0.0

cafa4dd

WIP gradle 9.0 update

d220564

Update Gradle compatibility

33c9309

Rework RestCompatTestTransformTask to CC compatibility

68bc5d5

To keep supporting configuration cache we need to avoid Serializing JsonNode instances

breskeby added 5 commits August 19, 2025 15:09

Fix build integration tests

7d28ba1

Minor cleanup

ae0a418

Updating javaparser

0d8883a

Some verification data cleanup

08dc144

revert unrequired change of making task abstract

9f74701

breskeby force-pushed the update-gradle-wrapper-900 branch from e4db346 to 9f74701 Compare August 19, 2025 13:54

breskeby merged commit 8e2c948 into elastic:main Aug 19, 2025
33 of 35 checks passed

breskeby mentioned this pull request Aug 19, 2025

[9.1] Update Gradle wrapper to 9.0.0 (#132932) #133161

Merged

elasticsearchmachine added the backport pending label Aug 19, 2025

breskeby mentioned this pull request Aug 19, 2025

[9.0] Update Gradle wrapper to 9.0.0 (#132932) #133164

Merged

breskeby mentioned this pull request Aug 19, 2025

[8.19] Update Gradle wrapper to 9.0.0 (#132932) #133165

Merged

breskeby mentioned this pull request Aug 19, 2025

[8.18] Update Gradle wrapper to 9.0.0 (#132932) #133167

Merged

breskeby removed the v8.17.11 label Aug 19, 2025


		package org.elasticsearch.gradle.internal

		import groovy.ant.AntBuilder

		YAMLFactory YAML_FACTORY = new YAMLFactory();
		ObjectMapper MAPPER = new ObjectMapper(YAML_FACTORY);

Update Gradle wrapper to 9.0.0 #132932

Update Gradle wrapper to 9.0.0 #132932

Uh oh!

Conversation

breskeby commented Aug 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

elasticsearchmachine commented Aug 14, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jozala left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

elasticsearchmachine commented Aug 19, 2025

💔 Backport failed

Uh oh!

breskeby commented Aug 19, 2025

💔 Some backports could not be created

Manual backport

Questions ?

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

breskeby commented Aug 14, 2025 •

edited

Loading