From 857d45035d89120e90c7079eb6665433a1a23e61 Mon Sep 17 00:00:00 2001 From: vaibhoag Date: Wed, 5 Mar 2025 23:58:54 +0530 Subject: [PATCH] Fixed CVE upgrade logback-core to 1.5.13 (#1388) * Fixed CVE upgrade logback-core to 1.5.13 Signed-off-by: Vaibhav Agarwal * Fix artifact upload conflicts Signed-off-by: Vaibhav Agarwal --------- Signed-off-by: Vaibhav Agarwal --- .github/workflows/test-and-build-workflow.yml | 4 ++-- build.gradle | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index d6b5b179e..62cc81b04 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.yml @@ -74,7 +74,7 @@ jobs: # v4 requires node.js 20 which is not supported uses: actions/upload-artifact@v4 with: - name: index-management-plugin-ubuntu-latest-${{ matrix.java }} + name: index-management-plugin-ubuntu-latest-${{ matrix.java }}-${{ matrix.feature }} path: index-management-artifacts overwrite: 'true' @@ -131,6 +131,6 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: index-management-plugin-${{ matrix.os }}-${{ matrix.java }} + name: index-management-plugin-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.feature }} path: index-management-artifacts overwrite: 'true' diff --git a/build.gradle b/build.gradle index 54de9357c..35dc04cd7 100644 --- a/build.gradle +++ b/build.gradle @@ -227,6 +227,7 @@ dependencies { implementation "commons-codec:commons-codec:${versions.commonscodec}" implementation "org.apache.httpcomponents:httpclient:${versions.httpclient}" implementation "org.apache.httpcomponents:httpcore:${versions.httpcore}" + implementation "ch.qos.logback:logback-core:1.5.13" testImplementation "org.opensearch.test:framework:${opensearch_version}" testImplementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"