feat(build): support JDK 21+ on Gradle 9.1

Author: halibobo1205

actuator/build.gradle

@@ -33,8 +33,8 @@ test {
 
 jacocoTestReport {
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.required.set(true)
+        html.required.set(true)
     }
     getExecutionData().setFrom(fileTree('../framework/build/jacoco').include("**.exec"))
     afterEvaluate {

build.gradle

@@ -11,6 +11,7 @@ allprojects {
     ext {
         springVersion = "5.3.39"
         errorproneVersion = "2.42.0"
+        lombokVersion = "1.18.42"
     }
 }
 def arch = System.getProperty("os.arch").toLowerCase(Locale.ROOT)
@@ -59,12 +60,14 @@ subprojects {
     apply plugin: "jacoco"
     apply plugin: "maven-publish"
 
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.current()
+    java {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 
     [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
     jacoco {
-        toolVersion = "0.8.12" // see https://www.jacoco.org/jacoco/trunk/doc/changes.html
+        toolVersion = "0.8.15" // see https://www.jacoco.org/jacoco/trunk/doc/changes.html
     }
 
     buildscript {
@@ -76,7 +79,7 @@ subprojects {
             }
         }
         dependencies {
-            classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.1'
+            classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.6'
             classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
         }
     }
@@ -101,10 +104,10 @@ subprojects {
         implementation group: 'joda-time', name: 'joda-time', version: '2.3'
         implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: '1.84'
 
-        compileOnly 'org.projectlombok:lombok:1.18.34'
-        annotationProcessor 'org.projectlombok:lombok:1.18.34'
-        testCompileOnly 'org.projectlombok:lombok:1.18.34'
-        testAnnotationProcessor 'org.projectlombok:lombok:1.18.34'
+        compileOnly "org.projectlombok:lombok:${lombokVersion}"
+        annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+        testCompileOnly "org.projectlombok:lombok:${lombokVersion}"
+        testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
 
         // https://www.oracle.com/java/technologies/javase/11-relnote-issues.html#JDK-8190378
         implementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
@@ -115,6 +118,8 @@ subprojects {
         testImplementation group: 'junit', name: 'junit', version: '4.13.2'
         testImplementation "org.mockito:mockito-core:4.11.0"
         testImplementation "org.mockito:mockito-inline:4.11.0"
+        testImplementation "net.bytebuddy:byte-buddy:1.17.7"
+        testImplementation "net.bytebuddy:byte-buddy-agent:1.17.7"
     }
     if (project.name != 'protocol' && project.name != 'errorprone'
             && javaVersion.isJava11Compatible()) {
@@ -138,7 +143,7 @@ subprojects {
     }
 
     task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier = "sources"
+        archiveClassifier = "sources"
         from sourceSets.main.allSource
         duplicatesStrategy = DuplicatesStrategy.INCLUDE // allow duplicates
     }

chainbase/build.gradle

@@ -42,8 +42,8 @@ test {
 jacocoTestReport {
     dependsOn(processResources)  // explicit_dependency
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.required.set(true)
+        html.required.set(true)
     }
     getExecutionData().setFrom(fileTree('../framework/build/jacoco').include("**.exec"))
     afterEvaluate {

common/build.gradle

@@ -1,5 +1,6 @@
 version '1.0.0'
 
+def aspectjVersion = '1.9.25'
 
 dependencies {
     api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.18.6' // https://github.com/FasterXML/jackson-databind/issues/3627
@@ -12,9 +13,9 @@ dependencies {
     api group: 'io.prometheus', name: 'simpleclient_hotspot', version: '0.15.0'
     // https://openjdk.org/jeps/396, JEP 396: Strongly Encapsulate JDK Internals by Default
     // https://eclipse.dev/aspectj/doc/latest/release/JavaVersionCompatibility.html
-    api 'org.aspectj:aspectjrt:1.9.8'
-    api 'org.aspectj:aspectjweaver:1.9.8'
-    api 'org.aspectj:aspectjtools:1.9.8'
+    api "org.aspectj:aspectjrt:${aspectjVersion}"
+    api "org.aspectj:aspectjweaver:${aspectjVersion}"
+    api "org.aspectj:aspectjtools:${aspectjVersion}"
     api group: 'com.github.tronprotocol', name: 'libp2p', version: 'release-v2.2.8-SNAPSHOT',{
     //api group: 'io.github.tronprotocol', name: 'libp2p', version: '2.2.7',{
         exclude group: 'io.grpc', module: 'grpc-context'

consensus/build.gradle

@@ -32,8 +32,8 @@ test {
 
 jacocoTestReport {
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.required.set(true)
+        html.required.set(true)
     }
     getExecutionData().setFrom(fileTree('../framework/build/jacoco').include("**.exec"))
     afterEvaluate {

crypto/build.gradle

@@ -1,6 +1,8 @@
 version '1.0.0'
 
-sourceCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+}
 
 repositories {
     mavenCentral()
@@ -12,8 +14,8 @@ dependencies {
 
 jacocoTestReport {
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.required.set(true)
+        html.required.set(true)
     }
     getExecutionData().setFrom(fileTree('../framework/build/jacoco').include("**.exec"))
     afterEvaluate {

framework/build.gradle

@@ -1,15 +1,20 @@
 plugins {
-    id "org.gradle.test-retry" version "1.5.9"
+    id "org.gradle.test-retry" version "1.6.5"
     id "org.sonarqube" version "2.6"
-    id "com.gorylenko.gradle-git-properties" version "2.4.1"
+    id "com.gorylenko.gradle-git-properties" version "4.0.1"
 }
 
 gitProperties.failOnNoGitDirectory = false;
+tasks.named('generateGitProperties') {
+    doNotTrackState('The task snapshots .git, which may contain non-regular fsmonitor IPC files.')
+}
 
 apply plugin: 'application'
 apply plugin: 'checkstyle'
 
-mainClassName = 'org.tron.program.FullNode'
+application {
+    mainClass = 'org.tron.program.FullNode'
+}
 
 def versions = [
         checkstyle: '8.7',
@@ -95,7 +100,7 @@ tasks.matching { it instanceof Test }.all {
 }
 
 if (project.hasProperty("mainClass")) {
-    mainClassName = mainClass
+    application.mainClass = mainClass
 }
 
 run {
@@ -167,17 +172,17 @@ tasks.register('testWithRocksDb', Test) {
 
 jacocoTestReport {
     reports {
-        xml.enabled true
-        csv.enabled false
-        html.destination file("${buildDir}/jacocoHtml")
+        xml.required.set(true)
+        csv.required.set(false)
+        html.outputLocation.set(file("${buildDir}/jacocoHtml"))
     }
     getExecutionData().setFrom(fileTree('../framework/build/jacoco').include("**.exec"))
 }
 
 def binaryRelease(taskName, jarName, mainClass) {
     return tasks.create("${taskName}", Jar) {
-        baseName = jarName
-        version = null
+        archiveBaseName.set(jarName)
+        archiveVersion.set("")
         from(sourceSets.main.output) {
             include "/**"
         }
@@ -212,7 +217,7 @@ def createScript(project, mainClass, name) {
         unixStartScriptGenerator.template = resources.text.fromFile('../gradle/unixStartScript.txt')
         windowsStartScriptGenerator.template = resources.text.fromFile('../gradle/windowsStartScript.txt')
         outputDir = new File(project.buildDir, 'scripts')
-        mainClassName = mainClass
+        getMainClass().set(mainClass)
         applicationName = name
         classpath = project.tasks[JavaPlugin.JAR_TASK_NAME].outputs.files + project.configurations.runtimeClasspath
 //        defaultJvmOpts = ['-XX:+UseConcMarkSweepGC',
@@ -225,23 +230,34 @@ def createScript(project, mainClass, name) {
 //        ]
     }
     project.tasks[name].dependsOn(project.jar)
-    project.applicationDistribution.with {
+    project.distributions.main.contents {
         into("bin") {
-            from(project.tasks[name])
-            fileMode = 0755
+            from(project.tasks[name]) {
+                filePermissions {
+                    unix("rwxr-xr-x")
+                }
+            }
         }
     }
 }
-applicationDistribution.from(rootProject.archInfo.VMOptions) {
-    into "bin"
+distributions {
+    main {
+        contents {
+            from(rootProject.archInfo.VMOptions) {
+                into "bin"
+            }
+        }
+    }
 }
 //distZip {
 //    doLast {
 //        file("$destinationDir/$archiveName").renameTo("$destinationDir/"+'java-tron-'+version+'-bin.zip')
 //    }
 //}
 configurations.archives.artifacts.removeAll { it.type == 'tar' }
-applicationName = 'java-tron'
+application {
+    applicationName = 'java-tron'
+}
 startScripts.enabled = false
 run.enabled = false
 tasks.distTar.enabled = false

framework/src/test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java

@@ -1487,7 +1487,7 @@ public void testWeb3ClientVersion() {
     try {
       String[] versions = tronJsonRpc.web3ClientVersion().split("/");
       String javaVersion = versions[versions.length - 1];
-      Assert.assertTrue("Java1.8".equals(javaVersion) || "Java17".equals(javaVersion));
+      Assert.assertEquals("Java" + System.getProperty("java.specification.version"), javaVersion);
     } catch (Exception e) {
       Assert.fail();
     }