Update to Gradle 9.1.0 (#1753) (#1775)

opensearch-trigger-bot[bot] · github-actions[bot] · web-flow · commit c813a18b83cb · 2025-10-31T17:07:43.000-04:00
(cherry picked from commit 804fba7) Signed-off-by: Andriy Redko <drreta@gmail.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ 21 ]
+        java: [ 21, 25 ]
         os: [ubuntu-latest, windows-latest, macOS-13, macOS-latest]
     steps:
       - name: Checkout Java Client
diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml
@@ -18,6 +18,7 @@ jobs:
           - { opensearch_ref: '1.x', opensearch_jdk: 11, client_jdk: 21 }
           - { opensearch_ref: '2.x', opensearch_jdk: 21, client_jdk: 21 }
           - { opensearch_ref: 'main', opensearch_jdk: 21, client_jdk: 21 }
+          - { opensearch_ref: 'main', opensearch_jdk: 25, client_jdk: 25 }
     steps:
       - name: Set up JDK ${{ matrix.entry.opensearch_jdk }}
         uses: actions/setup-java@v5
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -25,6 +25,8 @@ jobs:
           - { opensearch_version: 2.18.0, java: 21 }
           - { opensearch_version: 2.19.2, java: 21 }
           - { opensearch_version: 3.0.0, java: 21 }
+          - { opensearch_version: 3.2.0, java: 21 }
+          - { opensearch_version: 3.2.0, java: 25 }
     steps:
       - name: Checkout Java Client
         uses: actions/checkout@v5
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ 21 ]
+        java: [ 21, 25 ]
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - name: Checkout Java Client
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -28,7 +28,7 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94
+distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts
@@ -97,10 +97,10 @@ sourceSets {
 }
 
 tasks.withType<ProcessResources> {
-    expand(
+    expand(mapOf(
         "version" to version,
         "git_revision" to (if (rootProject.extra.has("gitHashFull")) rootProject.extra["gitHashFull"] else "unknown")
-    )
+    ))
 }
 
 tasks.withType<Javadoc>().configureEach{
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/generic/Body.java b/java-client/src/main/java/org/opensearch/client/opensearch/generic/Body.java
@@ -71,8 +71,8 @@ default String bodyAsString() {
     }
 
     /**
-     * Gets the body as {@link byte[]}
-     * @return body as {@link byte[]}
+     * Gets the body as {@code byte[]}
+     * @return body as {@code byte[]}
      */
     default byte[] bodyAsBytes() {
         try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
diff --git a/java-codegen/build.gradle.kts b/java-codegen/build.gradle.kts
@@ -71,7 +71,7 @@ application {
 
 val localSpecification = "$projectDir/opensearch-openapi.yaml"
 
-tasks.create<Download>("downloadLatestSpec") {
+tasks.register<Download>("downloadLatestSpec") {
     src("https://github.com/opensearch-project/opensearch-api-specification/releases/download/main-latest/opensearch-openapi.yaml")
     dest(localSpecification)
 }
@@ -85,10 +85,10 @@ tasks.named<JavaExec>("run") {
 }
 
 tasks.withType<ProcessResources> {
-    expand(
+    expand(mapOf(
         "version" to version,
         "git_revision" to (if (rootProject.extra.has("gitHashFull")) rootProject.extra["gitHashFull"] else "unknown")
-    )
+    ))
 }
 
 tasks.withType<Javadoc>().configureEach{

Original file line number	Diff line number	Diff line change
`@@ -97,10 +97,10 @@ sourceSets {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`tasks.withType<ProcessResources> {`
`100`		`- expand(`
	`100`	`+ expand(mapOf(`
`101`	`101`	`"version" to version,`
`102`	`102`	`"git_revision" to (if (rootProject.extra.has("gitHashFull")) rootProject.extra["gitHashFull"] else "unknown")`
`103`		`- )`
	`103`	`+ ))`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`tasks.withType<Javadoc>().configureEach{`