build(deps): bump grpc version to 1.58.0 and protobuf to 3.24.0 (#1989)

* build(deps): bump grpc version to 1.58.0 and protobuf to 3.24.0 --------- Co-authored-by: Diego Marquez <diegomarquezp@google.com>
googleapis · Sep 20, 2023 · 7eec867 · 7eec867
1 parent 0e7fe10
commit 7eec867
Show file tree

Hide file tree

Showing 59 changed files with 1,995 additions and 424 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -282,7 +282,7 @@ jobs:
       run: |
         mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
     - name: Validate gapic-generator-java-bom
-      uses: googleapis/java-cloud-bom/tests/validate-bom@v26.13.0
+      uses: googleapis/java-cloud-bom/tests/validate-bom@2414e159ab8f882717ab7f6ae4c4a02c096b94fa
       with:
         bom-path: gapic-generator-java-bom/pom.xml
 
diff --git a/.kokoro/presubmit/downstream-compatibility.sh b/.kokoro/presubmit/downstream-compatibility.sh
@@ -38,9 +38,14 @@ echo "Install complete. java-shared-dependencies = $SHARED_DEPS_VERSION"
 
 pushd java-shared-dependencies/target
 for repo in ${REPOS_UNDER_TEST//,/ }; do # Split on comma
-  # Perform testing on last release, not HEAD
-  last_release=$(find_last_release_version "$repo")
-  git clone "https://github.com/googleapis/$repo.git" --depth=1 --branch "v$last_release"
+  # Perform testing on HEAD for google-cloud-java
+  if [ $repo == "google-cloud-java" ]; then
+    git clone "https://github.com/googleapis/$repo.git" --depth=1
+  else
+    # Perform testing on last release, not HEAD
+    last_release=$(find_last_release_version "$repo")
+    git clone "https://github.com/googleapis/$repo.git" --depth=1 --branch "v$last_release"
+  fi
   update_all_poms_dependency "$repo" google-cloud-shared-dependencies "$SHARED_DEPS_VERSION"
   pushd "$repo"
   JOB_TYPE="test" ./.kokoro/build.sh

diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>com.google.errorprone</groupId>
             <artifactId>error_prone_annotations</artifactId>
-            <version>2.18.0</version>
+            <version>2.20.0</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
@@ -27,15 +27,12 @@
         consistent across modules in this repository -->
     <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
     <auto-value.version>1.10.2</auto-value.version>
-    <grpc.version>1.56.1</grpc.version>
+    <grpc.version>1.58.0</grpc.version>
     <google.auth.version>1.19.0</google.auth.version>
     <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>
-    <!--  On next protobuf upgrade (to 3.23.3 or higher),
-    remove temporarily j2objc-annotations exclusions from protobuf-java-util dependencies.
-      For context: https://github.com/googleapis/sdk-platform-java/pull/1791-->
-    <protobuf.version>3.23.2</protobuf.version>
+    <protobuf.version>3.24.0</protobuf.version>
     <maven.compiler.release>8</maven.compiler.release>
   </properties>
 

diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml
@@ -457,7 +457,7 @@
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>
-      <version>2.18.0</version>
+      <version>2.20.0</version>
     </dependency>
 
     <!--

diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties
@@ -29,9 +29,9 @@ version.gax_httpjson=2.33.1-SNAPSHOT
 # On next protobuf upgrade (to 3.23.3 or higher),
 # remove temporarily j2objc-annotations exclusions from protobuf-java-util dependencies.
 # For context: https://github.com/googleapis/sdk-platform-java/pull/1791
-version.com_google_protobuf=3.23.2
+version.com_google_protobuf=3.24.0
 version.google_java_format=1.15.0
-version.io_grpc=1.56.1
+version.io_grpc=1.58.0
 
 # Maven artifacts.
 # Note, the actual name of each property matters (bazel build scripts depend on it).
@@ -65,7 +65,7 @@ maven.com_google_guava_failureaccess=com.google.guava:failureaccess:1.0.1
 maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.12.0
 maven.com_google_android_annotations=com.google.android:annotations:4.1.1.4
 maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.2
-maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.18.0
+maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.20.0
 maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:2.8
 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.10.2
 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.10.2

diff --git a/gax-java/gax-grpc/pom.xml b/gax-java/gax-grpc/pom.xml
@@ -39,6 +39,10 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-inprocess</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.threeten</groupId>
       <artifactId>threetenbp</artifactId>

diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml
@@ -28,7 +28,7 @@
     <animal-sniffer.version>1.23</animal-sniffer.version>
     <opencensus.version>0.31.1</opencensus.version>
     <findbugs.version>3.0.2</findbugs.version>
-    <errorprone.version>2.18.0</errorprone.version>
+    <errorprone.version>2.20.0</errorprone.version>
     <jackson.version>2.15.2</jackson.version>
     <codec.version>1.15</codec.version>
     <httpcomponents.httpcore.version>4.4.16</httpcomponents.httpcore.version>

diff --git a/java-shared-dependencies/upper-bound-check/pom.xml b/java-shared-dependencies/upper-bound-check/pom.xml
@@ -144,12 +144,6 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java-util</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.j2objc</groupId>
-          <artifactId>j2objc-annotations</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.api</groupId>

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
@@ -1079,6 +1079,78 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FeatureSet$StringFieldValidation",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
     "queryAllDeclaredConstructors": true,
@@ -1142,6 +1214,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
     "queryAllDeclaredConstructors": true,

diff --git a/...grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGrpc.java b/...grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ComplianceGrpc.java
@@ -17,7 +17,7 @@ public final class ComplianceGrpc {
 
   private ComplianceGrpc() {}
 
-  public static final String SERVICE_NAME = "google.showcase.v1beta1.Compliance";
+  public static final java.lang.String SERVICE_NAME = "google.showcase.v1beta1.Compliance";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<com.google.showcase.v1beta1.RepeatRequest,
@@ -1124,9 +1124,9 @@ private static final class ComplianceFileDescriptorSupplier
   private static final class ComplianceMethodDescriptorSupplier
       extends ComplianceBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    ComplianceMethodDescriptorSupplier(String methodName) {
+    ComplianceMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }
 

diff --git a/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoGrpc.java b/showcase/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/EchoGrpc.java
@@ -21,7 +21,7 @@ public final class EchoGrpc {
 
   private EchoGrpc() {}
 
-  public static final String SERVICE_NAME = "google.showcase.v1beta1.Echo";
+  public static final java.lang.String SERVICE_NAME = "google.showcase.v1beta1.Echo";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<com.google.showcase.v1beta1.EchoRequest,
@@ -1004,9 +1004,9 @@ private static final class EchoFileDescriptorSupplier
   private static final class EchoMethodDescriptorSupplier
       extends EchoBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    EchoMethodDescriptorSupplier(String methodName) {
+    EchoMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }
 

diff --git a/...e/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/IdentityGrpc.java b/...e/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/IdentityGrpc.java
@@ -15,7 +15,7 @@ public final class IdentityGrpc {
 
   private IdentityGrpc() {}
 
-  public static final String SERVICE_NAME = "google.showcase.v1beta1.Identity";
+  public static final java.lang.String SERVICE_NAME = "google.showcase.v1beta1.Identity";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<com.google.showcase.v1beta1.CreateUserRequest,
@@ -631,9 +631,9 @@ private static final class IdentityFileDescriptorSupplier
   private static final class IdentityMethodDescriptorSupplier
       extends IdentityBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    IdentityMethodDescriptorSupplier(String methodName) {
+    IdentityMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }
 

diff --git a/.../grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/MessagingGrpc.java b/.../grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/MessagingGrpc.java
@@ -17,7 +17,7 @@ public final class MessagingGrpc {
 
   private MessagingGrpc() {}
 
-  public static final String SERVICE_NAME = "google.showcase.v1beta1.Messaging";
+  public static final java.lang.String SERVICE_NAME = "google.showcase.v1beta1.Messaging";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<com.google.showcase.v1beta1.CreateRoomRequest,
@@ -1385,9 +1385,9 @@ private static final class MessagingFileDescriptorSupplier
   private static final class MessagingMethodDescriptorSupplier
       extends MessagingBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    MessagingMethodDescriptorSupplier(String methodName) {
+    MessagingMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }
 

diff --git a/...gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceServiceGrpc.java b/...gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceServiceGrpc.java
@@ -12,7 +12,7 @@ public final class SequenceServiceGrpc {
 
   private SequenceServiceGrpc() {}
 
-  public static final String SERVICE_NAME = "google.showcase.v1beta1.SequenceService";
+  public static final java.lang.String SERVICE_NAME = "google.showcase.v1beta1.SequenceService";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<com.google.showcase.v1beta1.CreateSequenceRequest,
@@ -688,9 +688,9 @@ private static final class SequenceServiceFileDescriptorSupplier
   private static final class SequenceServiceMethodDescriptorSupplier
       extends SequenceServiceBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    SequenceServiceMethodDescriptorSupplier(String methodName) {
+    SequenceServiceMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }
 

diff --git a/...se/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestingGrpc.java b/...se/grpc-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestingGrpc.java
@@ -16,7 +16,7 @@ public final class TestingGrpc {
 
   private TestingGrpc() {}
 
-  public static final String SERVICE_NAME = "google.showcase.v1beta1.Testing";
+  public static final java.lang.String SERVICE_NAME = "google.showcase.v1beta1.Testing";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<com.google.showcase.v1beta1.CreateSessionRequest,
@@ -920,9 +920,9 @@ private static final class TestingFileDescriptorSupplier
   private static final class TestingMethodDescriptorSupplier
       extends TestingBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    TestingMethodDescriptorSupplier(String methodName) {
+    TestingMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }