Skip to content

Commit 512432c

Browse files
diegomarquezpdiegomarquezp
authored
Merge branch 'main' into fix/no-version-java-self-service
2 parents 68097f8 + 60913bc commit 512432c

587 files changed

Lines changed: 255580 additions & 16511 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/generated_files_sync.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ jobs:
175175
|grep --invert-match samples \
176176
|grep --invert-match benchmark \
177177
|grep --invert-match grafeas \
178+
|grep --invert-match '/tools/' \
178179
|grep --invert-match 'cloud-build.*v2' \
179180
|grep --invert-match 'google/monitoring/v3/DroppedLabelsOuterClass.java' \
180181
|grep --invert-match 'google/cloud/policytroubleshooter/v1/Explanations.java')

‎.kokoro/common.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ excluded_modules=(
2727
'sdk-platform-java'
2828
'sdk-platform-java/java-shared-dependencies/dependency-analyzer'
2929
'sdk-platform-java/java-shared-dependencies/dependency-convergence-check'
30-
'sdk-platform-java/java-showcase'
30+
'java-showcase'
3131
'sdk-platform-java/java-showcase-3.21.0'
3232
'sdk-platform-java/java-showcase-3.25.8'
3333
'java-spanner'

‎.kokoro/presubmit/java-pubsub-graalvm-native-presubmit.cfg‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.61.0" # {x-version-update:google-cloud-shared-dependencies:current}
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "graalvm-single"
12+
}
13+
14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "gcloud-devel"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "gcloud-devel"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_APPLICATION_CREDENTIALS"
27+
value: "secret_manager/java-it-service-account"
28+
}
29+
30+
env_vars: {
31+
key: "SECRET_MANAGER_KEYS"
32+
value: "java-it-service-account"
33+
}
34+
35+
env_vars: {
36+
key: "IT_SERVICE_ACCOUNT_EMAIL"
37+
value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
38+
}
39+
env_vars: {
40+
key: "BUILD_SUBDIR"
41+
value: "java-pubsub"
42+
}

‎.kokoro/presubmit/java-pubsub-integration.cfg‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "integration-single"
12+
}
13+
14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "gcloud-devel"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "gcloud-devel"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_APPLICATION_CREDENTIALS"
27+
value: "secret_manager/java-it-service-account"
28+
}
29+
30+
env_vars: {
31+
key: "SECRET_MANAGER_KEYS"
32+
value: "java-it-service-account"
33+
}
34+
35+
36+
env_vars: {
37+
key: "BUILD_SUBDIR"
38+
value: "java-pubsub"
39+
}

‎gapic-libraries-bom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@
535535
<dependency>
536536
<groupId>com.google.cloud</groupId>
537537
<artifactId>google-cloud-datastore-bom</artifactId>
538-
<version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
538+
<version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
539539
<type>pom</type>
540540
<scope>import</scope>
541541
</dependency>

‎generation_config.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
googleapis_commitish: 89c3153888201c9e80bc5ec78d6ffca0debe6b52
1+
googleapis_commitish: 02362883cd16428e5f57fa60ca8d8f60dafcdba7
22
libraries_bom_version: 26.80.0
33
is_monorepo: true
44
libraries:
@@ -3042,6 +3042,7 @@ libraries:
30423042
excluded_dependencies: proto-google-common-protos,grpc-google-common-protos,proto-google-common-protos-parent
30433043
excluded_poms: proto-google-common-protos-bom,proto-google-common-protos
30443044
library_type: OTHER
3045+
30453046
GAPICs:
30463047
- proto_path: google/api
30473048
- proto_path: google/apps/card/v1

