Merge branch 'main' into release-please--branches--main

.cloudbuild/graalvm/cloudbuild-test-a-downstream-kms.yaml

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.11.3'
+  _JAVA_SHARED_CONFIG_VERSION: '1.12.0'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY

.cloudbuild/graalvm/cloudbuild-test-a-downstream-kmsinventory.yaml

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.11.3'
+  _JAVA_SHARED_CONFIG_VERSION: '1.12.0'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY

.cloudbuild/graalvm/cloudbuild-test-a.yaml

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.40.0' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.11.3'
+  _JAVA_SHARED_CONFIG_VERSION: '1.12.0'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY

.cloudbuild/graalvm/cloudbuild-test-b-downstream-kms.yaml

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.11.3'
+  _JAVA_SHARED_CONFIG_VERSION: '1.12.0'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY

.cloudbuild/graalvm/cloudbuild-test-b-downstream-kmsinventory.yaml

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.11.3'
+  _JAVA_SHARED_CONFIG_VERSION: '1.12.0'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY

.cloudbuild/graalvm/cloudbuild-test-b.yaml

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.40.0' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.11.3'
+  _JAVA_SHARED_CONFIG_VERSION: '1.12.0'
 options:
   machineType: 'E2_HIGHCPU_8'
   logging: CLOUD_LOGGING_ONLY

.cloudbuild/graalvm/cloudbuild.yaml

@@ -15,7 +15,7 @@
 timeout: 7200s # 2 hours
 substitutions:
   _SHARED_DEPENDENCIES_VERSION: '3.40.0' # {x-version-update:google-cloud-shared-dependencies:current}
-  _JAVA_SHARED_CONFIG_VERSION: '1.11.3'
+  _JAVA_SHARED_CONFIG_VERSION: '1.12.0'
 steps:
   # GraalVM A build
   - name: gcr.io/cloud-builders/docker

.cloudbuild/graalvm/graalvm_a.Dockerfile

@@ -15,5 +15,5 @@
 
 ARG JAVA_SHARED_CONFIG_VERSION
 
-FROM gcr.io/cloud-devrel-public-resources/graalvm_a:$JAVA_SHARED_CONFIG_VERSION
+FROM us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:$JAVA_SHARED_CONFIG_VERSION
 

.cloudbuild/graalvm/graalvm_b.Dockerfile

@@ -15,4 +15,4 @@
 
 ARG JAVA_SHARED_CONFIG_VERSION
 
-FROM gcr.io/cloud-devrel-public-resources/graalvm_b:$JAVA_SHARED_CONFIG_VERSION
+FROM us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:$JAVA_SHARED_CONFIG_VERSION

.github/sync-repo-settings.yaml

@@ -14,8 +14,12 @@ branchProtectionRules:
   - build (17)
   - cla/google
   - compatibility
-  - graalvm-presubmit-sdk-platform-java-a (cloud-devrel-kokoro-resources)
-  - graalvm-presubmit-sdk-platform-java-b (cloud-devrel-kokoro-resources)
+  - graalvm-presubmit-sdk-platform-java-a (java-graalvm-ci-prod)
+  - graalvm-presubmit-sdk-platform-java-b (java-graalvm-ci-prod)
+  - graalvm-presubmit-sdk-platform-java-a-downstream-kms (java-graalvm-ci-prod)
+  - graalvm-presubmit-sdk-platform-java-b-downstream-kms (java-graalvm-ci-prod)
+  - graalvm-presubmit-sdk-platform-java-a-downstream-kmsinventory (java-graalvm-ci-prod)
+  - graalvm-presubmit-sdk-platform-java-b-downstream-kmsinventory (java-graalvm-ci-prod)
   - library_generation
   - library-generation-integration-tests
   - library-generation-lint-python

gapic-generator-java-pom-parent/pom.xml

@@ -15,7 +15,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.11.3</version>
+    <version>1.12.0</version>
     <relativePath/>
   </parent>
 

gax-java/gax-bom/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.11.3</version>
+    <version>1.12.0</version>
     <relativePath/>
   </parent>
 

generation_config.yaml

@@ -1,4 +1,4 @@
-googleapis_commitish: 537fd482f6bb8afb3a146d9b21673a8eb27958bd
+googleapis_commitish: 6b5d85c66e0885b1665040f6f80b2401f60c1068
 # the libraries are ordered with respect to library name, which is
 # java-{library.library_name} or java-{library.api-shortname} when
 # library.library_name is not defined.

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java

@@ -292,53 +292,54 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "alue\030\002 \001(\t:\0028\001\"A\n\013CppSettings\0222\n\006common\030"
           + "\001 \001(\0132\".google.api.CommonLanguageSetting"
           + "s\"A\n\013PhpSettings\0222\n\006common\030\001 \001(\0132\".googl"
