Skip to content

Commit 77aa93e

Browse files
authored
chore: Update Spring to 5.3.39 (#3187)
* Update Spring to 5.3.39 Signed-off-by: Simeon Widdis <[email protected]> * Update update-artifact versions while we're at it Signed-off-by: Simeon Widdis <[email protected]> --------- Signed-off-by: Simeon Widdis <[email protected]>
1 parent edc91b9 commit 77aa93e

7 files changed

+18
-18
lines changed

.github/workflows/bi-connectors.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ jobs:
4343
working-directory: bi-connectors/PowerBIConnector
4444
- name: Upload Tableau JDBC connector
4545
if: steps.pack-tableau-jdbc.outcome == 'success'
46-
uses: actions/upload-artifact@v2
46+
uses: actions/upload-artifact@v4
4747
with:
4848
name: TableauConnectors
4949
path: bi-connectors/TableauConnector/opensearch_sql_jdbc/opensearch_sql_jdbc.taco
5050
- name: Upload Power BI ODBC connectors
5151
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')
52-
uses: actions/upload-artifact@v2
52+
uses: actions/upload-artifact@v4
5353
with:
5454
name: PBIConnectors
5555
path: 'bi-connectors/PowerBIConnector/*.mez'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
cp -r ./dist/*.tar.gz ./dist/*.whl opensearchsql-builds/
6060
6161
- name: Upload Artifact
62-
uses: actions/upload-artifact@v3
62+
uses: actions/upload-artifact@v4
6363
with:
6464
name: opensearchsql
6565
path: sql-cli/opensearchsql-builds

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
cp ./build/libs/*.jar sql-jdbc-builds
4040
4141
- name: Upload Artifacts
42-
uses: actions/upload-artifact@v2
42+
uses: actions/upload-artifact@v4
4343
with:
4444
name: sql-jdbc
4545
path: sql-jdbc/sql-jdbc-builds

.github/workflows/sql-odbc-main.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
sh run_cppcheck.sh
3434
- name: upload-cppcheck-results
3535
if: failure()
36-
uses: actions/upload-artifact@v3
36+
uses: actions/upload-artifact@v4
3737
with:
3838
name: cppcheck-results
3939
path: sql-odbc/cppcheck-results.log
@@ -71,19 +71,19 @@ jobs:
7171
# cp ./bin64/*.log test-output
7272
- name: upload-build
7373
if: success()
74-
uses: actions/upload-artifact@v3
74+
uses: actions/upload-artifact@v4
7575
with:
7676
name: mac64-build
7777
path: sql-odbc/build-output
7878
- name: upload-installer
7979
if: success()
80-
uses: actions/upload-artifact@v3
80+
uses: actions/upload-artifact@v4
8181
with:
8282
name: mac64-installer
8383
path: sql-odbc/installer
8484
#- name: upload-test-results
8585
# if: always()
86-
# uses: actions/upload-artifact@v3
86+
# uses: actions/upload-artifact@v4
8787
# with:
8888
# name: mac-test-results
8989
# path: test-output
@@ -116,19 +116,19 @@ jobs:
116116
.\scripts\prepare_ci_output.ps1 $Env:ODBC_BIN_PATH $Env:ODBC_LIB_PATH $Env:ODBC_BUILD_PATH
117117
- name: upload-build
118118
if: always()
119-
uses: actions/upload-artifact@v3
119+
uses: actions/upload-artifact@v4
120120
with:
121121
name: windows32-build
122122
path: sql-odbc/ci-output/build
123123
- name: upload-installer
124124
if: always()
125-
uses: actions/upload-artifact@v3
125+
uses: actions/upload-artifact@v4
126126
with:
127127
name: windows32-installer
128128
path: sql-odbc/ci-output/installer
129129
#- name: upload-test-results
130130
# if: always()
131-
# uses: actions/upload-artifact@v3
131+
# uses: actions/upload-artifact@v4
132132
# with:
133133
# name: windows-test-results
134134
# path: $CI_OUTPUT_PATH/test
@@ -161,19 +161,19 @@ jobs:
161161
.\scripts\prepare_ci_output.ps1 $Env:ODBC_BIN_PATH $Env:ODBC_LIB_PATH $Env:ODBC_BUILD_PATH
162162
- name: upload-build
163163
if: always()
164-
uses: actions/upload-artifact@v3
164+
uses: actions/upload-artifact@v4
165165
with:
166166
name: windows64-build
167167
path: sql-odbc/ci-output/build
168168
- name: upload-installer
169169
if: always()
170-
uses: actions/upload-artifact@v3
170+
uses: actions/upload-artifact@v4
171171
with:
172172
name: windows64-installer
173173
path: sql-odbc/ci-output/installer
174174
#- name: upload-test-results
175175
# if: always()
176-
# uses: actions/upload-artifact@v3
176+
# uses: actions/upload-artifact@v4
177177
# with:
178178
# name: windows-test-results
179179
# path: sql-odbc/ci-output/test-output

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ jobs:
6464
token: ${{ secrets.CODECOV_TOKEN }}
6565

6666
- name: Upload Artifacts
67-
uses: actions/upload-artifact@v2
67+
uses: actions/upload-artifact@v4
6868
with:
6969
name: opensearch-sql-${{ matrix.entry.os }}
7070
path: opensearch-sql-builds
7171

7272
- name: Upload test reports
7373
if: ${{ always() && matrix.entry.os == 'ubuntu-latest' }}
74-
uses: actions/upload-artifact@v2
74+
uses: actions/upload-artifact@v4
7575
with:
7676
name: test-reports
7777
path: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
8181
- name: Upload test reports
8282
if: always()
83-
uses: actions/upload-artifact@v2
83+
uses: actions/upload-artifact@v4
8484
with:
8585
name: test-reports
8686
path: |

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
buildscript {
88
ext {
99
opensearch_version = System.getProperty("opensearch.version", "1.3.4-SNAPSHOT")
10-
spring_version = "5.3.22"
10+
spring_version = "5.3.39"
1111
}
1212

1313
repositories {

0 commit comments

Comments
 (0)