Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 1210f32

Browse filesBrowse files
cloud-java-botdiegomarquezp
cloud-java-bot
and
diegomarquezp
authored
chore: Update generation configuration at Fri Apr 25 02:28:52 UTC 2025 (#1822)
* chore: Update generation configuration at Wed Apr 23 17:17:24 UTC 2025 * chore: generate libraries at Wed Apr 23 17:17:54 UTC 2025 * chore: Update generation configuration at Thu Apr 24 02:28:55 UTC 2025 * chore: manually update generation configuration * chore: generate libraries at Thu Apr 24 14:55:47 UTC 2025 * chore: remove old graalvm jobs * chore: Update generation configuration at Fri Apr 25 02:28:52 UTC 2025 * chore: restore custom files --------- Co-authored-by: Diego Marquez <diegomarquezp@google.com>
1 parent 5c736fa commit 1210f32
Copy full SHA for 1210f32

File tree

164 files changed

+3987
-502
lines changed
Filter options

Some content is hidden

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

164 files changed

+3987
-502
lines changed

‎.github/generated-files-bot.yml

Copy file name to clipboardExpand all lines: .github/generated-files-bot.yml
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ externalManifests:
66
file: '.github/readme/synth.metadata/synth.metadata'
77
jsonpath: '$.generatedFiles[*]'
88
ignoreAuthors:
9+
- 'cloud-java-bot'
910
- 'renovate-bot'
1011
- 'yoshi-automation'
1112
- 'release-please[bot]'

‎.github/scripts/update_generation_config.sh

Copy file name to clipboardExpand all lines: .github/scripts/update_generation_config.sh
+9-2Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,15 @@ set -e
1515
function get_latest_released_version() {
1616
local group_id=$1
1717
local artifact_id=$2
18-
latest=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json" | jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' | sort -V | tail -n 1)
19-
echo "${latest}"
18+
json_content=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json")
19+
latest=$(jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' <<< "${json_content}" | sort -V | tail -n 1)
20+
if [[ -z "${latest}" ]]; then
21+
echo "The latest version of ${group_id}:${artifact_id} is empty."
22+
echo "The returned json from maven.org is invalid: ${json_content}"
23+
exit 1
24+
else
25+
echo "${latest}"
26+
fi
2027
}
2128

2229
# Update a key to a new value in the generation config.

‎.github/sync-repo-settings.yaml

Copy file name to clipboardExpand all lines: .github/sync-repo-settings.yaml
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ branchProtectionRules:
1515
- units (11)
1616
- 'Kokoro - Test: Integration'
1717
- cla/google
18-
- 'Kokoro - Test: Java GraalVM Native Image'
19-
- 'Kokoro - Test: Java 17 GraalVM Native Image'
18+
- 'Kokoro - Test: Java GraalVM Native Image A'
19+
- 'Kokoro - Test: Java GraalVM Native Image B'
20+
- 'Kokoro - Test: Java GraalVM Native Image C'
2021
- javadoc
2122
- library_generation
2223
- unmanaged_dependency_check

‎.github/workflows/ci.yaml

Copy file name to clipboardExpand all lines: .github/workflows/ci.yaml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
- uses: actions/setup-java@v4
113113
with:
114114
distribution: temurin
115-
java-version: 11
115+
java-version: 17
116116
- run: java -version
117117
- run: .kokoro/build.sh
118118
env:

‎.github/workflows/hermetic_library_generation.yaml

Copy file name to clipboardExpand all lines: .github/workflows/hermetic_library_generation.yaml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
fetch-depth: 0
3939
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
40-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.55.1
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.56.2
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

‎.github/workflows/renovate_config_check.yaml

Copy file name to clipboardExpand all lines: .github/workflows/renovate_config_check.yaml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
renovate_bot_config_validation:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111

1212
steps:
1313
- name: Checkout code
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Node.js
1717
uses: actions/setup-node@v4
1818
with:
19-
node-version: '20'
19+
node-version: '22'
2020

2121
- name: Install Renovate and Config Validator
2222
run: |

‎.github/workflows/samples.yaml

Copy file name to clipboardExpand all lines: .github/workflows/samples.yaml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/setup-java@v4
2525
with:
2626
distribution: temurin
27-
java-version: 8
27+
java-version: 17
2828
- name: Run checkstyle
2929
run: mvn -P lint --quiet --batch-mode checkstyle:check
3030
working-directory: samples/snippets

‎.github/workflows/update_generation_config.yaml

Copy file name to clipboardExpand all lines: .github/workflows/update_generation_config.yaml
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ on:
2121

2222
jobs:
2323
update-generation-config:
24-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-24.04
2525
env:
2626
# the branch into which the pull request is merged
2727
base_branch: main
2828
steps:
2929
- uses: actions/checkout@v4
3030
with:
31+
fetch-depth: 0
3132
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
3233
- name: Update params in generation config to latest
3334
shell: bash
@@ -36,7 +37,8 @@ jobs:
3637
[ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com"
3738
[ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
3839
bash .github/scripts/update_generation_config.sh \
39-
--base_branch "${base_branch}"\
40+
--base_branch "${base_branch}" \
4041
--repo ${{ github.repository }}
4142
env:
4243
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
44+

‎.kokoro/build.sh

Copy file name to clipboardExpand all lines: .kokoro/build.sh
+12-12Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/bash
2-
# Copyright 2019 Google LLC
2+
# Copyright 2025 Google LLC
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
66
# You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# https://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -42,21 +42,22 @@ if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTI
4242
export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS})
4343
fi
4444

45+
4546
RETURN_CODE=0
4647
set +e
4748

4849
case ${JOB_TYPE} in
4950
test)
5051
echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
51-
mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
52+
mvn test -B -ntp -Dfmt.skip=true -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
5253
RETURN_CODE=$?
5354
;;
5455
lint)
55-
mvn com.coveo:fmt-maven-plugin:check -B -ntp
56+
mvn com.spotify.fmt:fmt-maven-plugin:check -B -ntp
5657
RETURN_CODE=$?
5758
;;
5859
javadoc)
59-
mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
60+
mvn javadoc:javadoc javadoc:test-javadoc -B -ntp -Dfmt.skip=true
6061
RETURN_CODE=$?
6162
;;
6263
integration)
@@ -78,18 +79,16 @@ integration)
7879
-DtrimStackTrace=false \
7980
-Dclirr.skip=true \
8081
-Denforcer.skip=true \
82+
-Dcheckstyle.skip=true \
83+
-DskipUnitTests=true \
84+
-Dfmt.skip=true \
8185
-fae \
8286
verify
8387
RETURN_CODE=$?
8488
;;
8589
graalvm)
8690
# Run Unit and Integration Tests with Native Image
87-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
88-
RETURN_CODE=$?
89-
;;
90-
graalvm17)
91-
# Run Unit and Integration Tests with Native Image
92-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
91+
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test -Dfmt.skip=true
9392
RETURN_CODE=$?
9493
;;
9594
samples)
@@ -113,6 +112,7 @@ samples)
113112
-DtrimStackTrace=false \
114113
-Dclirr.skip=true \
115114
-Denforcer.skip=true \
115+
-Dfmt.skip=true \
116116
-fae \
117117
verify
118118
RETURN_CODE=$?
@@ -122,7 +122,7 @@ samples)
122122
fi
123123
;;
124124
clirr)
125-
mvn -B -ntp -Denforcer.skip=true clirr:check
125+
mvn -B -ntp -Dfmt.skip=true -Denforcer.skip=true clirr:check
126126
RETURN_CODE=$?
127127
;;
128128
*)

