Backport opensearch-project#3187 to 1.3

Signed-off-by: Simeon Widdis <[email protected]>

.github/workflows/bi-connectors.yml

@@ -42,13 +42,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'

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

@@ -57,7 +57,7 @@ jobs:
           cp -r ./dist/*.tar.gz ./dist/*.whl opensearchsql-builds/
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: opensearchsql
           path: sql-cli/opensearchsql-builds

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

@@ -27,7 +27,7 @@ jobs:
         cp ./build/libs/*.jar sql-jdbc-builds
 
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: sql-jdbc
         path: sql-jdbc/sql-jdbc-builds

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

@@ -23,7 +23,7 @@ jobs:
         sh run_cppcheck.sh
     - name: upload-cppcheck-results
       if: failure()
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: cppcheck-results
         path: sql-odbc/cppcheck-results.log
@@ -61,19 +61,19 @@ jobs:
     #    cp ./bin64/*.log test-output
     - name: upload-build
       if: success()
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: mac64-build
         path: sql-odbc/build-output
     - name: upload-installer
       if: success()
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: mac64-installer
         path: sql-odbc/installer
     #- name: upload-test-results
-    #  if: success()
-    #  uses: actions/upload-artifact@v1
+    #  if: always()
+    #  uses: actions/upload-artifact@v4
     #  with:
     #    name: mac-test-results
     #    path: test-output
@@ -106,19 +106,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@v1
+      uses: actions/upload-artifact@v4
       with:
         name: windows32-build
         path: sql-odbc/ci-output/build
     - name: upload-installer
       if: always()
-      uses: actions/upload-artifact@v1
+      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@v1
+    #  uses: actions/upload-artifact@v4
     #  with:
     #    name: windows-test-results
     #    path: $CI_OUTPUT_PATH/test
@@ -151,19 +151,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@v1
+      uses: actions/upload-artifact@v4
       with:
         name: windows64-build
         path: sql-odbc/ci-output/build
     - name: upload-installer
       if: always()
-      uses: actions/upload-artifact@v1
+      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@v1
+    #  uses: actions/upload-artifact@v4
     #  with:
     #    name: windows-test-results
     #    path: sql-odbc/ci-output/test-output

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

@@ -42,7 +42,7 @@ jobs:
         token: ${{ secrets.CODECOV_TOKEN }}
 
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: opensearch-sql
         path: opensearch-sql-builds

build.gradle

@@ -6,7 +6,8 @@
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "1.3.3-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "1.3.4-SNAPSHOT")
+        spring_version = "5.3.39"
     }
 
     repositories {

core/build.gradle

@@ -40,16 +40,16 @@ repositories {
 
 dependencies {
     compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
-    compile group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE'
-    compile group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE'
+    compile group: 'org.springframework', name: 'spring-context', version: "${spring_version}"
+    compile group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"
     compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
     compile group: 'com.facebook.presto', name: 'presto-matching', version: '0.240'
     compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
     compile project(':common')
 
     testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
     testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
-    testCompile group: 'org.springframework', name: 'spring-test', version: '5.2.20.RELEASE'
+    testCompile group: 'org.springframework', name: 'spring-test', version: "${spring_version}"
     testCompile group: 'org.mockito', name: 'mockito-core', version: '3.3.3'
     testCompile group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.3.3'
 }

plugin/build.gradle

@@ -65,7 +65,7 @@ configurations.all {
 }
 
 dependencies {
-    compile group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE'
+    compile group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"
     compile project(":ppl")
     compile project(':legacy')
     compile project(':opensearch')

ppl/build.gradle

@@ -48,8 +48,8 @@ dependencies {
     compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
     compile group: 'org.opensearch', name: 'opensearch-x-content', version: "${opensearch_version}"
     compile group: 'org.json', name: 'json', version: '20180813'
-    compile group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE'
-    compile group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE'
+    compile group: 'org.springframework', name: 'spring-context', version: "${spring_version}"
+    compile group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"
     compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
     compile project(':common')
     compile project(':core')

sql/build.gradle

@@ -47,8 +47,8 @@ dependencies {
     compile "org.antlr:antlr4-runtime:4.7.1"
     implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
     compile group: 'org.json', name: 'json', version:'20180813'
-    compile group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE'
-    compile group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE'
+    compile group: 'org.springframework', name: 'spring-context', version: "${spring_version}"
+    compile group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"
     compile project(':common')
     compile project(':core')
     compile project(':protocol')