[7.17] Align all usages of protobuf to be 3.21.9 (#95431)

Updating repository-hdfs, repository-gcs, and vector-tile to all use the same more recent protobuf.

Co-authored-by: Keith Massey <[email protected]>

Author: gwbrown

build-tools-internal/version.properties

@@ -22,6 +22,10 @@ joda              = 2.12.6
 commons_lang3                   = 3.9
 # bouncy castle version for non-fips. fips jars use a different version
 bouncycastle=1.78.1
+
+# client dependencies
+protobuf          = 3.21.9
+
 # test dependencies
 randomizedrunner  = 2.8.0
 junit             = 4.13.2

docs/changelog/92123.yaml

@@ -0,0 +1,5 @@
+pr: 92123
+summary: Align all usages of protobuf to be 3.21.9
+area: Snapshot/Restore
+type: upgrade
+issues: []

gradle/verification-metadata.xml

@@ -819,29 +819,19 @@
             <sha256 value="e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.protobuf" name="protobuf-java" version="3.16.3">
-         <artifact name="protobuf-java-3.16.3.jar">
-            <sha256 value="6d3758b483e1ac7505649371a5b058a717260ef470100fefad7a1e2aba75e06f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.google.protobuf" name="protobuf-java" version="3.21.1">
-         <artifact name="protobuf-java-3.21.1.jar">
-            <sha256 value="ad275e75ee79e6c6388198dcb9acf0db2edee64782e11b508f379c3a2a17d168" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.google.protobuf" name="protobuf-java" version="3.21.7">
-         <artifact name="protobuf-java-3.21.7.jar">
-            <sha256 value="a204ec68748a7b26351ae37a311e8de468f248d1916d5f8dbe812c1289d0a0ff" origin="Generated by Gradle"/>
+      <component group="com.google.protobuf" name="protobuf-java" version="3.21.9">
+         <artifact name="protobuf-java-3.21.9.jar">
+            <sha256 value="1b78b4a76a71512debfdff8f8fc5aef6bfd459f65758fecf7aff245e6e6301e4" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.protobuf" name="protobuf-java" version="3.21.9">
          <artifact name="protobuf-java-3.21.9.jar">
             <sha256 value="1b78b4a76a71512debfdff8f8fc5aef6bfd459f65758fecf7aff245e6e6301e4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.protobuf" name="protobuf-java-util" version="3.17.3">
-         <artifact name="protobuf-java-util-3.17.3.jar">
-            <sha256 value="bf320ed076000e1d8c7cbf7601b056acaecab80f75b9a659b9f6398d0d7e3f79" origin="Generated by Gradle"/>
+      <component group="com.google.protobuf" name="protobuf-java-util" version="3.21.9">
+         <artifact name="protobuf-java-util-3.21.9.jar">
+            <sha256 value="a78226d02551ca2cb34b24b4168a75b4a84041cc3333f3725bb5ad9806a80b77" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.re2j" name="re2j" version="1.1">

plugins/repository-gcs/build.gradle

@@ -37,8 +37,8 @@ dependencies {
   api 'com.google.api:api-common:2.3.1'
   api 'com.google.api:gax:2.20.1'
   api 'org.threeten:threetenbp:1.6.5'
-  api 'com.google.protobuf:protobuf-java-util:3.17.3'
-  api 'com.google.protobuf:protobuf-java:3.21.7'
+  api "com.google.protobuf:protobuf-java-util:${versions.protobuf}"
+  api "com.google.protobuf:protobuf-java:${versions.protobuf}"
   api 'com.google.code.gson:gson:2.10'
   api 'com.google.api.grpc:proto-google-common-protos:2.9.6'
   api 'com.google.api.grpc:proto-google-iam-v1:1.6.2'

plugins/repository-hdfs/build.gradle

@@ -47,7 +47,7 @@ dependencies {
     }
     runtimeOnly "org.apache.hadoop:hadoop-client-runtime:${versions.hadoop}"
     implementation "org.apache.hadoop:hadoop-hdfs:${versions.hadoop}"
-    api 'com.google.protobuf:protobuf-java:3.21.9'
+    api "com.google.protobuf:protobuf-java:${versions.protobuf}"
     api 'commons-logging:commons-logging:1.1.3'
     api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
     api 'commons-cli:commons-cli:1.2'

x-pack/plugin/vector-tile/build.gradle

@@ -29,11 +29,11 @@ dependencies {
   testImplementation(testArtifact(project(xpackModule('core'))))
   compileOnly "org.locationtech.jts:jts-core:${versions.jts}"
   api "com.wdtinc:mapbox-vector-tile:3.1.0"
-  api "com.google.protobuf:protobuf-java:3.16.3"
+  api "com.google.protobuf:protobuf-java:${versions.protobuf}"
   runtimeOnly("org.slf4j:slf4j-api:${versions.slf4j}")
   runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}")
   javaRestTestImplementation("com.wdtinc:mapbox-vector-tile:3.1.0")
-  javaRestTestImplementation("com.google.protobuf:protobuf-java:3.16.3")
+  javaRestTestImplementation("com.google.protobuf:protobuf-java:${versions.protobuf}")
 }
 
 testClusters.configureEach {

x-pack/snapshot-tool/build.gradle

@@ -46,8 +46,8 @@ dependencies {
   api 'com.google.api:api-common:2.3.1'
   api 'com.google.api:gax:2.20.1'
   api 'org.threeten:threetenbp:1.6.5'
-  api 'com.google.protobuf:protobuf-java-util:3.17.3'
-  api 'com.google.protobuf:protobuf-java:3.21.7'
+  api "com.google.protobuf:protobuf-java-util:${versions.protobuf}"
+  api "com.google.protobuf:protobuf-java:${versions.protobuf}"
   api 'com.google.code.gson:gson:2.10'
   api 'com.google.api.grpc:proto-google-common-protos:2.9.6'
   api 'com.google.api.grpc:proto-google-iam-v1:1.6.2'