‎.kokoro/presubmit/graalvm-native.cfg renamed to ‎.kokoro/presubmit/graalvm-native-a.cfg

Copy file name to clipboardExpand all lines: .kokoro/presubmit/graalvm-native-a.cfg
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.45.1"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {
@@ -33,6 +33,6 @@ env_vars: {
3333
}
3434

3535
env_vars: {
36-
key: "DATASTORE_PROJECT_ID"
37-
value: "gcloud-devel"
36+
key: "IT_SERVICE_ACCOUNT_EMAIL"
37+
value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
3838
}

‎.kokoro/presubmit/graalvm-native-17.cfg renamed to ‎.kokoro/presubmit/graalvm-native-b.cfg

Copy file name to clipboardExpand all lines: .kokoro/presubmit/graalvm-native-b.cfg
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.45.1"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {
1010
key: "JOB_TYPE"
11-
value: "graalvm17"
11+
value: "graalvm"
1212
}
1313

1414
# TODO: remove this after we've migrated all tests and scripts
@@ -33,6 +33,6 @@ env_vars: {
3333
}
3434

3535
env_vars: {
36-
key: "DATASTORE_PROJECT_ID"
37-
value: "gcloud-devel"
36+
key: "IT_SERVICE_ACCOUNT_EMAIL"
37+
value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
3838
}

