upgrade tomcat (#2674)

vmware · Sep 18, 2023 · 30dcfe3 · 30dcfe3
1 parent 4c2f549
commit 30dcfe3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/g11n-ws/build.gradle b/g11n-ws/build.gradle
@@ -57,6 +57,7 @@ subprojects{
         httpclient='4.5.13'
         jacksonVersion = '2.15.2'
         springdocVersion='2.2.0'
+        tomcatVersion= '10.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
@@ -45,8 +45,10 @@ dependencies {
     }
 
     implementation('org.springframework.boot:spring-boot-starter-log4j2')
-    implementation("org.springframework.boot:spring-boot-starter-web")
-
+    implementation("org.springframework.boot:spring-boot-starter-web"){
+        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
+    }
+    implementation("org.apache.tomcat.embed:tomcat-embed-core:$tomcatVersion")
     implementation("org.apache.commons:commons-lang3:$commonsLangVersion")
     implementation("commons-io:commons-io:$commonsIoVersion")
     implementation("commons-codec:commons-codec:$commonsCodecVersion")

diff --git a/g11n-ws/vip-manager-l10n/build.gradle b/g11n-ws/vip-manager-l10n/build.gradle
@@ -29,7 +29,10 @@ dependencies {
     }
 
     implementation('org.springframework.boot:spring-boot-starter-log4j2')
-    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-web"){
+        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
+    }
+    implementation("org.apache.tomcat.embed:tomcat-embed-core:$tomcatVersion")
 
     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
@@ -47,7 +47,10 @@ dependencies {
     }
 
     implementation('org.springframework.boot:spring-boot-starter-log4j2')
-    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-web"){
+        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
+    }
+    implementation("org.apache.tomcat.embed:tomcat-embed-core:$tomcatVersion")
 
     implementation("org.ehcache:ehcache:$ehCacheVersion") {
         capabilities {