‎java-aiplatform/google-cloud-aiplatform/src/main/resources/META-INF/native-image/com.google.cloud.aiplatform.v1/reflect-config.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21185,6 +21185,24 @@
2118521185
"allDeclaredClasses": true,
2118621186
"allPublicClasses": true
2118721187
},
21188+
{
21189+
"name": "com.google.cloud.aiplatform.v1.Tool$ParallelAiSearch",
21190+
"queryAllDeclaredConstructors": true,
21191+
"queryAllPublicConstructors": true,
21192+
"queryAllDeclaredMethods": true,
21193+
"allPublicMethods": true,
21194+
"allDeclaredClasses": true,
21195+
"allPublicClasses": true
21196+
},
21197+
{
21198+
"name": "com.google.cloud.aiplatform.v1.Tool$ParallelAiSearch$Builder",
21199+
"queryAllDeclaredConstructors": true,
21200+
"queryAllPublicConstructors": true,
21201+
"queryAllDeclaredMethods": true,
21202+
"allPublicMethods": true,
21203+
"allDeclaredClasses": true,
21204+
"allPublicClasses": true
21205+
},
2118821206
{
2118921207
"name": "com.google.cloud.aiplatform.v1.Tool$PhishBlockThreshold",
2119021208
"queryAllDeclaredConstructors": true,

‎java-aiplatform/google-cloud-aiplatform/src/main/resources/META-INF/native-image/com.google.cloud.aiplatform.v1beta1/reflect-config.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27008,6 +27008,24 @@
2700827008
"allDeclaredClasses": true,
2700927009
"allPublicClasses": true
2701027010
},
27011+
{
27012+
"name": "com.google.cloud.aiplatform.v1beta1.Tool$ParallelAiSearch",
27013+
"queryAllDeclaredConstructors": true,
27014+
"queryAllPublicConstructors": true,
27015+
"queryAllDeclaredMethods": true,
27016+
"allPublicMethods": true,
27017+
"allDeclaredClasses": true,
27018+
"allPublicClasses": true
27019+
},
27020+
{
27021+
"name": "com.google.cloud.aiplatform.v1beta1.Tool$ParallelAiSearch$Builder",
27022+
"queryAllDeclaredConstructors": true,
27023+
"queryAllPublicConstructors": true,
27024+
"queryAllDeclaredMethods": true,
27025+
"allPublicMethods": true,
27026+
"allDeclaredClasses": true,
27027+
"allPublicClasses": true
27028+
},
2701127029
{
2701227030
"name": "com.google.cloud.aiplatform.v1beta1.Tool$PhishBlockThreshold",
2701327031
"queryAllDeclaredConstructors": true,

‎java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/Retrieval.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public com.google.cloud.aiplatform.v1.VertexRagStoreOrBuilder getVertexRagStoreO
244244
* </code>
245245
*
246246
* @deprecated google.cloud.aiplatform.v1.Retrieval.disable_attribution is deprecated. See
247-
* google/cloud/aiplatform/v1/tool.proto;l=426
247+
* google/cloud/aiplatform/v1/tool.proto;l=463
248248
* @return The disableAttribution.
249249
*/
250250
@java.lang.Override
@@ -1121,7 +1121,7 @@ public com.google.cloud.aiplatform.v1.VertexRagStoreOrBuilder getVertexRagStoreO
11211121
* </code>
11221122
*
11231123
* @deprecated google.cloud.aiplatform.v1.Retrieval.disable_attribution is deprecated. See
1124-
* google/cloud/aiplatform/v1/tool.proto;l=426
1124+
* google/cloud/aiplatform/v1/tool.proto;l=463
11251125
* @return The disableAttribution.
11261126
*/
11271127
@java.lang.Override
@@ -1142,7 +1142,7 @@ public boolean getDisableAttribution() {
11421142
* </code>
11431143
*
11441144
* @deprecated google.cloud.aiplatform.v1.Retrieval.disable_attribution is deprecated. See
1145-
* google/cloud/aiplatform/v1/tool.proto;l=426
1145+
* google/cloud/aiplatform/v1/tool.proto;l=463
11461146
* @param value The disableAttribution to set.
11471147
* @return This builder for chaining.
11481148
*/
@@ -1167,7 +1167,7 @@ public Builder setDisableAttribution(boolean value) {
11671167
* </code>
11681168
*
11691169
* @deprecated google.cloud.aiplatform.v1.Retrieval.disable_attribution is deprecated. See
1170-
* google/cloud/aiplatform/v1/tool.proto;l=426
1170+
* google/cloud/aiplatform/v1/tool.proto;l=463
11711171
* @return This builder for chaining.
11721172
*/
11731173
@java.lang.Deprecated

‎java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/RetrievalOrBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public interface RetrievalOrBuilder
115115
* </code>
116116
*
117117
* @deprecated google.cloud.aiplatform.v1.Retrieval.disable_attribution is deprecated. See
118-
* google/cloud/aiplatform/v1/tool.proto;l=426
118+
* google/cloud/aiplatform/v1/tool.proto;l=463
119119
* @return The disableAttribution.
120120
*/
121121
@java.lang.Deprecated

0 commit comments

Comments
 (0)