‎.kokoro/presubmit/graalvm-native-c.cfg

Copy file name to clipboard
+38Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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_c:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "graalvm"
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+
}

‎CONTRIBUTING.md

Copy file name to clipboardExpand all lines: CONTRIBUTING.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Code in this repo is formatted with
8484
[google-java-format](https://github.com/google/google-java-format).
8585
To run formatting on your project, you can run:
8686
```
87-
mvn com.coveo:fmt-maven-plugin:format
87+
mvn com.spotify.fmt:fmt-maven-plugin:format
8888
```
8989

9090
[1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account

‎README.md

Copy file name to clipboardExpand all lines: README.md
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
1919
<dependency>
2020
<groupId>com.google.cloud</groupId>
2121
<artifactId>libraries-bom</artifactId>
22-
<version>26.56.0</version>
22+
<version>26.59.0</version>
2323
<type>pom</type>
2424
<scope>import</scope>
2525
</dependency>
@@ -41,15 +41,15 @@ If you are using Maven without the BOM, add this to your dependencies:
4141
<dependency>
4242
<groupId>com.google.cloud</groupId>
4343
<artifactId>google-cloud-datastore</artifactId>
44-
<version>2.26.4</version>
44+
<version>2.27.0</version>
4545
</dependency>
4646

4747
```
4848

4949
If you are using Gradle 5.x or later, add this to your dependencies:
5050

5151
```Groovy
52-
implementation platform('com.google.cloud:libraries-bom:26.57.0')
52+
implementation platform('com.google.cloud:libraries-bom:26.59.0')
5353
5454
implementation 'com.google.cloud:google-cloud-datastore'
5555
```

‎datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java

Copy file name to clipboardExpand all lines: datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ public synchronized File getProjectDirectory() {
262262
static class StartupMonitor extends Thread {
263263
private final InputStream inputStream;
264264
private volatile boolean success = false;
265+
265266
/** This latch will reach 0 once server startup has completed. */
266267
private final CountDownLatch startupCompleteLatch = new CountDownLatch(1);
267268

‎datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java

Copy file name to clipboardExpand all lines: datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java
+6-2Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,16 @@ public DatastoreException(String methodName, Code code, String message, Throwabl
2828
this.code = code;
2929
}
3030

31-
/** @return the canonical error code */
31+
/**
32+
* @return the canonical error code
33+
*/
3234
public Code getCode() {
3335
return code;
3436
}
3537

36-
/** @return the datastore method name */
38+
/**
39+
* @return the datastore method name
40+
*/
3741
public String getMethodName() {
3842
return methodName;
3943
}

‎datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java

Copy file name to clipboardExpand all lines: datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,9 @@ private static void setProjectEndpointFromEnv(DatastoreOptions.Builder options)
336336
return;
337337
}
338338

339-
/** @see #getOptionsFromEnv() */
339+
/**
340+
* @see #getOptionsFromEnv()
341+
*/
340342
public static Datastore getDatastoreFromEnv() throws GeneralSecurityException, IOException {
341343
return DatastoreFactory.get().create(getOptionsFromEnv().build());
342344
}

‎datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java

Copy file name to clipboardExpand all lines: datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
class EndToEndChecksumHandler {
2525
/** The checksum http header on http requests */
2626
static final String HTTP_REQUEST_CHECKSUM_HEADER = "x-request-checksum-348659783";
27+
2728
/** The checksum http header on http responses */
2829
static final String HTTP_RESPONSE_CHECKSUM_HEADER = "x-response-checksum-348659783";
2930

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.