Merge pull request #1005 from lewijacn/update-protobuf-version

Upgrade protobuf version
opensearch-project · Sep 30, 2024 · b26db7f · b26db7f
2 parents 00f7ce3 + e99f373
commit b26db7f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/TrafficCapture/captureProtobufs/build.gradle b/TrafficCapture/captureProtobufs/build.gradle
@@ -9,11 +9,11 @@ plugins {
 
 dependencies {
     api project(":commonDependencyVersionConstraints")
-    api group: 'com.google.protobuf', name: 'protobuf-java', version: '3.22.2'
+    api group: 'com.google.protobuf', name: 'protobuf-java'
 }
 
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:3.22.2"
+        artifact = "com.google.protobuf:protoc:${rootProject.project("commonDependencyVersionConstraints").protobufVersion}"
     }
 }
diff --git a/commonDependencyVersionConstraints/build.gradle b/commonDependencyVersionConstraints/build.gradle
@@ -5,6 +5,10 @@ plugins {
 java.sourceCompatibility = JavaVersion.VERSION_11
 java.targetCompatibility = JavaVersion.VERSION_11
 
+ext {
+  protobufVersion='3.25.5'
+}
+
 dependencies {
 
   constraints {
@@ -24,7 +28,7 @@ dependencies {
 
     api group: 'com.google.guava', name: 'guava', version: '32.0.1-jre'
 
-    api group: 'com.google.protobuf', name: 'protobuf-java', version: '3.22.2'
+    api group: 'com.google.protobuf', name: 'protobuf-java', version: protobufVersion
 
     api group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.2.1'
     api group: 'software.amazon.msk', name:'aws-msk-iam-auth', version: '2.0.3'
@@ -38,7 +42,7 @@ dependencies {
 
     api group: 'org.apache.kafka', name:'kafka-clients', version:'3.6.0'
 
-    api group: 'com.google.protobuf', name: 'protoc', version: '3.22.2'
+    api group: 'com.google.protobuf', name: 'protoc', version: protobufVersion
 
     def jmeter = '5.6.3'
     api group: 'org.apache.jmeter', name: 'ApacheJMeter_core', version: jmeter