Skip to content

Commit 3c856c8

Browse files
Merge pull request #6180 from halibobo1205/feature/dependency_upgrade
feat(dependency): dependencies upgrade for security
2 parents f402360 + f500778 commit 3c856c8

File tree

5 files changed

+23
-10
lines changed

5 files changed

+23
-10
lines changed

common/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies {
3434
api "com.cedarsoftware:java-util:1.8.0"
3535
api group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.1'
3636
api group: 'commons-codec', name: 'commons-codec', version: '1.11'
37-
api group: 'com.beust', name: 'jcommander', version: '1.72'
37+
api group: 'com.beust', name: 'jcommander', version: '1.78'
3838
api group: 'com.typesafe', name: 'config', version: '1.3.2'
3939
api group: leveldbGroup, name: leveldbName, version: leveldbVersion
4040
api group: 'org.rocksdb', name: 'rocksdbjni', version: '5.15.10'
@@ -46,7 +46,7 @@ dependencies {
4646
api 'org.aspectj:aspectjrt:1.8.13'
4747
api 'org.aspectj:aspectjweaver:1.8.13'
4848
api 'org.aspectj:aspectjtools:1.8.13'
49-
api group: 'io.github.tronprotocol', name: 'libp2p', version: '2.2.4',{
49+
api group: 'io.github.tronprotocol', name: 'libp2p', version: '2.2.5',{
5050
exclude group: 'io.grpc', module: 'grpc-context'
5151
exclude group: 'io.grpc', module: 'grpc-core'
5252
exclude group: 'io.grpc', module: 'grpc-netty'
@@ -60,6 +60,8 @@ dependencies {
6060
exclude group: 'net.java.dev.msv', module: 'xsdlib'
6161
exclude group: 'pull-parser', module: 'pull-parser'
6262
exclude group: 'xpp3', module: 'xpp3'
63+
exclude group: 'org.bouncycastle', module: 'bcprov-jdk18on'
64+
exclude group: 'org.bouncycastle', module: 'bcutil-jdk18on'
6365
}
6466
api project(":protocol")
6567
}

framework/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ dependencies {
5757
compileOnly group: 'javax.portlet', name: 'portlet-api', version: '3.0.1'
5858

5959
implementation "io.vavr:vavr:0.9.2"
60-
implementation group: 'org.pf4j', name: 'pf4j', version: '2.5.0'
60+
implementation (group: 'org.pf4j', name: 'pf4j', version: '3.10.0') {
61+
exclude group: "org.slf4j", module: "slf4j-api"
62+
}
6163

6264
testImplementation group: 'org.springframework', name: 'spring-test', version: '5.2.0.RELEASE'
6365
testImplementation group: 'org.springframework', name: 'spring-web', version: '5.2.0.RELEASE'

framework/src/main/java/org/tron/common/client/DatabaseGrpcClient.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package org.tron.common.client;
22

3+
import io.grpc.LoadBalancerRegistry;
34
import io.grpc.ManagedChannel;
45
import io.grpc.ManagedChannelBuilder;
6+
import io.grpc.internal.PickFirstLoadBalancerProvider;
57
import org.tron.api.DatabaseGrpc;
68
import org.tron.api.GrpcAPI.EmptyMessage;
79
import org.tron.api.GrpcAPI.NumberMessage;
@@ -13,6 +15,12 @@ public class DatabaseGrpcClient {
1315
private final ManagedChannel channel;
1416
private final DatabaseGrpc.DatabaseBlockingStub databaseBlockingStub;
1517

18+
static {
19+
LoadBalancerRegistry
20+
.getDefaultRegistry()
21+
.register(new PickFirstLoadBalancerProvider());
22+
}
23+
1624
public DatabaseGrpcClient(String host, int port) {
1725
channel = ManagedChannelBuilder.forAddress(host, port)
1826
.usePlaintext()

framework/src/main/java/org/tron/core/config/args/Args.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -262,14 +262,15 @@ private static void printVersion() {
262262
} catch (IOException e) {
263263
logger.error(e.getMessage());
264264
}
265-
JCommander.getConsole().println("OS : " + System.getProperty("os.name"));
266-
JCommander.getConsole().println("JVM : " + System.getProperty("java.vendor") + " "
265+
JCommander jCommander = new JCommander();
266+
jCommander.getConsole().println("OS : " + System.getProperty("os.name"));
267+
jCommander.getConsole().println("JVM : " + System.getProperty("java.vendor") + " "
267268
+ System.getProperty("java.version") + " " + System.getProperty("os.arch"));
268269
if (!noGitProperties) {
269-
JCommander.getConsole().println("Git : " + properties.getProperty("git.commit.id"));
270+
jCommander.getConsole().println("Git : " + properties.getProperty("git.commit.id"));
270271
}
271-
JCommander.getConsole().println("Version : " + Version.getVersion());
272-
JCommander.getConsole().println("Code : " + Version.VERSION_CODE);
272+
jCommander.getConsole().println("Version : " + Version.getVersion());
273+
jCommander.getConsole().println("Code : " + Version.VERSION_CODE);
273274
}
274275

275276
public static void printHelp(JCommander jCommander) {
@@ -313,7 +314,7 @@ public static void printHelp(JCommander jCommander) {
313314
helpStr.append(tmpOptionDesc);
314315
}
315316
}
316-
JCommander.getConsole().println(helpStr.toString());
317+
jCommander.getConsole().println(helpStr.toString());
317318
}
318319

319320
public static String upperFirst(String name) {

protocol/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.google.protobuf'
22

33
def protobufVersion = '3.25.5'
4-
def grpcVersion = '1.52.1'
4+
def grpcVersion = '1.60.0'
55

66
dependencies {
77
api group: 'com.google.protobuf', name: 'protobuf-java', version: protobufVersion

0 commit comments

Comments
 (0)