-          + "e.api.CommonLanguageSettings\"\313\001\n\016PythonS"
+          + "e.api.CommonLanguageSettings\"\364\001\n\016PythonS"
           + "ettings\0222\n\006common\030\001 \001(\0132\".google.api.Com"
           + "monLanguageSettings\022N\n\025experimental_feat"
           + "ures\030\002 \001(\0132/.google.api.PythonSettings.E"
-          + "xperimentalFeatures\0325\n\024ExperimentalFeatu"
-          + "res\022\035\n\025rest_async_io_enabled\030\001 \001(\010\"B\n\014No"
-          + "deSettings\0222\n\006common\030\001 \001(\0132\".google.api."
-          + "CommonLanguageSettings\"\252\003\n\016DotnetSetting"
-          + "s\0222\n\006common\030\001 \001(\0132\".google.api.CommonLan"
-          + "guageSettings\022I\n\020renamed_services\030\002 \003(\0132"
-          + "/.google.api.DotnetSettings.RenamedServi"
-          + "cesEntry\022K\n\021renamed_resources\030\003 \003(\01320.go"
-          + "ogle.api.DotnetSettings.RenamedResources"
-          + "Entry\022\031\n\021ignored_resources\030\004 \003(\t\022 \n\030forc"
-          + "ed_namespace_aliases\030\005 \003(\t\022\036\n\026handwritte"
-          + "n_signatures\030\006 \003(\t\0326\n\024RenamedServicesEnt"
-          + "ry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0327\n\025Re"
-          + "namedResourcesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005valu"
-          + "e\030\002 \001(\t:\0028\001\"B\n\014RubySettings\0222\n\006common\030\001 "
-          + "\001(\0132\".google.api.CommonLanguageSettings\""
-          + "@\n\nGoSettings\0222\n\006common\030\001 \001(\0132\".google.a"
-          + "pi.CommonLanguageSettings\"\317\002\n\016MethodSett"
-          + "ings\022\020\n\010selector\030\001 \001(\t\022<\n\014long_running\030\002"
-          + " \001(\0132&.google.api.MethodSettings.LongRun"
-          + "ning\022\035\n\025auto_populated_fields\030\003 \003(\t\032\315\001\n\013"
-          + "LongRunning\0225\n\022initial_poll_delay\030\001 \001(\0132"
-          + "\031.google.protobuf.Duration\022\035\n\025poll_delay"
-          + "_multiplier\030\002 \001(\002\0221\n\016max_poll_delay\030\003 \001("
-          + "\0132\031.google.protobuf.Duration\0225\n\022total_po"
-          + "ll_timeout\030\004 \001(\0132\031.google.protobuf.Durat"
-          + "ion\"+\n\030SelectiveGapicGeneration\022\017\n\007metho"
-          + "ds\030\001 \003(\t*\243\001\n\031ClientLibraryOrganization\022+"
-          + "\n\'CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIE"
-          + "D\020\000\022\t\n\005CLOUD\020\001\022\007\n\003ADS\020\002\022\n\n\006PHOTOS\020\003\022\017\n\013S"
-          + "TREET_VIEW\020\004\022\014\n\010SHOPPING\020\005\022\007\n\003GEO\020\006\022\021\n\rG"
-          + "ENERATIVE_AI\020\007*g\n\030ClientLibraryDestinati"
-          + "on\022*\n&CLIENT_LIBRARY_DESTINATION_UNSPECI"
-          + "FIED\020\000\022\n\n\006GITHUB\020\n\022\023\n\017PACKAGE_MANAGER\020\024:"
-          + "9\n\020method_signature\022\036.google.protobuf.Me"
-          + "thodOptions\030\233\010 \003(\t:6\n\014default_host\022\037.goo"
-          + "gle.protobuf.ServiceOptions\030\231\010 \001(\t:6\n\014oa"
-          + "uth_scopes\022\037.google.protobuf.ServiceOpti"
-          + "ons\030\232\010 \001(\t:8\n\013api_version\022\037.google.proto"
-          + "buf.ServiceOptions\030\301\272\253\372\001 \001(\tBi\n\016com.goog"
-          + "le.apiB\013ClientProtoP\001ZAgoogle.golang.org"
-          + "/genproto/googleapis/api/annotations;ann"
-          + "otations\242\002\004GAPIb\006proto3"
+          + "xperimentalFeatures\032^\n\024ExperimentalFeatu"
+          + "res\022\035\n\025rest_async_io_enabled\030\001 \001(\010\022\'\n\037pr"
+          + "otobuf_pythonic_types_enabled\030\002 \001(\010\"B\n\014N"
+          + "odeSettings\0222\n\006common\030\001 \001(\0132\".google.api"
+          + ".CommonLanguageSettings\"\252\003\n\016DotnetSettin"
+          + "gs\0222\n\006common\030\001 \001(\0132\".google.api.CommonLa"
+          + "nguageSettings\022I\n\020renamed_services\030\002 \003(\013"
+          + "2/.google.api.DotnetSettings.RenamedServ"
+          + "icesEntry\022K\n\021renamed_resources\030\003 \003(\01320.g"
+          + "oogle.api.DotnetSettings.RenamedResource"
+          + "sEntry\022\031\n\021ignored_resources\030\004 \003(\t\022 \n\030for"
+          + "ced_namespace_aliases\030\005 \003(\t\022\036\n\026handwritt"
+          + "en_signatures\030\006 \003(\t\0326\n\024RenamedServicesEn"
+          + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0327\n\025R"
+          + "enamedResourcesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val"
+          + "ue\030\002 \001(\t:\0028\001\"B\n\014RubySettings\0222\n\006common\030\001"
+          + " \001(\0132\".google.api.CommonLanguageSettings"
+          + "\"@\n\nGoSettings\0222\n\006common\030\001 \001(\0132\".google."
+          + "api.CommonLanguageSettings\"\317\002\n\016MethodSet"
+          + "tings\022\020\n\010selector\030\001 \001(\t\022<\n\014long_running\030"
+          + "\002 \001(\0132&.google.api.MethodSettings.LongRu"
+          + "nning\022\035\n\025auto_populated_fields\030\003 \003(\t\032\315\001\n"
+          + "\013LongRunning\0225\n\022initial_poll_delay\030\001 \001(\013"
+          + "2\031.google.protobuf.Duration\022\035\n\025poll_dela"
+          + "y_multiplier\030\002 \001(\002\0221\n\016max_poll_delay\030\003 \001"
+          + "(\0132\031.google.protobuf.Duration\0225\n\022total_p"
+          + "oll_timeout\030\004 \001(\0132\031.google.protobuf.Dura"
+          + "tion\"+\n\030SelectiveGapicGeneration\022\017\n\007meth"
+          + "ods\030\001 \003(\t*\243\001\n\031ClientLibraryOrganization\022"
+          + "+\n\'CLIENT_LIBRARY_ORGANIZATION_UNSPECIFI"
+          + "ED\020\000\022\t\n\005CLOUD\020\001\022\007\n\003ADS\020\002\022\n\n\006PHOTOS\020\003\022\017\n\013"
+          + "STREET_VIEW\020\004\022\014\n\010SHOPPING\020\005\022\007\n\003GEO\020\006\022\021\n\r"
+          + "GENERATIVE_AI\020\007*g\n\030ClientLibraryDestinat"
+          + "ion\022*\n&CLIENT_LIBRARY_DESTINATION_UNSPEC"
+          + "IFIED\020\000\022\n\n\006GITHUB\020\n\022\023\n\017PACKAGE_MANAGER\020\024"
+          + ":9\n\020method_signature\022\036.google.protobuf.M"
+          + "ethodOptions\030\233\010 \003(\t:6\n\014default_host\022\037.go"
+          + "ogle.protobuf.ServiceOptions\030\231\010 \001(\t:6\n\014o"
+          + "auth_scopes\022\037.google.protobuf.ServiceOpt"
+          + "ions\030\232\010 \001(\t:8\n\013api_version\022\037.google.prot"
+          + "obuf.ServiceOptions\030\301\272\253\372\001 \001(\tBi\n\016com.goo"
+          + "gle.apiB\013ClientProtoP\001ZAgoogle.golang.or"
+          + "g/genproto/googleapis/api/annotations;an"
+          + "notations\242\002\004GAPIb\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -433,7 +434,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_api_PythonSettings_ExperimentalFeatures_descriptor,
             new java.lang.String[] {
-              "RestAsyncIoEnabled",
+              "RestAsyncIoEnabled", "ProtobufPythonicTypesEnabled",
             });
     internal_static_google_api_NodeSettings_descriptor = getDescriptor().getMessageTypes().get(7);
     internal_static_google_api_NodeSettings_fieldAccessorTable =

java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBodyProto.java

@@ -44,10 +44,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
       "\n\031google/api/httpbody.proto\022\ngoogle.api\032"
           + "\031google/protobuf/any.proto\"X\n\010HttpBody\022\024"
           + "\n\014content_type\030\001 \001(\t\022\014\n\004data\030\002 \001(\014\022(\n\nex"
-          + "tensions\030\003 \003(\0132\024.google.protobuf.AnyBh\n\016"
+          + "tensions\030\003 \003(\0132\024.google.protobuf.AnyBe\n\016"
           + "com.google.apiB\rHttpBodyProtoP\001Z;google."
           + "golang.org/genproto/googleapis/api/httpb"
-          + "ody;httpbody\370\001\001\242\002\004GAPIb\006proto3"
+          + "ody;httpbody\242\002\004GAPIb\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(