Skip to content

Commit 21197b6

Browse files
jinseopkim0jinseopkim0
authored
Merge branch 'main' into release-please--branches--main
2 parents e79b5c3 + c624b89 commit 21197b6

25 files changed

+220
-86
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.40.0' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.40.0' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

‎.cloudbuild/graalvm/cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.40.0' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.0'
1919
steps:
2020
# GraalVM A build
2121
- name: gcr.io/cloud-builders/docker

‎.cloudbuild/graalvm/graalvm_a.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515

1616
ARG JAVA_SHARED_CONFIG_VERSION
1717

18-
FROM gcr.io/cloud-devrel-public-resources/graalvm_a:$JAVA_SHARED_CONFIG_VERSION
18+
FROM us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:$JAVA_SHARED_CONFIG_VERSION
1919

‎.cloudbuild/graalvm/graalvm_b.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515

1616
ARG JAVA_SHARED_CONFIG_VERSION
1717

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

‎.github/sync-repo-settings.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ branchProtectionRules:
1414
- build (17)
1515
- cla/google
1616
- compatibility
17-
- graalvm-presubmit-sdk-platform-java-a (cloud-devrel-kokoro-resources)
18-
- graalvm-presubmit-sdk-platform-java-b (cloud-devrel-kokoro-resources)
17+
- graalvm-presubmit-sdk-platform-java-a (java-graalvm-ci-prod)
18+
- graalvm-presubmit-sdk-platform-java-b (java-graalvm-ci-prod)
19+
- graalvm-presubmit-sdk-platform-java-a-downstream-kms (java-graalvm-ci-prod)
20+
- graalvm-presubmit-sdk-platform-java-b-downstream-kms (java-graalvm-ci-prod)
21+
- graalvm-presubmit-sdk-platform-java-a-downstream-kmsinventory (java-graalvm-ci-prod)
22+
- graalvm-presubmit-sdk-platform-java-b-downstream-kmsinventory (java-graalvm-ci-prod)
1923
- library_generation
2024
- library-generation-integration-tests
2125
- library-generation-lint-python

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>com.google.cloud</groupId>
1717
<artifactId>google-cloud-shared-config</artifactId>
18-
<version>1.11.3</version>
18+
<version>1.12.0</version>
1919
<relativePath/>
2020
</parent>
2121

‎gax-java/gax-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>com.google.cloud</groupId>
1313
<artifactId>google-cloud-shared-config</artifactId>
14-
<version>1.11.3</version>
14+
<version>1.12.0</version>
1515
<relativePath/>
1616
</parent>
1717

