From ab883c3a66ed9a9e944e996979b6e1301982ed5e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 13 Sep 2024 17:54:11 +0000 Subject: [PATCH 1/2] Upgrade org.bouncycastle:bcprov-jdk18on to 1.78.1 (#3004) Signed-off-by: Peng Huo (cherry picked from commit 25064688db2d08e61579aaf7d21ff440c67605a4) Signed-off-by: github-actions[bot] --- datasources/build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/datasources/build.gradle b/datasources/build.gradle index 9bd233e1f9..9456141e80 100644 --- a/datasources/build.gradle +++ b/datasources/build.gradle @@ -22,7 +22,12 @@ dependencies { implementation group: 'org.opensearch', name: 'opensearch-x-content', version: "${opensearch_version}" implementation group: 'org.opensearch', name: 'common-utils', version: "${opensearch_build}" implementation group: 'commons-io', name: 'commons-io', version: '2.8.0' - implementation 'com.amazonaws:aws-encryption-sdk-java:2.4.1' + // FIXME. upgrade aws-encryption-sdk-java once the bouncycastle dependency update to 1.78. + implementation ('com.amazonaws:aws-encryption-sdk-java:2.4.1') { + exclude group: 'org.bouncycastle', module: 'bcprov-ext-jdk18on' + } + // Use OpenSearch bouncycastle version. https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/version.properties + implementation "org.bouncycastle:bcprov-jdk18on:${versions.bouncycastle}" implementation group: 'commons-validator', name: 'commons-validator', version: '1.7' testImplementation group: 'junit', name: 'junit', version: '4.13.2' From e1961dc7697accb70510be3d18417e8850b41085 Mon Sep 17 00:00:00 2001 From: Peng Huo Date: Tue, 17 Sep 2024 08:36:13 -0700 Subject: [PATCH 2/2] update upload-artifact@v3 Signed-off-by: Peng Huo --- .github/workflows/integ-tests-with-security.yml | 4 ++-- .github/workflows/sql-test-and-build-workflow.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integ-tests-with-security.yml b/.github/workflows/integ-tests-with-security.yml index 4d19673ad9..753aff410e 100644 --- a/.github/workflows/integ-tests-with-security.yml +++ b/.github/workflows/integ-tests-with-security.yml @@ -47,7 +47,7 @@ jobs: - name: Upload test reports if: ${{ always() }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 continue-on-error: true with: name: test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -79,7 +79,7 @@ jobs: - name: Upload test reports if: ${{ always() }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 continue-on-error: true with: name: test-reports-${{ matrix.os }}-${{ matrix.java }} diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml index 0b4b2caf5c..92089589e0 100644 --- a/.github/workflows/sql-test-and-build-workflow.yml +++ b/.github/workflows/sql-test-and-build-workflow.yml @@ -76,14 +76,14 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} - name: Upload Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: opensearch-sql-ubuntu-latest path: opensearch-sql-builds - name: Upload test reports if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 continue-on-error: true with: name: test-reports @@ -130,7 +130,7 @@ jobs: cp -r ./plugin/build/distributions/*.zip opensearch-sql-builds/ - name: Upload Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: opensearch-sql-${{ matrix.entry.os }} path: opensearch-sql-builds