deps: update protobuf dependencies to v3.25.0 (#2222)

* deps: update protobuf dependencies to v3.25.0 * chore: Regenerate tests with protobuf v25 --------- Co-authored-by: Lawrence Qiu <[email protected]>
googleapis · Nov 8, 2023 · 445477f · 445477f
1 parent 3c9cb06
commit 445477f
Show file tree

Hide file tree

Showing 177 changed files with 831 additions and 51 deletions.
diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
@@ -31,7 +31,7 @@
     <google.http-client.version>1.43.3</google.http-client.version>
     <gson.version>2.10.1</gson.version>
     <guava.version>32.1.2-jre</guava.version>
-    <protobuf.version>3.24.4</protobuf.version>
+    <protobuf.version>3.25.0</protobuf.version>
     <maven.compiler.release>8</maven.compiler.release>
   </properties>
 

diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties
@@ -26,7 +26,7 @@ version.gax_httpjson=2.37.1-SNAPSHOT
 # The protobuf version is only used for generating gradle files for showcase module,
 # not for self-service clients (from googleapis project).
 
-version.com_google_protobuf=3.24.4
+version.com_google_protobuf=3.25.0
 version.google_java_format=1.15.0
 version.io_grpc=1.59.0
 

diff --git a/.../src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json b/.../src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json
@@ -944,6 +944,15 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$Edition",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -1143,7 +1152,43 @@
     "allPublicClasses": true
   },
   {
-    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$StringFieldValidation",
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Utf8Validation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault$Builder",
     "queryAllDeclaredConstructors": true,
     "queryAllPublicConstructors": true,
     "queryAllDeclaredMethods": true,

diff --git a/...ic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequest.java b/...ic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequest.java
diff --git a/...se-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequestOrBuilder.java b/...se-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptSequenceRequestOrBuilder.java
diff --git a/...se-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequest.java b/...se-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequest.java
diff --git a/...1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequestOrBuilder.java b/...1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceRequestOrBuilder.java
diff --git a/...e-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponse.java b/...e-v1beta1/src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponse.java
diff --git a/.../src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponseOrBuilder.java b/.../src/main/java/com/google/showcase/v1beta1/AttemptStreamingSequenceResponseOrBuilder.java
diff --git a/.../proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequest.java b/.../proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequest.java
diff --git a/...pic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequestOrBuilder.java b/...pic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockRequestOrBuilder.java
diff --git a/...proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponse.java b/...proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponse.java
diff --git a/...ic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponseOrBuilder.java b/...ic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlockResponseOrBuilder.java
diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Blurb.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Blurb.java
diff --git a/...roto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbOrBuilder.java b/...roto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbOrBuilder.java
diff --git a/...roto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceData.java b/...roto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceData.java
diff --git a/...gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChild.java b/...gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChild.java
diff --git a/...wcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChildOrBuilder.java b/...wcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataChildOrBuilder.java
diff --git a/...-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchild.java b/...-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchild.java
diff --git a/...-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchildOrBuilder.java b/...-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataGrandchildOrBuilder.java
diff --git a/...c-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataOrBuilder.java b/...c-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceDataOrBuilder.java
diff --git a/...oto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroup.java b/...oto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroup.java
diff --git a/...-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroupOrBuilder.java b/...-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGroupOrBuilder.java
diff --git a/...apic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceOuterClass.java b/...apic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceOuterClass.java
diff --git a/...oto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuite.java b/...oto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuite.java
diff --git a/...-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuiteOrBuilder.java b/...-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceSuiteOrBuilder.java
diff --git a/...roto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequest.java b/...roto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequest.java
diff --git a/...c-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequestOrBuilder.java b/...c-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ConnectRequestOrBuilder.java
diff --git a/...ase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Continent.java b/...ase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/Continent.java
diff --git a/...-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequest.java b/...-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequest.java
diff --git a/...owcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequestOrBuilder.java b/...owcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateBlurbRequestOrBuilder.java
diff --git a/...o-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequest.java b/...o-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequest.java
diff --git a/...howcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequestOrBuilder.java b/...howcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateRoomRequestOrBuilder.java
diff --git a/...pic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequest.java b/...pic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequest.java
diff --git a/...ase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequestOrBuilder.java b/...ase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSequenceRequestOrBuilder.java
diff --git a/...apic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequest.java b/...apic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequest.java
diff --git a/...case-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequestOrBuilder.java b/...case-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateSessionRequestOrBuilder.java
diff --git a/...ase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequest.java b/...ase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequest.java
diff --git a/...a1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequestOrBuilder.java b/...a1/src/main/java/com/google/showcase/v1beta1/CreateStreamingSequenceRequestOrBuilder.java
diff --git a/...o-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequest.java b/...o-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/CreateUserRequest.java