‎generation_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
googleapis_commitish: 537fd482f6bb8afb3a146d9b21673a8eb27958bd
1+
googleapis_commitish: 6b5d85c66e0885b1665040f6f80b2401f60c1068
22
# the libraries are ordered with respect to library name, which is
33
# java-{library.library_name} or java-{library.api-shortname} when
44
# library.library_name is not defined.

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

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -292,53 +292,54 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
292292
+ "alue\030\002 \001(\t:\0028\001\"A\n\013CppSettings\0222\n\006common\030"
293293
+ "\001 \001(\0132\".google.api.CommonLanguageSetting"
294294
+ "s\"A\n\013PhpSettings\0222\n\006common\030\001 \001(\0132\".googl"
295-
+ "e.api.CommonLanguageSettings\"\313\001\n\016PythonS"
295+
+ "e.api.CommonLanguageSettings\"\364\001\n\016PythonS"
296296
+ "ettings\0222\n\006common\030\001 \001(\0132\".google.api.Com"
297297
+ "monLanguageSettings\022N\n\025experimental_feat"
298298
+ "ures\030\002 \001(\0132/.google.api.PythonSettings.E"
299-
+ "xperimentalFeatures\0325\n\024ExperimentalFeatu"
300-
+ "res\022\035\n\025rest_async_io_enabled\030\001 \001(\010\"B\n\014No"
301-
+ "deSettings\0222\n\006common\030\001 \001(\0132\".google.api."
302-
+ "CommonLanguageSettings\"\252\003\n\016DotnetSetting"
303-
+ "s\0222\n\006common\030\001 \001(\0132\".google.api.CommonLan"
304-
+ "guageSettings\022I\n\020renamed_services\030\002 \003(\0132"
305-
+ "/.google.api.DotnetSettings.RenamedServi"
306-
+ "cesEntry\022K\n\021renamed_resources\030\003 \003(\01320.go"
307-
+ "ogle.api.DotnetSettings.RenamedResources"
308-
+ "Entry\022\031\n\021ignored_resources\030\004 \003(\t\022 \n\030forc"
309-
+ "ed_namespace_aliases\030\005 \003(\t\022\036\n\026handwritte"
310-
+ "n_signatures\030\006 \003(\t\0326\n\024RenamedServicesEnt"
311-
+ "ry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0327\n\025Re"
312-
+ "namedResourcesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005valu"
313-
+ "e\030\002 \001(\t:\0028\001\"B\n\014RubySettings\0222\n\006common\030\001 "
314-
+ "\001(\0132\".google.api.CommonLanguageSettings\""
315-
+ "@\n\nGoSettings\0222\n\006common\030\001 \001(\0132\".google.a"
316-
+ "pi.CommonLanguageSettings\"\317\002\n\016MethodSett"
317-
+ "ings\022\020\n\010selector\030\001 \001(\t\022<\n\014long_running\030\002"
318-
+ " \001(\0132&.google.api.MethodSettings.LongRun"
319-
+ "ning\022\035\n\025auto_populated_fields\030\003 \003(\t\032\315\001\n\013"
320-
+ "LongRunning\0225\n\022initial_poll_delay\030\001 \001(\0132"
321-
+ "\031.google.protobuf.Duration\022\035\n\025poll_delay"
322-
+ "_multiplier\030\002 \001(\002\0221\n\016max_poll_delay\030\003 \001("
323-
+ "\0132\031.google.protobuf.Duration\0225\n\022total_po"
324-
+ "ll_timeout\030\004 \001(\0132\031.google.protobuf.Durat"
325-
+ "ion\"+\n\030SelectiveGapicGeneration\022\017\n\007metho"
326-
+ "ds\030\001 \003(\t*\243\001\n\031ClientLibraryOrganization\022+"
327-
+ "\n\'CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIE"
328-
+ "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"
329-
+ "TREET_VIEW\020\004\022\014\n\010SHOPPING\020\005\022\007\n\003GEO\020\006\022\021\n\rG"
330-
+ "ENERATIVE_AI\020\007*g\n\030ClientLibraryDestinati"
331-
+ "on\022*\n&CLIENT_LIBRARY_DESTINATION_UNSPECI"
332-
+ "FIED\020\000\022\n\n\006GITHUB\020\n\022\023\n\017PACKAGE_MANAGER\020\024:"
333-
+ "9\n\020method_signature\022\036.google.protobuf.Me"
334-
+ "thodOptions\030\233\010 \003(\t:6\n\014default_host\022\037.goo"
335-
+ "gle.protobuf.ServiceOptions\030\231\010 \001(\t:6\n\014oa"
336-
+ "uth_scopes\022\037.google.protobuf.ServiceOpti"
337-
+ "ons\030\232\010 \001(\t:8\n\013api_version\022\037.google.proto"
338-
+ "buf.ServiceOptions\030\301\272\253\372\001 \001(\tBi\n\016com.goog"
339-
+ "le.apiB\013ClientProtoP\001ZAgoogle.golang.org"
340-
+ "/genproto/googleapis/api/annotations;ann"
341-
+ "otations\242\002\004GAPIb\006proto3"
299+
+ "xperimentalFeatures\032^\n\024ExperimentalFeatu"
300+
+ "res\022\035\n\025rest_async_io_enabled\030\001 \001(\010\022\'\n\037pr"
301+
+ "otobuf_pythonic_types_enabled\030\002 \001(\010\"B\n\014N"
302+
+ "odeSettings\0222\n\006common\030\001 \001(\0132\".google.api"
303+
+ ".CommonLanguageSettings\"\252\003\n\016DotnetSettin"
304+
+ "gs\0222\n\006common\030\001 \001(\0132\".google.api.CommonLa"
305+
+ "nguageSettings\022I\n\020renamed_services\030\002 \003(\013"
306+
+ "2/.google.api.DotnetSettings.RenamedServ"
307+
+ "icesEntry\022K\n\021renamed_resources\030\003 \003(\01320.g"
308+
+ "oogle.api.DotnetSettings.RenamedResource"
309+
+ "sEntry\022\031\n\021ignored_resources\030\004 \003(\t\022 \n\030for"
310+
+ "ced_namespace_aliases\030\005 \003(\t\022\036\n\026handwritt"
311+
+ "en_signatures\030\006 \003(\t\0326\n\024RenamedServicesEn"
312+
+ "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0327\n\025R"
313+
+ "enamedResourcesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val"
314+
+ "ue\030\002 \001(\t:\0028\001\"B\n\014RubySettings\0222\n\006common\030\001"
315+
+ " \001(\0132\".google.api.CommonLanguageSettings"
316+
+ "\"@\n\nGoSettings\0222\n\006common\030\001 \001(\0132\".google."
317+
+ "api.CommonLanguageSettings\"\317\002\n\016MethodSet"
318+
+ "tings\022\020\n\010selector\030\001 \001(\t\022<\n\014long_running\030"
319+
+ "\002 \001(\0132&.google.api.MethodSettings.LongRu"
320+
+ "nning\022\035\n\025auto_populated_fields\030\003 \003(\t\032\315\001\n"
321+
+ "\013LongRunning\0225\n\022initial_poll_delay\030\001 \001(\013"
322+
+ "2\031.google.protobuf.Duration\022\035\n\025poll_dela"
323+
+ "y_multiplier\030\002 \001(\002\0221\n\016max_poll_delay\030\003 \001"
324+
+ "(\0132\031.google.protobuf.Duration\0225\n\022total_p"
325+
+ "oll_timeout\030\004 \001(\0132\031.google.protobuf.Dura"
326+
+ "tion\"+\n\030SelectiveGapicGeneration\022\017\n\007meth"
327+
+ "ods\030\001 \003(\t*\243\001\n\031ClientLibraryOrganization\022"
328+
+ "+\n\'CLIENT_LIBRARY_ORGANIZATION_UNSPECIFI"
329+
+ "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"
330+
+ "STREET_VIEW\020\004\022\014\n\010SHOPPING\020\005\022\007\n\003GEO\020\006\022\021\n\r"
331+
+ "GENERATIVE_AI\020\007*g\n\030ClientLibraryDestinat"
332+
+ "ion\022*\n&CLIENT_LIBRARY_DESTINATION_UNSPEC"
333+
+ "IFIED\020\000\022\n\n\006GITHUB\020\n\022\023\n\017PACKAGE_MANAGER\020\024"
334+
+ ":9\n\020method_signature\022\036.google.protobuf.M"
335+
+ "ethodOptions\030\233\010 \003(\t:6\n\014default_host\022\037.go"
336+
+ "ogle.protobuf.ServiceOptions\030\231\010 \001(\t:6\n\014o"
337+
+ "auth_scopes\022\037.google.protobuf.ServiceOpt"
338+
+ "ions\030\232\010 \001(\t:8\n\013api_version\022\037.google.prot"
339+
+ "obuf.ServiceOptions\030\301\272\253\372\001 \001(\tBi\n\016com.goo"
340+
+ "gle.apiB\013ClientProtoP\001ZAgoogle.golang.or"
341+
+ "g/genproto/googleapis/api/annotations;an"
342+
+ "notations\242\002\004GAPIb\006proto3"
342343
};
343344
descriptor =
344345
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -433,7 +434,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
433434
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
434435
internal_static_google_api_PythonSettings_ExperimentalFeatures_descriptor,
435436
new java.lang.String[] {
436-
"RestAsyncIoEnabled",
437+
"RestAsyncIoEnabled", "ProtobufPythonicTypesEnabled",
437438
});
438439
internal_static_google_api_NodeSettings_descriptor = getDescriptor().getMessageTypes().get(7);
439440
internal_static_google_api_NodeSettings_fieldAccessorTable =

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
4444
"\n\031google/api/httpbody.proto\022\ngoogle.api\032"
4545
+ "\031google/protobuf/any.proto\"X\n\010HttpBody\022\024"
4646
+ "\n\014content_type\030\001 \001(\t\022\014\n\004data\030\002 \001(\014\022(\n\nex"
47-
+ "tensions\030\003 \003(\0132\024.google.protobuf.AnyBh\n\016"
47+
+ "tensions\030\003 \003(\0132\024.google.protobuf.AnyBe\n\016"
4848
+ "com.google.apiB\rHttpBodyProtoP\001Z;google."
4949
+ "golang.org/genproto/googleapis/api/httpb"
50-
+ "ody;httpbody\370\001\001\242\002\004GAPIb\006proto3"
50+
+ "ody;httpbody\242\002\004GAPIb\006proto3"
5151
};
5252
descriptor =
5353
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

0 commit comments

Comments
 (0)