vmware · jhua-vmware · Sep 30, 2026 · Sep 15, 2026
diff --git a/g11n-ws/build.gradle b/g11n-ws/build.gradle
@@ -3,7 +3,7 @@
 
 buildscript {
     ext {
-     springBootVersion = '3.5.16'
+     springBootVersion = '4.1.1'
     }
     repositories {
         mavenLocal()
@@ -50,11 +50,10 @@ subprojects{
         httpclient='4.5.14'
         jacksonVersion = '2.21.6'
         jacksonAnnotationVersion = '2.21'
-        springdocVersion='2.8.8'
-        tomcatVersion= '10.1.59'
-        springWebMvcVersion= '6.2.19'
+        springdocVersion='3.1.1'
+        tomcatVersion= '11.0.26'
 
-    	ehCacheVersion = '3.10.9'
+    	ehCacheVersion = '3.12.0'
     	cacheApiVersion='1.1.1'
     	hsqlVersion = '2.3.3'
     	junitVersion = '4.13.2'
@@ -67,7 +66,7 @@ subprojects{
     	guavaVersion="33.4.8-jre"
     	snakeyam="2.6"
     	jjwtVersion="0.9.1"
-    	hibernateJpa21Api = "1.0.2.Final"
+    	jakartaPersistenceVersion = "3.2.0"
     	log4j2Version="2.26.0"
     	slf4jVersion="2.0.18"
 		nimbusJoseJwtVersion="10.1"

diff --git a/g11n-ws/gradle/wrapper/gradle-wrapper.jar b/g11n-ws/gradle/wrapper/gradle-wrapper.jar
diff --git a/g11n-ws/gradle/wrapper/gradle-wrapper.properties b/g11n-ws/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,8 @@
+# Copyright 2019-2026 VMware, Inc.
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/g11n-ws/gradlew b/g11n-ws/gradlew
diff --git a/g11n-ws/gradlew.bat b/g11n-ws/gradlew.bat
diff --git a/g11n-ws/modules/md-restful-api-db/build.gradle b/g11n-ws/modules/md-restful-api-db/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2023 VMware, Inc.
+//Copyright 2019-2026 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -32,6 +32,7 @@ dependencies {
     implementation("org.springdoc:springdoc-openapi-starter-webmvc-api:$springdocVersion")
     //swagger UI -END
     testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.springframework.boot:spring-boot-resttestclient")
     testImplementation ("junit:junit:$junitVersion")
 }
 

diff --git a/...-ws/modules/md-restful-api-db/src/test/java/com/vmware/vip/test/VipDBTestCompProduct.java b/...-ws/modules/md-restful-api-db/src/test/java/com/vmware/vip/test/VipDBTestCompProduct.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 VMware, Inc.
+ * Copyright 2019-2026 VMware, Inc.
  * SPDX-License-Identifier: EPL-2.0
  */
 package com.vmware.vip.test;
@@ -20,8 +20,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.resttestclient.TestRestTemplate;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -42,6 +43,7 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = DBTestAPP.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@AutoConfigureTestRestTemplate
 @ActiveProfiles(resolver = ProfilesResolver.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class VipDBTestCompProduct {

diff --git a/...modules/md-restful-api-db/src/test/java/com/vmware/vip/test/VipDBTestProductRegister.java b/...modules/md-restful-api-db/src/test/java/com/vmware/vip/test/VipDBTestProductRegister.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 VMware, Inc.
+ * Copyright 2019-2026 VMware, Inc.
  * SPDX-License-Identifier: EPL-2.0
  */
 package com.vmware.vip.test;
@@ -16,8 +16,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.resttestclient.TestRestTemplate;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.ActiveProfiles;
@@ -33,6 +34,7 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = DBTestAPP.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@AutoConfigureTestRestTemplate
 @ActiveProfiles(resolver = ProfilesResolver.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)  
 public class VipDBTestProductRegister {

diff --git a/g11n-ws/modules/md-restful-api-db/src/test/java/com/vmware/vip/test/VipDBTestString.java b/g11n-ws/modules/md-restful-api-db/src/test/java/com/vmware/vip/test/VipDBTestString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 VMware, Inc.
+ * Copyright 2019-2026 VMware, Inc.
  * SPDX-License-Identifier: EPL-2.0
  */
 package com.vmware.vip.test;
@@ -19,8 +19,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.resttestclient.TestRestTemplate;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -40,6 +41,7 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = DBTestAPP.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@AutoConfigureTestRestTemplate
 @ActiveProfiles(resolver = ProfilesResolver.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING) 
 public class VipDBTestString {

diff --git a/g11n-ws/modules/md-service-i18n-l3/build.gradle b/g11n-ws/modules/md-service-i18n-l3/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2025 VMware, Inc.
+//Copyright 2019-2026 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -23,7 +23,7 @@ dependencies {
     api project(":md-data-api-mt")
     api project(":md-data-api")
     api project(":vip-common")
-    compileOnly("org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$hibernateJpa21Api")
+    compileOnly("jakarta.persistence:jakarta.persistence-api:$jakartaPersistenceVersion")
     compileOnly("org.springframework.boot:spring-boot")
     compileOnly("org.springframework.boot:spring-boot-starter-data-jpa")
     compileOnly("org.slf4j:slf4j-api:$slf4jVersion")

diff --git a/...n-l3/src/main/java/com/vmware/vip/core/messages/service/multcomponent/TranslationDTO.java b/...n-l3/src/main/java/com/vmware/vip/core/messages/service/multcomponent/TranslationDTO.java
@@ -1,15 +1,15 @@
 /*
- * Copyright 2019-2022 VMware, Inc.
+ * Copyright 2019-2026 VMware, Inc.
  * SPDX-License-Identifier: EPL-2.0
  */
 package com.vmware.vip.core.messages.service.multcomponent;
 
 import java.io.Serializable;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 import com.vmware.vip.common.i18n.dto.MultiComponentsDTO;
 

diff --git a/.../main/java/com/vmware/vip/core/messages/service/singlecomponent/ComponentMessagesDTO.java b/.../main/java/com/vmware/vip/core/messages/service/singlecomponent/ComponentMessagesDTO.java
@@ -1,12 +1,12 @@
 /*
- * Copyright 2019-2022 VMware, Inc.
+ * Copyright 2019-2026 VMware, Inc.
  * SPDX-License-Identifier: EPL-2.0
  */
 package com.vmware.vip.core.messages.service.singlecomponent;
 
 import java.io.Serializable;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 import com.vmware.vip.common.i18n.dto.SingleComponentDTO;
 

diff --git a/...-service-i18n-l3/src/main/java/com/vmware/vip/core/messages/service/string/StringDTO.java b/...-service-i18n-l3/src/main/java/com/vmware/vip/core/messages/service/string/StringDTO.java
@@ -1,15 +1,15 @@
 /*
- * Copyright 2019-2022 VMware, Inc.
+ * Copyright 2019-2026 VMware, Inc.
  * SPDX-License-Identifier: EPL-2.0
  */
 package com.vmware.vip.core.messages.service.string;
 
 import java.io.Serializable;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 import com.vmware.vip.common.i18n.dto.StringBasedDTO;
 

diff --git a/g11n-ws/vip-manager-i18n/build.gradle b/g11n-ws/vip-manager-i18n/build.gradle
@@ -13,7 +13,6 @@ configurations {
     providedRuntime
    // remove default logger
     all*.exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
-    all*.exclude group: 'commons-logging', module: 'commons-logging'
 }
 
 sourceSets {
@@ -47,16 +46,18 @@ dependencies {
 
     implementation("com.vmware.singleton:spring-boot-remote-git-autoconfigure:0.1.0")
     implementation('org.springframework.boot:spring-boot-starter-log4j2')
+    implementation("org.apache.logging.log4j:log4j-jcl:$log4j2Version")
     implementation("org.springframework.boot:spring-boot-starter-web"){
         exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
     }
 
+    implementation("org.springframework.boot:spring-boot-tomcat")
     implementation("org.apache.tomcat.embed:tomcat-embed-core:$tomcatVersion")
     implementation("org.apache.tomcat:tomcat-annotations-api:$tomcatVersion")
     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("org.springframework.boot:spring-boot-jackson2")
 
     implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
     implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
@@ -77,7 +78,7 @@ dependencies {
     implementation("com.google.guava:guava:$guavaVersion")
     implementation("com.ibm.icu:icu4j:$icu4jVersion")
     implementation("org.yaml:snakeyaml:$snakeyam")
-    implementation("org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$hibernateJpa21Api")
+    implementation("jakarta.persistence:jakarta.persistence-api:$jakartaPersistenceVersion")
 
 
 
@@ -183,7 +184,8 @@ bootJar {
     from ("${baseOutputDir}/html5") {
         into 'static/i18n/docs'
     }
-    loaderImplementation = org.springframework.boot.loader.tools.LoaderImplementation.CLASSIC
+    // patterns-core builds jar: URLs by hand and can't parse Boot 4's nested: URLs; unpack it at runtime
+    requiresUnpack '**/singleton-i18n-patterns-core-*.jar'
 }
 
 bootJar.doLast {