Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

chore: Update Spring to 5.3.39 #3187

Merged
merged 2 commits into from
Dec 6, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/bi-connectors.yml
Original file line number Diff line number Diff line change
@@ -43,13 +43,13 @@ jobs:
working-directory: bi-connectors/PowerBIConnector
- name: Upload Tableau JDBC connector
if: steps.pack-tableau-jdbc.outcome == 'success'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: TableauConnectors
path: bi-connectors/TableauConnector/opensearch_sql_jdbc/opensearch_sql_jdbc.taco
- name: Upload Power BI ODBC connectors
if: steps.pack-powerbi-odbc-os-proj.outcome == 'success' || (steps.prep-powerbi-odbc-amz-os-svc.outcome == 'success' && steps.pack-powerbi-odbc-amz-os-svc.outcome == 'success')
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: PBIConnectors
path: 'bi-connectors/PowerBIConnector/*.mez'
2 changes: 1 addition & 1 deletion .github/workflows/sql-cli-test-and-build-workflow.yml
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ jobs:
cp -r ./dist/*.tar.gz ./dist/*.whl opensearchsql-builds/

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: opensearchsql
path: sql-cli/opensearchsql-builds
2 changes: 1 addition & 1 deletion .github/workflows/sql-jdbc-test-and-build-workflow.yml
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ jobs:
cp ./build/libs/*.jar sql-jdbc-builds

- name: Upload Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: sql-jdbc
path: sql-jdbc/sql-jdbc-builds
20 changes: 10 additions & 10 deletions .github/workflows/sql-odbc-main.yml
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ jobs:
sh run_cppcheck.sh
- name: upload-cppcheck-results
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cppcheck-results
path: sql-odbc/cppcheck-results.log
@@ -71,19 +71,19 @@ jobs:
# cp ./bin64/*.log test-output
- name: upload-build
if: success()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: mac64-build
path: sql-odbc/build-output
- name: upload-installer
if: success()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: mac64-installer
path: sql-odbc/installer
#- name: upload-test-results
# if: always()
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: mac-test-results
# path: test-output
@@ -116,19 +116,19 @@ jobs:
.\scripts\prepare_ci_output.ps1 $Env:ODBC_BIN_PATH $Env:ODBC_LIB_PATH $Env:ODBC_BUILD_PATH
- name: upload-build
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows32-build
path: sql-odbc/ci-output/build
- name: upload-installer
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows32-installer
path: sql-odbc/ci-output/installer
#- name: upload-test-results
# if: always()
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: windows-test-results
# path: $CI_OUTPUT_PATH/test
@@ -161,19 +161,19 @@ jobs:
.\scripts\prepare_ci_output.ps1 $Env:ODBC_BIN_PATH $Env:ODBC_LIB_PATH $Env:ODBC_BUILD_PATH
- name: upload-build
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows64-build
path: sql-odbc/ci-output/build
- name: upload-installer
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows64-installer
path: sql-odbc/ci-output/installer
#- name: upload-test-results
# if: always()
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: windows-test-results
# path: sql-odbc/ci-output/test-output
4 changes: 2 additions & 2 deletions .github/workflows/sql-test-and-build-workflow.yml
Original file line number Diff line number Diff line change
@@ -64,14 +64,14 @@ jobs:
token: ${{ secrets.CODECOV_TOKEN }}

- name: Upload Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
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@v2
uses: actions/upload-artifact@v4
with:
name: test-reports
path: |
2 changes: 1 addition & 1 deletion .github/workflows/sql-test-workflow.yml
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@ jobs:

- name: Upload test reports
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: test-reports
path: |
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
buildscript {
ext {
opensearch_version = System.getProperty("opensearch.version", "1.3.4-SNAPSHOT")
spring_version = "5.3.22"
spring_version = "5.3.39"
}

repositories {
Loading