From 98a37b15baea9d4aa8d9e6fd1adb1ec962b2d983 Mon Sep 17 00:00:00 2001
From: halibobo1205 <halibobo1205@gmail.com>
Date: Sun, 22 Sep 2024 14:00:09 +0800
Subject: [PATCH] feat(dependencies): update dependencies for protobuf-java

 Bump com.google.protobuf:protobuf-java from 3.21.12 to 3.25.5

 Bump io.github.tronprotocol:libp2p from 2.2.1 to 2.2.4
---
 build.gradle          | 7 -------
 common/build.gradle   | 2 +-
 protocol/build.gradle | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index a56be97afa1..f5b144657f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,6 @@ subprojects {
         compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
         compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25'
         compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.9'
-        compile group: 'com.google.guava', name: 'guava', version: '30.1-jre'
         compile "com.google.code.findbugs:jsr305:3.0.0"
         compile group: 'org.springframework', name: 'spring-context', version: '5.3.18'
         compile group: 'org.springframework', name: 'spring-tx', version: '5.3.18'
@@ -68,12 +67,6 @@ subprojects {
         preserveFileTimestamps = false
         reproducibleFileOrder = true
     }
-
-    configurations.all {
-        resolutionStrategy {
-            force group: 'com.google.guava', name: 'guava', version: '30.1-jre'
-        }
-    }
 }
 
 task copyToParent(type: Copy) {
diff --git a/common/build.gradle b/common/build.gradle
index 6c1545e5d13..8c651e48455 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -46,7 +46,7 @@ dependencies {
     compile 'org.aspectj:aspectjrt:1.8.13'
     compile 'org.aspectj:aspectjweaver:1.8.13'
     compile 'org.aspectj:aspectjtools:1.8.13'
-    compile group: 'io.github.tronprotocol', name: 'libp2p', version: '2.2.1',{
+    compile group: 'io.github.tronprotocol', name: 'libp2p', version: '2.2.4',{
         exclude group: 'io.grpc', module: 'grpc-context'
         exclude group: 'io.grpc', module: 'grpc-core'
         exclude group: 'io.grpc', module: 'grpc-netty'
diff --git a/protocol/build.gradle b/protocol/build.gradle
index 922d6d19859..d88687227e8 100644
--- a/protocol/build.gradle
+++ b/protocol/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.google.protobuf'
 
-def protobufVersion = '3.21.12'
+def protobufVersion = '3.25.5'
 def grpcVersion = '1.52.1'
 
 dependencies {