From 7f9cc6337958fa5a0b22945324dcbad50391930f Mon Sep 17 00:00:00 2001
From: Jiang Hua <jhua@vmware.com>
Date: Thu, 13 Jun 2024 11:48:45 -0700
Subject: [PATCH] springboot to 3.1.12 + aws sdk upgrade

---
 .github/workflows/main.yml                     | 12 ++++++++++--
 g11n-ws/build.gradle                           |  6 +++---
 g11n-ws/modules/md-service-authen/build.gradle |  4 ++--
 g11n-ws/vip-manager-i18n/build.gradle          |  2 +-
 g11n-ws/vip-manager-l10n/build.gradle          |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 901319861..bc26d8cb7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -82,10 +82,13 @@ jobs:
           format: sarif
           gh-code-scanning-compat: true
           max-allowed-issues: 2147483647  
+      - name: Clean duplicates
+        run: |
+          jq '.runs |= unique_by({tool, invocations, results})' results.sarif > final-results.sarif
       - name: Upload SARIF results file
         uses: github/codeql-action/upload-sarif@main
         with:
-          sarif_file: results.sarif  
+          sarif_file: final-results.sarif  
               
   smoke-test:
     name: Smoke Test
@@ -116,7 +119,12 @@ jobs:
           echo $str Smoke Test Start $str
           date
           locale
-          java -cp "target/*:resource/*" org.testng.TestNG testng.xml
+          sleep 10
+          java -cp "target/*:resource/*" org.testng.TestNG testng.xml || test_status=$?
+          if [[ ${test_status} -ne 0 ]]; then
+              docker logs singleton
+              exit ${test_status}
+          fi
           echo $str Smoke Test End $str
 
   performance-test:
diff --git a/g11n-ws/build.gradle b/g11n-ws/build.gradle
index 5ba4d1511..9c7cec6d6 100644
--- a/g11n-ws/build.gradle
+++ b/g11n-ws/build.gradle
@@ -3,7 +3,7 @@
 
 buildscript {
     ext {
-     springBootVersion = '3.1.11'
+     springBootVersion = '3.1.12'
     }
     repositories {
         mavenLocal()
@@ -51,7 +51,7 @@ subprojects{
         httpclient='4.5.13'
         jacksonVersion = '2.16.0'
         springdocVersion='2.2.0'
-        tomcatVersion= '10.1.20'
+        tomcatVersion= '10.1.24'
 
     	ehCacheVersion = '3.10.8'
     	cacheApiVersion='1.1.1'
@@ -73,7 +73,7 @@ subprojects{
 
     	postgresqlVersion = "42.1.4"
     	druidVersion = "1.1.8"
-    	awsS3Version = "1.12.497"
+    	awsS3Version = "1.12.741"
         swaggerVersion = "3.0.0"
         icu4jVersion = "60.3"
 
diff --git a/g11n-ws/modules/md-service-authen/build.gradle b/g11n-ws/modules/md-service-authen/build.gradle
index 04f84edc4..ab4307c2c 100644
--- a/g11n-ws/modules/md-service-authen/build.gradle
+++ b/g11n-ws/modules/md-service-authen/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2023 VMware, Inc.
+//Copyright 2019-2024 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -39,7 +39,7 @@ dependencies {
     compileOnly("io.jsonwebtoken:jjwt:$jjwtVersion")
     compileOnly("org.apache.commons:commons-lang3:$commonsLangVersion")
     compileOnly("org.springdoc:springdoc-openapi-starter-webmvc-api:$springdocVersion")
-    implementation("com.nimbusds:nimbus-jose-jwt:9.27")
+    implementation("com.nimbusds:nimbus-jose-jwt:9.37.3")
 }
 
 bootJar {
diff --git a/g11n-ws/vip-manager-i18n/build.gradle b/g11n-ws/vip-manager-i18n/build.gradle
index fafd9409f..ab80ce81a 100644
--- a/g11n-ws/vip-manager-i18n/build.gradle
+++ b/g11n-ws/vip-manager-i18n/build.gradle
@@ -178,7 +178,7 @@ bootJar {
     from ("${baseOutputDir}/html5") {
         into 'static/i18n/docs'
     }
-  
+
 }
 
 bootJar.doLast {
diff --git a/g11n-ws/vip-manager-l10n/build.gradle b/g11n-ws/vip-manager-l10n/build.gradle
index d9df00524..624318102 100644
--- a/g11n-ws/vip-manager-l10n/build.gradle
+++ b/g11n-ws/vip-manager-l10n/build.gradle
@@ -50,7 +50,7 @@ dependencies {
     implementation("org.yaml:snakeyaml:$snakeyam")
     implementation("io.jsonwebtoken:jjwt:$jjwtVersion")
     implementation("org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$hibernateJpa21Api")
-    implementation('com.nimbusds:nimbus-jose-jwt:9.37.1')
+    implementation('com.nimbusds:nimbus-jose-jwt:9.37.3')
 
 
     //swagger UI -START