upgrade gradle to 8.13

jhua-vmware · jhua-vmware · commit 0acbc1bbb636 · 2025-04-17T15:52:24.000-07:00
diff --git a/g11n-ws/gradle/wrapper/gradle-wrapper.properties b/g11n-ws/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/g11n-ws/modules/md-data-api-bundleimpl/build.gradle b/g11n-ws/modules/md-data-api-bundleimpl/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2023 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -30,6 +30,6 @@ bootJar {
     enabled = false
 }
 jar {
-    classifier = ''
+    archiveClassifier = ''
 	enabled = true
 }
diff --git a/g11n-ws/modules/md-data-api-gcsimpl/build.gradle b/g11n-ws/modules/md-data-api-gcsimpl/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2024 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -34,6 +34,6 @@ bootJar {
 }
     
 jar {
-    classifier = ''
+    archiveClassifier = ''
 	enabled = true
 }
diff --git a/g11n-ws/modules/md-data-api-mt/build.gradle b/g11n-ws/modules/md-data-api-mt/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2023 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -36,6 +36,6 @@ bootJar {
 }
     
 jar {
-    classifier = ''
+    archiveClassifier = ''
 	enabled = true
 }
diff --git a/g11n-ws/modules/md-data-api-pgimpl/build.gradle b/g11n-ws/modules/md-data-api-pgimpl/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2022 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -38,6 +38,6 @@ bootJar {
     enabled = false
 }
 jar {
-    classifier = ''
+    archiveClassifier = ''
 	enabled = true
 }
diff --git a/g11n-ws/modules/md-data-api-s3impl/build.gradle b/g11n-ws/modules/md-data-api-s3impl/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2023 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -34,6 +34,6 @@ bootJar {
 }
     
 jar {
-    classifier = ''
+    archiveClassifier = ''
 	enabled = true
 }
diff --git a/g11n-ws/modules/md-restful-api-i18n/build.gradle b/g11n-ws/modules/md-restful-api-i18n/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2023 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -32,6 +32,6 @@ bootJar {
   enabled = false
 }
 jar {
-    classifier = ''
+    archiveClassifier = ''
 	enabled = true
 }
diff --git a/g11n-ws/modules/md-restful-l10n-synch/build.gradle b/g11n-ws/modules/md-restful-l10n-synch/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2023 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -26,6 +26,6 @@ bootJar {
   enabled = false
 }
 jar {
-    classifier = ''
+    archiveClassifier = ''
 	enabled = true
 }
diff --git a/g11n-ws/modules/md-restful-synch/build.gradle b/g11n-ws/modules/md-restful-synch/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2023 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -33,7 +33,7 @@ bootJar {
   enabled = false
 }
 jar {
-    classifier = ''
+    archiveClassifier = ''
 	enabled = true
 }
 
diff --git a/g11n-ws/modules/md-service-about/build.gradle b/g11n-ws/modules/md-service-about/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2022 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -28,7 +28,7 @@ bootJar {
   enabled = false
 }
 jar {
-    classifier = ''
+    archiveClassifier = ''
 	enabled = true
 }
 
diff --git a/g11n-ws/modules/md-service-authen/build.gradle b/g11n-ws/modules/md-service-authen/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2024 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -46,7 +46,7 @@ bootJar {
   enabled = false
 }
 jar {
-    classifier = ''
+    archiveClassifier = ''
 	enabled = true
 }
 
