Skip to content

Commit

Permalink
Merge pull request #3212 from vmware/jhua/0.6.x-tomcat
Browse files Browse the repository at this point in the history
upgrade tomcat-embed-core to 9.0.89
  • Loading branch information
sjiang-cb authored Dec 12, 2024
2 parents e28dfd3 + 95601b1 commit 655aa5b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
11 changes: 6 additions & 5 deletions g11n-ws/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ buildscript {
mavenLocal()
maven { url "https://repo1.maven.org/maven2/" }
mavenCentral()
jcenter()
// jcenter()
gradlePluginPortal()
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.7")
classpath("io.github.swagger2markup:swagger2markup-gradle-plugin:1.3.3")
// classpath("io.github.swagger2markup:swagger2markup-gradle-plugin:1.3.3")
classpath("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1")
}
}
Expand All @@ -36,7 +37,7 @@ allprojects{
mavenLocal()
maven { url "https://repo1.maven.org/maven2/" }
mavenCentral()
jcenter()
// jcenter()


}
Expand All @@ -53,8 +54,8 @@ subprojects{
ext {

projectVersion = '0.0.1-SNAPSHOT'
springWebVersion='5.3.33'
tomcatVersion= '9.0.83'
springWebVersion='5.3.39'
tomcatVersion= '9.0.89'
httpclient='4.5.13'
jacksonVersion = '2.16.0'
sqliteVersion= '3.42.0.0'
Expand Down
4 changes: 2 additions & 2 deletions g11n-ws/vip-manager-i18n/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -87,7 +87,7 @@ dependencies {
//end jdk 11
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.asciidoctor:asciidoctorj:2.5.10")
testImplementation("io.github.swagger2markup:swagger2markup:1.3.3")
// testImplementation("io.github.swagger2markup:swagger2markup:1.3.3")
testImplementation("org.springframework.restdocs:spring-restdocs-mockmvc")
testImplementation("junit:junit:$junitVersion")
}
Expand Down

0 comments on commit 655aa5b

Please sign in to comment.