Skip to content

Commit a20f655

Browse files
opensearch-trigger-bot[bot]github-actions[bot]penghuo
authored
[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>
1 parent 2bf7a90 commit a20f655

3 files changed

Lines changed: 12 additions & 28 deletions

File tree

.github/workflows/integ-tests-with-security.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
4848
- name: Upload test reports
4949
if: ${{ always() }}
50-
uses: actions/upload-artifact@v4
50+
uses: actions/upload-artifact@v3
5151
continue-on-error: true
5252
with:
5353
name: test-reports-${{ matrix.os }}-${{ matrix.java }}
@@ -79,7 +79,7 @@ jobs:
7979

8080
- name: Upload test reports
8181
if: ${{ always() }}
82-
uses: actions/upload-artifact@v4
82+
uses: actions/upload-artifact@v3
8383
continue-on-error: true
8484
with:
8585
name: test-reports-${{ matrix.os }}-${{ matrix.java }}

.github/workflows/sql-test-and-build-workflow.yml

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,14 @@ jobs:
7676
token: ${{ secrets.CODECOV_TOKEN }}
7777

7878
- name: Upload Artifacts
79-
uses: actions/upload-artifact@v4
80-
continue-on-error: true
79+
uses: actions/upload-artifact@v3
8180
with:
8281
name: opensearch-sql-ubuntu-latest
8382
path: opensearch-sql-builds
8483

8584
- name: Upload test reports
86-
if: ${{ always() }}
87-
uses: actions/upload-artifact@v4
85+
if: always()
86+
uses: actions/upload-artifact@v3
8887
continue-on-error: true
8988
with:
9089
name: test-reports
@@ -131,27 +130,7 @@ jobs:
131130
cp -r ./plugin/build/distributions/*.zip opensearch-sql-builds/
132131
133132
- name: Upload Artifacts
134-
uses: actions/upload-artifact@v4
135-
continue-on-error: true
133+
uses: actions/upload-artifact@v3
136134
with:
137135
name: opensearch-sql-${{ matrix.entry.os }}
138136
path: opensearch-sql-builds
139-
140-
- name: Upload test reports
141-
if: ${{ always() && matrix.entry.os == 'ubuntu-latest' }}
142-
uses: actions/upload-artifact@v4
143-
continue-on-error: true
144-
with:
145-
name: test-reports-${{ matrix.entry.os }}-${{ matrix.entry.java }}
146-
path: |
147-
sql/build/reports/**
148-
ppl/build/reports/**
149-
core/build/reports/**
150-
common/build/reports/**
151-
opensearch/build/reports/**
152-
integ-test/build/reports/**
153-
protocol/build/reports/**
154-
legacy/build/reports/**
155-
plugin/build/reports/**
156-
doctest/build/testclusters/docTestCluster-0/logs/*
157-
integ-test/build/testclusters/*/logs/*

datasources/build.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ dependencies {
2222
implementation group: 'org.opensearch', name: 'opensearch-x-content', version: "${opensearch_version}"
2323
implementation group: 'org.opensearch', name: 'common-utils', version: "${opensearch_build}"
2424
implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
25-
implementation 'com.amazonaws:aws-encryption-sdk-java:2.4.1'
25+
// FIXME. upgrade aws-encryption-sdk-java once the bouncycastle dependency update to 1.78.
26+
implementation ('com.amazonaws:aws-encryption-sdk-java:2.4.1') {
27+
exclude group: 'org.bouncycastle', module: 'bcprov-ext-jdk18on'
28+
}
29+
// Use OpenSearch bouncycastle version. https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/version.properties
30+
implementation "org.bouncycastle:bcprov-jdk18on:${versions.bouncycastle}"
2631
implementation group: 'commons-validator', name: 'commons-validator', version: '1.7'
2732

2833
testImplementation group: 'junit', name: 'junit', version: '4.13.2'

0 commit comments

Comments
 (0)