Merge branch 'main' into renovate/google-http-client-dependencies

googleapis · May 30, 2024 · 7d06cc1 · 7d06cc1
2 parents c83910d + 91f3254
commit 7d06cc1
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 48 deletions.
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
@@ -29,7 +29,7 @@
     <grpc.version>1.62.2</grpc.version>
     <google.auth.version>1.23.0</google.auth.version>
     <google.http-client.version>1.44.2</google.http-client.version>
-    <gson.version>2.10.1</gson.version>
+    <gson.version>2.11.0</gson.version>
     <guava.version>33.1.0-jre</guava.version>
     <protobuf.version>3.25.3</protobuf.version>
     <opentelemetry.version>1.38.0</opentelemetry.version>

diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties
@@ -44,20 +44,20 @@ 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
 maven.io_netty_netty_tcnative_boringssl_static=io.netty:netty-tcnative-boringssl-static:2.0.65.Final
-maven.io_netty_netty_handler=io.netty:netty-handler:4.1.109.Final
-maven.io_netty_netty_common=io.netty:netty-common:4.1.109.Final
-maven.io_netty_netty_codec_socks=io.netty:netty-codec-socks:4.1.109.Final
-maven.io_netty_netty_codec_http2=io.netty:netty-codec-http2:4.1.109.Final
-maven.io_netty_netty_codec_http=io.netty:netty-codec-http:4.1.109.Final
-maven.io_netty_netty_codec=io.netty:netty-codec:4.1.109.Final
-maven.io_netty_netty_buffer=io.netty:netty-buffer:4.1.109.Final
-maven.io_netty_netty_resolver=io.netty:netty-resolver:4.1.109.Final
-maven.io_netty_netty_transport=io.netty:netty-transport:4.1.109.Final
-maven.io_netty_netty_handler_proxy=io.netty:netty-handler-proxy:4.1.109.Final
-maven.io_netty_netty_transport_native_unix_common=io.netty:netty-transport-native-unix-common:4.1.109.Final
+maven.io_netty_netty_handler=io.netty:netty-handler:4.1.110.Final
+maven.io_netty_netty_common=io.netty:netty-common:4.1.110.Final
+maven.io_netty_netty_codec_socks=io.netty:netty-codec-socks:4.1.110.Final
+maven.io_netty_netty_codec_http2=io.netty:netty-codec-http2:4.1.110.Final
+maven.io_netty_netty_codec_http=io.netty:netty-codec-http:4.1.110.Final
+maven.io_netty_netty_codec=io.netty:netty-codec:4.1.110.Final
+maven.io_netty_netty_buffer=io.netty:netty-buffer:4.1.110.Final
+maven.io_netty_netty_resolver=io.netty:netty-resolver:4.1.110.Final
+maven.io_netty_netty_transport=io.netty:netty-transport:4.1.110.Final
+maven.io_netty_netty_handler_proxy=io.netty:netty-handler-proxy:4.1.110.Final
+maven.io_netty_netty_transport_native_unix_common=io.netty:netty-transport-native-unix-common:4.1.110.Final
 maven.io_perfmark_perfmark_api=io.perfmark:perfmark-api:0.27.0
 maven.org_apache_tomcat_annotations_api=org.apache.tomcat:annotations-api:6.0.53
-maven.com_google_code_gson_gson=com.google.code.gson:gson:2.10.1
+maven.com_google_code_gson_gson=com.google.code.gson:gson:2.11.0
 maven.com_google_guava_guava=com.google.guava:guava:32.1.3-jre
 maven.com_google_guava_failureaccess=com.google.guava:failureaccess:1.0.2
 maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.14.0

diff --git a/java-shared-dependencies/dependency-analyzer/pom.xml b/java-shared-dependencies/dependency-analyzer/pom.xml
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.10.1</version>
+      <version>2.11.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

diff --git a/library_generation/requirements.txt b/library_generation/requirements.txt
@@ -16,4 +16,4 @@ smmap==5.0.1
 typing==3.7.4.3
 parameterized==0.9.0 # used in parameterized test
 colorlog==6.8.2
-watchdog==4.0.0
+watchdog==4.0.1