Merge branch '3.x' into backport/backport-1919-to-3.x

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

Author: Xtansia

.github/workflows/backport.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: GitHub App token
         id: github_app_token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         with:
           app-id: ${{ secrets.APP_ID }}
           private-key: ${{ secrets.APP_PRIVATE_KEY }}

.github/workflows/bump-version.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Generate GitHub App Token
         id: github_app_token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         with:
           app-id: ${{ secrets.APP_ID }}
           private-key: ${{ secrets.APP_PRIVATE_KEY }}
@@ -110,7 +110,7 @@ jobs:
 
       - name: Generate GitHub App Token
         id: github_app_token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         if: env.is_version_tag == 'true' || env.is_patch_indev_branch == 'true' || env.is_minor_indev_branch == 'true'
         with:
           app-id: ${{ secrets.APP_ID }}

.github/workflows/code-generation.yml

@@ -67,7 +67,7 @@ jobs:
       - name: Generate GitHub App Token
         if: github.repository == 'opensearch-project/opensearch-java'
         id: github_app_token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         with:
           app-id: ${{ secrets.APP_ID }}
           private-key: ${{ secrets.APP_PRIVATE_KEY }}

.github/workflows/dependabot_pr.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: GitHub App token
         id: github_app_token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         with:
           app-id: ${{ secrets.APP_ID }}
           private-key: ${{ secrets.APP_PRIVATE_KEY }}

CHANGELOG.md

@@ -5,6 +5,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Added
 
 ### Dependencies
+- Bump `gradle-wrapper` from 9.31. to 9.4.0 ([#1930](https://github.com/opensearch-project/opensearch-java/pull/1930))
+- Bump `commons-logging:commons-logging` from 1.3.5 to 1.3.6 ([#1922](https://github.com/opensearch-project/opensearch-java/pull/1922))
 - Bump `org.apache.httpcomponents.core5:httpcore5-h2` from 5.4.1 to 5.4.2 ([#1919](https://github.com/opensearch-project/opensearch-java/pull/1919))
 
 ### Changed

gradle/wrapper/gradle-wrapper.jar

@@ -28,7 +28,8 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionSha256Sum=60ea723356d81263e8002fec0fcf9e2b0eee0c0850c7a3d7ab0a63f2ccc601f3
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06

gradle/wrapper/gradle-wrapper.properties

@@ -183,7 +183,7 @@ dependencies {
     val jacksonDatabindVersion = "2.20.1"
 
     // Apache 2.0
-    api("commons-logging:commons-logging:1.3.5")
+    api("commons-logging:commons-logging:1.3.6")
     compileOnly("org.opensearch.client", "opensearch-rest-client", opensearchVersion)
     testImplementation("org.hamcrest:hamcrest:3.0")
     testImplementation("com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4") {