From 831306a5e49fec3b44bd258cb311609e735c6de2 Mon Sep 17 00:00:00 2001
From: tomatoishealthy <wgq.quan@gmail.com>
Date: Fri, 17 Jan 2025 13:54:54 +0800
Subject: [PATCH] feat(dependencies): upgrade grpc&pf4j&jcommander version

---
 common/build.gradle                                 |  2 +-
 framework/build.gradle                              |  4 +++-
 .../org/tron/common/client/DatabaseGrpcClient.java  |  8 ++++++++
 .../main/java/org/tron/core/config/args/Args.java   | 13 +++++++------
 protocol/build.gradle                               |  2 +-
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/common/build.gradle b/common/build.gradle
index efd966897a4..a7393d2d739 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     api "com.cedarsoftware:java-util:1.8.0"
     api group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.1'
     api group: 'commons-codec', name: 'commons-codec', version: '1.11'
-    api group: 'com.beust', name: 'jcommander', version: '1.72'
+    api group: 'com.beust', name: 'jcommander', version: '1.78'
     api group: 'com.typesafe', name: 'config', version: '1.3.2'
     api group: leveldbGroup, name: leveldbName, version: leveldbVersion
     api group: 'org.rocksdb', name: 'rocksdbjni', version: '5.15.10'
diff --git a/framework/build.gradle b/framework/build.gradle
index 10477fb71b3..9a7bf05e951 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -58,7 +58,9 @@ dependencies {
     compileOnly group: 'javax.portlet', name: 'portlet-api', version: '3.0.1'
 
     implementation "io.vavr:vavr:0.9.2"
-    implementation group: 'org.pf4j', name: 'pf4j', version: '2.5.0'
+    implementation (group: 'org.pf4j', name: 'pf4j', version: '3.10.0') {
+        exclude group: "org.slf4j", module: "slf4j-api"
+    }
 
     testImplementation group: 'org.springframework', name: 'spring-test', version: '5.2.0.RELEASE'
     testImplementation group: 'org.springframework', name: 'spring-web', version: '5.2.0.RELEASE'
diff --git a/framework/src/main/java/org/tron/common/client/DatabaseGrpcClient.java b/framework/src/main/java/org/tron/common/client/DatabaseGrpcClient.java
index f3650bfd2be..0c22c264188 100644
--- a/framework/src/main/java/org/tron/common/client/DatabaseGrpcClient.java
+++ b/framework/src/main/java/org/tron/common/client/DatabaseGrpcClient.java
@@ -1,7 +1,9 @@
 package org.tron.common.client;
 
+import io.grpc.LoadBalancerRegistry;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
+import io.grpc.internal.PickFirstLoadBalancerProvider;
 import org.tron.api.DatabaseGrpc;
 import org.tron.api.GrpcAPI.EmptyMessage;
 import org.tron.api.GrpcAPI.NumberMessage;
@@ -13,6 +15,12 @@ public class DatabaseGrpcClient {
   private final ManagedChannel channel;
   private final DatabaseGrpc.DatabaseBlockingStub databaseBlockingStub;
 
+  static {
+    LoadBalancerRegistry
+        .getDefaultRegistry()
+        .register(new PickFirstLoadBalancerProvider());
+  }
+
   public DatabaseGrpcClient(String host, int port) {
     channel = ManagedChannelBuilder.forAddress(host, port)
         .usePlaintext()
diff --git a/framework/src/main/java/org/tron/core/config/args/Args.java b/framework/src/main/java/org/tron/core/config/args/Args.java
index 8853971a5f8..755313deb2b 100644
--- a/framework/src/main/java/org/tron/core/config/args/Args.java
+++ b/framework/src/main/java/org/tron/core/config/args/Args.java
@@ -253,14 +253,15 @@ private static void printVersion() {
     } catch (IOException e) {
       logger.error(e.getMessage());
     }
-    JCommander.getConsole().println("OS : " + System.getProperty("os.name"));
-    JCommander.getConsole().println("JVM : " + System.getProperty("java.vendor") + " "
+    JCommander jCommander = new JCommander();
+    jCommander.getConsole().println("OS : " + System.getProperty("os.name"));
+    jCommander.getConsole().println("JVM : " + System.getProperty("java.vendor") + " "
         + System.getProperty("java.version") + " " + System.getProperty("os.arch"));
     if (!noGitProperties) {
-      JCommander.getConsole().println("Git : " + properties.getProperty("git.commit.id"));
+      jCommander.getConsole().println("Git : " + properties.getProperty("git.commit.id"));
     }
-    JCommander.getConsole().println("Version : " + Version.getVersion());
-    JCommander.getConsole().println("Code : " + Version.VERSION_CODE);
+    jCommander.getConsole().println("Version : " + Version.getVersion());
+    jCommander.getConsole().println("Code : " + Version.VERSION_CODE);
   }
 
   public static void printHelp(JCommander jCommander) {
@@ -304,7 +305,7 @@ public static void printHelp(JCommander jCommander) {
         helpStr.append(tmpOptionDesc);
       }
     }
-    JCommander.getConsole().println(helpStr.toString());
+    jCommander.getConsole().println(helpStr.toString());
   }
 
   public static String upperFirst(String name) {
diff --git a/protocol/build.gradle b/protocol/build.gradle
index ce4091afff1..02158f9fdd4 100644
--- a/protocol/build.gradle
+++ b/protocol/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.google.protobuf'
 
 def protobufVersion = '3.25.5'
-def grpcVersion = '1.52.1'
+def grpcVersion = '1.60.0'
 
 dependencies {
     api group: 'com.google.protobuf', name: 'protobuf-java', version: protobufVersion