Merge branch 'main' into chore/add-generation-config

googleapis · May 14, 2024 · c18090f · c18090f
2 parents bd7859f + a39aa07
commit c18090f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
@@ -32,7 +32,7 @@
     <gson.version>2.10.1</gson.version>
     <guava.version>33.1.0-jre</guava.version>
     <protobuf.version>3.25.3</protobuf.version>
-    <opentelemetry.version>1.37.0</opentelemetry.version>
+    <opentelemetry.version>1.38.0</opentelemetry.version>
     <maven.compiler.release>8</maven.compiler.release>
     <errorprone.version>2.27.1</errorprone.version>
     <j2objc-annotations.version>3.0.0</j2objc-annotations.version>

diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties
@@ -39,7 +39,7 @@ maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-g
 maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.37.1
 maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.23.0
 maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.23.0
-maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.37.0
+maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.38.0
 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.31.1
 maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.31.1
 maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.31.1

diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml
@@ -22,8 +22,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <site.installationModule>${project.artifactId}</site.installationModule>
-    <grpc-gcp.version>1.5.0</grpc-gcp.version>
-    <google.oauth-client.version>1.35.0</google.oauth-client.version>
+    <grpc-gcp.version>1.6.0</grpc-gcp.version>
+    <google.oauth-client.version>1.36.0</google.oauth-client.version>
     <google.api-client.version>2.4.0</google.api-client.version>
   </properties>