Update protobuf dependency

Author: alecgrieser

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/metadata/MetaDataEvolutionValidator.java

@@ -29,6 +29,7 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.Sets;
+import com.google.protobuf.DescriptorProtos;
 import com.google.protobuf.Descriptors;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.EnumDescriptor;
@@ -251,10 +252,11 @@ private void validateMessage(@Nonnull Descriptor oldDescriptor, @Nonnull Descrip
         }
     }
 
-    @SuppressWarnings("deprecation") // checks the deprecated syntax field
     private void validateProtoSyntax(@Nonnull Descriptors.Descriptor oldDescriptor, @Nonnull Descriptors.Descriptor newDescriptor) {
-        if (!oldDescriptor.getFile().getSyntax().equals(newDescriptor.getFile().getSyntax())
-                || !oldDescriptor.getFile().getEdition().equals(newDescriptor.getFile().getEdition())) {
+        final DescriptorProtos.FileDescriptorProto oldFileDescriptorProto = oldDescriptor.getFile().toProto();
+        final DescriptorProtos.FileDescriptorProto newFileDescriptorProto = newDescriptor.getFile().toProto();
+        if (!oldFileDescriptorProto.getSyntax().equals(oldFileDescriptorProto.getSyntax())
+                || !oldFileDescriptorProto.getEdition().equals(newFileDescriptorProto.getEdition())) {
             throw new MetaDataException("message descriptor proto syntax changed",
                     LogMessageKeys.RECORD_TYPE, oldDescriptor.getName());
         }

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/metadata/MetaDataEvolutionValidatorTestV3.java

@@ -148,7 +148,7 @@ public void nestedProto2ToProto3() {
     @SuppressWarnings("deprecation") // test focuses on checking the (deprecated) syntax field
     @Test
     public void onlyFileProto2ToProto3() throws InvalidProtocolBufferException {
-        assertNotEquals(TestRecords1Proto.getDescriptor().getSyntax(), TestRecords1ImportedProto.getDescriptor().getSyntax());
+        assertNotEquals(TestRecords1Proto.getDescriptor().toProto().getSyntax(), TestRecords1ImportedProto.getDescriptor().toProto().getSyntax());
         MetaDataEvolutionValidator.getDefaultInstance().validateUnion(
                 TestRecords1Proto.RecordTypeUnion.getDescriptor(),
                 TestRecords1ImportedProto.RecordTypeUnion.getDescriptor()

gradle/libs.versions.toml

@@ -35,7 +35,7 @@ fdb = "7.1.26"
 geophile = "2.3.0"
 generatedAnnotation = "1.3.2"
 grpc = "1.64.1"
-grpc-commonProtos = "2.37.0"
+grpc-commonProtos = "2.54.1"
 guava = "33.3.1-jre"
 h2 = "1.3.148"
 icu = "69.1"
@@ -47,7 +47,7 @@ jts = "1.16.1"
 log4j = "2.23.1"
 prometheus = "0.16.0"
 prometheus-grpc = "0.6.0"
-protobuf = "3.25.5"
+protobuf = "4.30.1"
 sqlline = "1.12.0"
 slf4j = "1.7.36"