From 31260b61abb6b6e8cd6d1bc101b83c9af8c683d3 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 12:02:28 +1300 Subject: [PATCH 1/2] Fix test report artifact uploading (#1267) (#1408) (cherry picked from commit 2d9e11411333e61042938eb687c0234e29a123e4) Signed-off-by: Thomas Farr Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] --- .../workflows/test-integration-unreleased.yml | 4 ++-- .github/workflows/test-integration.yml | 4 ++-- .github/workflows/test-unit.yml | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml index d30766549d..7df9ec6bfd 100644 --- a/.github/workflows/test-integration-unreleased.yml +++ b/.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 diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index f68902995d..4f129448fb 100644 --- a/.github/workflows/test-integration.yml +++ b/.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 diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index e371da200b..3d27d3e239 100644 --- a/.github/workflows/test-unit.yml +++ b/.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 \ No newline at end of file From ab8e5bd53358c7ff762ff093a1eeeab52c6b817b Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Mon, 3 Feb 2025 18:03:52 -0500 Subject: [PATCH 2/2] Bump org.owasp.dependencycheck from 12.0.1 to 12.0.2 in /java-client (#1399) (#1405) * Bump org.owasp.dependencycheck from 12.0.1 to 12.0.2 in /java-client Bumps org.owasp.dependencycheck from 12.0.1 to 12.0.2. --- updated-dependencies: - dependency-name: org.owasp.dependencycheck dependency-type: direct:production update-type: version-update:semver-patch ... * Update changelog --------- (cherry picked from commit a0e3ffa3ab46cbcca147fb4264b482acb254ac12) Signed-off-by: dependabot[bot] Signed-off-by: Andriy Redko Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- CHANGELOG.md | 2 +- java-client/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea9dea7899..98b4234315 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Dependencies - 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.core5:httpcore5` from 5.3 to 5.3.2 ([#1383](https://github.com/opensearch-project/opensearch-java/pull/1383)) -- 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 diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts index 08b82c6be4..170c6f4222 100644 --- a/java-client/build.gradle.kts +++ b/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") }