From 30dcfe321eeac05e989e9375563ba76465b4b62f Mon Sep 17 00:00:00 2001 From: tigershi Date: Mon, 18 Sep 2023 18:53:23 +0800 Subject: [PATCH] upgrade tomcat (#2674) --- g11n-ws/build.gradle | 1 + g11n-ws/vip-manager-i18n/build.gradle | 6 ++++-- g11n-ws/vip-manager-l10n/build.gradle | 5 ++++- g11n-ws/vip-manager-lite-i18n/build.gradle | 5 ++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/g11n-ws/build.gradle b/g11n-ws/build.gradle index 45e2f94ed..60a7f7bea 100644 --- 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 index 40d4934d6..de10976f0 100644 --- 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 index 999da8bde..c03cfb2a3 100644 --- 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 index 92f4ed5c4..d7a7950f6 100644 --- 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 {