Skip to content

Commit a586ac7

Browse files
authored
[7.x] Bump protobuf version for repository hdfs (#104076)
This commit bumps the protobuf version for in 7.x to match the version used in main. Main has been running this version since #92123
1 parent 034b8ec commit a586ac7

File tree

5 files changed

+13
-5
lines changed

5 files changed

+13
-5
lines changed

docs/changelog/104076.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 104076
2+
summary: "[7.x] Bump protobuf version"
3+
area: Snapshot/Restore
4+
type: upgrade
5+
issues: []

gradle/verification-metadata.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -809,9 +809,9 @@
809809
<sha256 value="a204ec68748a7b26351ae37a311e8de468f248d1916d5f8dbe812c1289d0a0ff" origin="Generated by Gradle"/>
810810
</artifact>
811811
</component>
812-
<component group="com.google.protobuf" name="protobuf-java" version="3.4.0">
813-
<artifact name="protobuf-java-3.4.0.jar">
814-
<sha256 value="dce7e66b32456a1b1198da0caff3a8acb71548658391e798c79369241e6490a4" origin="Generated by Gradle"/>
812+
<component group="com.google.protobuf" name="protobuf-java" version="3.21.9">
813+
<artifact name="protobuf-java-3.21.9.jar">
814+
<sha256 value="1b78b4a76a71512debfdff8f8fc5aef6bfd459f65758fecf7aff245e6e6301e4" origin="Generated by Gradle"/>
815815
</artifact>
816816
</component>
817817
<component group="com.google.protobuf" name="protobuf-java-util" version="3.17.3">

plugins/repository-hdfs/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ dependencies {
4747
}
4848
runtimeOnly "org.apache.hadoop:hadoop-client-runtime:${versions.hadoop}"
4949
implementation "org.apache.hadoop:hadoop-hdfs:${versions.hadoop}"
50-
api 'com.google.protobuf:protobuf-java:3.4.0'
50+
api 'com.google.protobuf:protobuf-java:3.21.9'
5151
api 'commons-logging:commons-logging:1.1.3'
5252
api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
5353
api 'commons-cli:commons-cli:1.2'
@@ -306,8 +306,11 @@ tasks.named("thirdPartyAudit").configure {
306306
ignoreMissingClasses()
307307
ignoreViolations(
308308
// internal java api: sun.misc.Unsafe
309+
'com.google.protobuf.MessageSchema',
309310
'com.google.protobuf.UnsafeUtil',
310311
'com.google.protobuf.UnsafeUtil$1',
312+
'com.google.protobuf.UnsafeUtil$Android32MemoryAccessor',
313+
'com.google.protobuf.UnsafeUtil$Android64MemoryAccessor',
311314
'com.google.protobuf.UnsafeUtil$JvmMemoryAccessor',
312315
'com.google.protobuf.UnsafeUtil$MemoryAccessor',
313316
'org.apache.hadoop.hdfs.server.datanode.checker.AbstractFuture$UnsafeAtomicHelper',
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ed1240d9231044ce6ccf1978512f6e44416bb7e7

plugins/repository-hdfs/licenses/protobuf-java-3.4.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)