From 9dcc52bd03776109d4bcbace8b1a83e5d54a59f0 Mon Sep 17 00:00:00 2001
From: Jiang Hua <jhua@vmware.com>
Date: Mon, 16 Sep 2024 10:30:19 -0700
Subject: [PATCH] upgrade spring-webmvc to 6.1.13 for CVE-2024-38816

---
 g11n-ws/build.gradle                       | 3 ++-
 g11n-ws/vip-manager-i18n/build.gradle      | 1 +
 g11n-ws/vip-manager-l10n/build.gradle      | 1 +
 g11n-ws/vip-manager-lite-i18n/build.gradle | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/g11n-ws/build.gradle b/g11n-ws/build.gradle
index 9bbe9ff38..f087cbbd6 100644
--- a/g11n-ws/build.gradle
+++ b/g11n-ws/build.gradle
@@ -49,8 +49,9 @@ subprojects{
         projectVersion = '0.0.1-SNAPSHOT'
         httpclient='4.5.13'
         jacksonVersion = '2.16.0'
-        springdocVersion='2.2.0'
+        springdocVersion='2.6.0'
         tomcatVersion= '10.1.25'
+		springWebMvcVersion= '6.1.13'
 
     	ehCacheVersion = '3.10.8'
     	cacheApiVersion='1.1.1'
diff --git a/g11n-ws/vip-manager-i18n/build.gradle b/g11n-ws/vip-manager-i18n/build.gradle
index 41363f42d..f7e6cddfb 100644
--- a/g11n-ws/vip-manager-i18n/build.gradle
+++ b/g11n-ws/vip-manager-i18n/build.gradle
@@ -55,6 +55,7 @@ dependencies {
     implementation("org.apache.commons:commons-lang3:$commonsLangVersion")
     implementation("commons-io:commons-io:$commonsIoVersion")
     implementation("commons-codec:commons-codec:$commonsCodecVersion")
+	implementation("org.springframework:spring-webmvc:$springWebMvcVersion")
 
     implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
     implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
diff --git a/g11n-ws/vip-manager-l10n/build.gradle b/g11n-ws/vip-manager-l10n/build.gradle
index 1fd5720eb..4163b39cd 100644
--- a/g11n-ws/vip-manager-l10n/build.gradle
+++ b/g11n-ws/vip-manager-l10n/build.gradle
@@ -46,6 +46,7 @@ dependencies {
 
     implementation("org.apache.tomcat.embed:tomcat-embed-core:$tomcatVersion")
     implementation("org.apache.tomcat:tomcat-annotations-api:$tomcatVersion")
+	implementation("org.springframework:spring-webmvc:$springWebMvcVersion")
 
     implementation("org.yaml:snakeyaml:$snakeyam")
     implementation("io.jsonwebtoken:jjwt:$jjwtVersion")
diff --git a/g11n-ws/vip-manager-lite-i18n/build.gradle b/g11n-ws/vip-manager-lite-i18n/build.gradle
index a0e4158d6..20fb508a2 100644
--- a/g11n-ws/vip-manager-lite-i18n/build.gradle
+++ b/g11n-ws/vip-manager-lite-i18n/build.gradle
@@ -60,6 +60,7 @@ dependencies {
 
     implementation("org.apache.tomcat.embed:tomcat-embed-core:$tomcatVersion")
     implementation("org.apache.tomcat:tomcat-annotations-api:$tomcatVersion")
+	implementation("org.springframework:spring-webmvc:$springWebMvcVersion")
 
     implementation("org.ehcache:ehcache:$ehCacheVersion") {
         capabilities {