diff --git a/g11n-ws/build.gradle b/g11n-ws/build.gradle index 5ba4d1511..609481ee1 100644 --- a/g11n-ws/build.gradle +++ b/g11n-ws/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { - springBootVersion = '3.1.11' + springBootVersion = '3.2.6' } 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..93b9dc22f 100644 --- a/g11n-ws/vip-manager-i18n/build.gradle +++ b/g11n-ws/vip-manager-i18n/build.gradle @@ -103,6 +103,7 @@ task zipTranslation(type: Zip,dependsOn: copyTranslation) { archiveName='resources.zip' from "$buildDir/resources/main/l10n" into "l10n" + println("migrate springboot to 3.2.6") } task fetchTranslationForTest(type: JavaExec, dependsOn: classes) { @@ -178,7 +179,7 @@ bootJar { from ("${baseOutputDir}/html5") { into 'static/i18n/docs' } - + loaderImplementation = org.springframework.boot.loader.tools.LoaderImplementation.CLASSIC } bootJar.doLast { diff --git a/g11n-ws/vip-manager-l10n-agent/build.gradle b/g11n-ws/vip-manager-l10n-agent/build.gradle index c63287adb..da6d6d05b 100644 --- a/g11n-ws/vip-manager-l10n-agent/build.gradle +++ b/g11n-ws/vip-manager-l10n-agent/build.gradle @@ -34,6 +34,7 @@ bootJar { baseName = 'vip-manager-l10n-agent' version = "$branchName" classifier = "$buildNumber" + loaderImplementation = org.springframework.boot.loader.tools.LoaderImplementation.CLASSIC } jar { diff --git a/g11n-ws/vip-manager-l10n/build.gradle b/g11n-ws/vip-manager-l10n/build.gradle index d9df00524..1fd5720eb 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 @@ -74,6 +74,7 @@ bootJar { baseName = 'vip-manager-l10n' version = "$branchName" classifier = "$buildNumber" + loaderImplementation = org.springframework.boot.loader.tools.LoaderImplementation.CLASSIC } task copyCommonJars(type: Copy, dependsOn: bootJar) { diff --git a/g11n-ws/vip-manager-lite-i18n/build.gradle b/g11n-ws/vip-manager-lite-i18n/build.gradle index 2fcb738fc..a0e4158d6 100644 --- a/g11n-ws/vip-manager-lite-i18n/build.gradle +++ b/g11n-ws/vip-manager-lite-i18n/build.gradle @@ -120,6 +120,7 @@ bootJar.doFirst { bootJar{ classifier = 'boot' enabled = true + loaderImplementation = org.springframework.boot.loader.tools.LoaderImplementation.CLASSIC } jar {