Merge branch '2.x' into backport/backport-1402-to-2.x

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

.github/workflows/test-integration-unreleased.yml

@@ -93,8 +93,8 @@ jobs:
 
       - name: Upload Reports
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test-reports
+          name: test-reports-os${{ matrix.entry.opensearch_ref }}-java${{ matrix.entry.java }}
           path: opensearch-java/java-client/build/reports/
           retention-days: 7

.github/workflows/test-integration.yml

@@ -56,9 +56,9 @@ jobs:
 
       - name: Upload Reports
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test-reports
+          name: test-reports-os${{ matrix.entry.opensearch_version }}-java${{ matrix.entry.java }}
           path: java-client/build/reports/
           retention-days: 7
 

.github/workflows/test-unit.yml

@@ -22,6 +22,14 @@ jobs:
 
       - name: Run Unit Test
         run: ./gradlew clean unitTest
+
+      - name: Upload Reports
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-reports-java${{ matrix.java }}-${{ runner.os }}
+          path: java-client/build/reports/
+          retention-days: 7
 
   test-java8:
     runs-on: ${{ matrix.os }}
@@ -48,3 +56,11 @@ jobs:
 
       - name: Run Unit Test
         run: ./gradlew clean unitTest -D"runtime.java=8"
+
+      - name: Upload Reports
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-reports-java8-${{ runner.os }}
+          path: java-client/build/reports/
+          retention-days: 7

CHANGELOG.md

@@ -8,7 +8,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Bump `org.junit:junit-bom` from 5.11.3 to 5.11.4 ([#1367](https://github.com/opensearch-project/opensearch-java/pull/1367))
 - Bumps `org.apache.httpcomponents.client5:httpclient5` from 5.4 to 5.4.2 ([#1401](https://github.com/opensearch-project/opensearch-java/pull/1401))
 - Bumps `org.apache.httpcomponents.core5:httpcore5` from 5.3 to 5.3.3 ([#1383](https://github.com/opensearch-project/opensearch-java/pull/1383), [#1402](https://github.com/opensearch-project/opensearch-java/pull/1402))
-- Bump `org.owasp.dependencycheck` from 11.1.1 to 12.0.1 ([#1381](https://github.com/opensearch-project/opensearch-java/pull/1381), [#1393](https://github.com/opensearch-project/opensearch-java/pull/1393))
+- Bump `org.owasp.dependencycheck` from 11.1.1 to 12.0.2 ([#1381](https://github.com/opensearch-project/opensearch-java/pull/1381), [#1393](https://github.com/opensearch-project/opensearch-java/pull/1393), [#1399](https://github.com/opensearch-project/opensearch-java/pull/1399))
 
 ### Changed
 

java-client/build.gradle.kts

@@ -49,7 +49,7 @@ plugins {
     `java-library`
     `maven-publish`
     id("com.github.jk1.dependency-license-report") version "2.9"
-    id("org.owasp.dependencycheck") version "12.0.1"
+    id("org.owasp.dependencycheck") version "12.0.2"
 
     id("opensearch-java.spotless-conventions")
 }