From a20f655ef3d03405e8427aacef2d5dfebcab48c3 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 14:08:35 -0700
Subject: [PATCH] [Backport 2.x] Upgrade org.bouncycastle:bcprov-jdk18on to
 1.78.1 (#3020)

Signed-off-by: Peng Huo <penghuo@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Peng Huo <penghuo@gmail.com>
---
 .../workflows/integ-tests-with-security.yml   |  4 +--
 .../workflows/sql-test-and-build-workflow.yml | 29 +++----------------
 datasources/build.gradle                      |  7 ++++-
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/integ-tests-with-security.yml b/.github/workflows/integ-tests-with-security.yml
index 4a077c5d66..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@v4
+      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@v4
+      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 13e82745cf..92089589e0 100644
--- a/.github/workflows/sql-test-and-build-workflow.yml
+++ b/.github/workflows/sql-test-and-build-workflow.yml
@@ -76,15 +76,14 @@ jobs:
         token: ${{ secrets.CODECOV_TOKEN }}
 
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v4
-      continue-on-error: true
+      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@v4
+      if: always()
+      uses: actions/upload-artifact@v3
       continue-on-error: true
       with:
         name: test-reports
@@ -131,27 +130,7 @@ jobs:
         cp -r ./plugin/build/distributions/*.zip opensearch-sql-builds/
 
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v4
-      continue-on-error: true
+      uses: actions/upload-artifact@v3
       with:
         name: opensearch-sql-${{ matrix.entry.os }}
         path: opensearch-sql-builds
-
-    - name: Upload test reports
-      if: ${{ always() && matrix.entry.os == 'ubuntu-latest' }}
-      uses: actions/upload-artifact@v4
-      continue-on-error: true
-      with:
-        name: test-reports-${{ matrix.entry.os }}-${{ matrix.entry.java }}
-        path: |
-          sql/build/reports/**
-          ppl/build/reports/**
-          core/build/reports/**
-          common/build/reports/**
-          opensearch/build/reports/**
-          integ-test/build/reports/**
-          protocol/build/reports/**
-          legacy/build/reports/**
-          plugin/build/reports/**
-          doctest/build/testclusters/docTestCluster-0/logs/*
-          integ-test/build/testclusters/*/logs/*
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'