diff --git a/g11n-ws/modules/md-service-i18n-l2/build.gradle b/g11n-ws/modules/md-service-i18n-l2/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2023 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'io.spring.dependency-management'
@@ -32,9 +32,9 @@ sourceSets {
 }
 
 jar {
-    baseName = 'locale-libs'
+    archiveBaseName = 'locale-libs'
     version = "$branchName"
-    classifier = "$buildNumber"
+    archiveClassifier = "$buildNumber"
 }
 
 task copyCommonJars(type :Copy, dependsOn: jar) {
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-2023 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -40,7 +40,7 @@ bootJar {
   enabled = false
 }
 jar {
-    classifier = ''
+    archiveClassifier = ''
 	enabled = true
 }
 
diff --git a/g11n-ws/tools/tool-trans-fetcher/build.gradle b/g11n-ws/tools/tool-trans-fetcher/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2023 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 description = 'translation fetcher module'
@@ -21,9 +21,9 @@ dependencies {
 }
 
 jar {
-    baseName = 'translation-fetcher'
+    archiveBaseName = 'translation-fetcher'
     version = "$branchName"
-    classifier = "$buildNumber"
+    archiveClassifier = "$buildNumber"
     /**
     from {
          configurations.api.collect { it.isDirectory() ? it : zipTree(it) }
diff --git a/g11n-ws/vip-common/build.gradle b/g11n-ws/vip-common/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2023 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java'
 description = 'common tools module'
@@ -22,9 +22,9 @@ dependencies {
 }
 
 jar {
-    baseName = 'vip-common'
+    archiveBaseName = 'vip-common'
     version = "$branchName"
-    classifier = "$buildNumber"
+    archiveClassifier = "$buildNumber"
 }
 
 task copyCommonJars(type :Copy, dependsOn: jar) {
diff --git a/g11n-ws/vip-manager-i18n/build.gradle b/g11n-ws/vip-manager-i18n/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2024 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -19,7 +19,7 @@ configurations {
 sourceSets {
   test {
     java.srcDirs = ['src/test/java']
-    java.outputDir = file('build/classes/test')
+    java.destinationDirectory = file('build/classes/test')
     output.resourcesDir = file('build/classes/test')
     resources.srcDirs = ['src/test/resources']
   }
@@ -96,13 +96,13 @@ dependencies {
 }
 
 
-task copyTranslation(type: Copy) {
+task copyTranslation(type: Copy, dependsOn: processResources) {
     dependsOn project(":tool-trans-fetcher").fetchTranslation
 }
 
 
 task zipTranslation(type: Zip,dependsOn: copyTranslation) {
-	archiveName='resources.zip'
+	archiveFileName='resources.zip'
     from "$buildDir/resources/main/l10n"
 	into "l10n"
 }
@@ -127,13 +127,16 @@ task copyLibs(type :Copy, dependsOn: bootJar) {
     into "$rootDir/../publish/"
     println "The build was output to -> $rootDir/../publish/"
     include "**/*.jar","**/*.war"
+	
+	it.dependsOn 'sourcesJar'
+	it.dependsOn 'javadocJar'
 }
 
 
 task zipSingletonScripts(type: Zip,dependsOn: bootJar) {
 	from "$rootDir/scripts/"
-	destinationDir file("$rootDir/../publish/")
-	baseName 'singletonScripts'
+	destinationDirectory = file("$rootDir/../publish/")
+	archiveBaseName = 'singletonScripts'
 }
 
 processResources {
@@ -161,18 +164,18 @@ bootJar.doFirst {
 
 
 bootJar {
-    baseName = "singleton"
+    archiveBaseName = "singleton"
     if(project.hasProperty('productName')){
       def productName = project.getProperty('productName')
       if(productName == ''){
         productName = 'all'
       }
-      baseName = "singleton-$productName"
+      archiveBaseName = "singleton-$productName"
     }else{
-      baseName = "singleton"
+      archiveBaseName = "singleton"
     }
     version = "$branchName"
-    classifier = "$buildNumber"
+    archiveClassifier = "$buildNumber"
     dependsOn zipTranslation
     from "$buildDir/distributions"
 
@@ -188,7 +191,7 @@ bootJar.doLast {
 }
 
 jar {
-    classifier = ''
+    archiveClassifier = ''
 	enabled = false
 }
 
@@ -214,7 +217,7 @@ assemble.dependsOn.add zipSingletonScripts
 task testFetchedTranslation(type: JavaExec, dependsOn: classes) {
     def jarPath = "${project(":vip-manager-i18n").buildDir}/libs/"
     args(jarPath)
-    args("${project(":vip-manager-i18n").jar.archiveName}")
+    args("${project(":vip-manager-i18n").jar.archiveFileName}")
     if (project.hasProperty('productName')) {
         args(project.getProperty('productName'))
     }
@@ -247,12 +250,12 @@ if (project.hasProperty('datatype') && (project.getProperty('datatype') == 'pgdb
 }
 **/
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allJava
 }
  
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
     from javadoc.destinationDir
 }
  
@@ -270,9 +273,9 @@ artifacts {
 
 jacocoTestReport {
     reports {
-        xml.enabled true
-        csv.enabled false
-        html.enabled false
+        xml.required = true
+        csv.required = false
+        html.required = false
         xml.destination file("${buildDir}/reports/jacoco.xml")
     }
 }
diff --git a/g11n-ws/vip-manager-l10n-agent/build.gradle b/g11n-ws/vip-manager-l10n-agent/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2024 VMware, Inc.
+//Copyright 2019-2025 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -31,14 +31,14 @@ dependencies {
 }
 
 bootJar {
-    baseName = 'vip-manager-l10n-agent'
+    archiveBaseName = 'vip-manager-l10n-agent'
     version =  "$branchName"
-    classifier = "$buildNumber"
+    archiveClassifier = "$buildNumber"
     loaderImplementation = org.springframework.boot.loader.tools.LoaderImplementation.CLASSIC
 }
 
 jar {
-    classifier = ''
+    archiveClassifier = ''
 	enabled = false
 }
 
diff --git a/g11n-ws/vip-manager-l10n/build.gradle b/g11n-ws/vip-manager-l10n/build.gradle
diff --git a/g11n-ws/vip-manager-lite-i18n/build.gradle b/g11n-ws/vip-manager-lite-i18n/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//Copyright 2019-2023 VMware, Inc.`
	`1`	`+//Copyright 2019-2025 VMware, Inc.`
`2`	`2`	`//SPDX-License-Identifier: EPL-2.0`
`3`	`3`	`apply plugin: 'java-library'`
`4`	`4`	`apply plugin: 'org.springframework.boot'`
`@@ -30,6 +30,6 @@ bootJar {`
`30`	`30`	`enabled = false`
`31`	`31`	`}`
`32`	`32`	`jar {`
`33`		`- classifier = ''`
	`33`	`+ archiveClassifier = ''`
`34`	`34`	`enabled = true`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//Copyright 2019-2024 VMware, Inc.`
	`1`	`+//Copyright 2019-2025 VMware, Inc.`
`2`	`2`	`//SPDX-License-Identifier: EPL-2.0`
`3`	`3`	`apply plugin: 'java-library'`
`4`	`4`	`apply plugin: 'org.springframework.boot'`
`@@ -34,6 +34,6 @@ bootJar {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`jar {`
`37`		`- classifier = ''`
	`37`	`+ archiveClassifier = ''`
`38`	`38`	`enabled = true`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//Copyright 2019-2022 VMware, Inc.`
	`1`	`+//Copyright 2019-2025 VMware, Inc.`
`2`	`2`	`//SPDX-License-Identifier: EPL-2.0`
`3`	`3`	`apply plugin: 'java-library'`
`4`	`4`	`apply plugin: 'org.springframework.boot'`
`@@ -38,6 +38,6 @@ bootJar {`
`38`	`38`	`enabled = false`
`39`	`39`	`}`
`40`	`40`	`jar {`
`41`		`- classifier = ''`
	`41`	`+ archiveClassifier = ''`
`42`	`42`	`enabled = true`
`43`	`43`	`}`