Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e51f95e

Browse files
rahul2393rahul2393
authoredDec 13, 2024··
Merge branch 'main' into renovate/io.opentelemetry-opentelemetry-bom-1.x
2 parents dd7f025 + 41f83dc commit e51f95e

File tree

27 files changed

+156
-98
lines changed

27 files changed

+156
-98
lines changed
 

Diff for: ‎.github/scripts/update_generation_config.sh

+55-8
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,23 @@ function update_config() {
2828
sed -i -e "s/^${key_word}.*$/${key_word}: ${new_value}/" "${file}"
2929
}
3030

31+
# Update an action to a new version in GitHub action.
32+
function update_action() {
33+
local key_word=$1
34+
local new_value=$2
35+
local file=$3
36+
echo "Update ${key_word} to ${new_value} in ${file}"
37+
# use a different delimiter because the key_word contains "/".
38+
sed -i -e "s|${key_word}@v.*$|${key_word}@v${new_value}|" "${file}"
39+
}
40+
3141
# The parameters of this script is:
3242
# 1. base_branch, the base branch of the result pull request.
3343
# 2. repo, organization/repo-name, e.g., googleapis/google-cloud-java
3444
# 3. [optional] generation_config, the path to the generation configuration,
3545
# the default value is generation_config.yaml in the repository root.
46+
# 4. [optional] workflow, the library generation workflow file,
47+
# the default value is .github/workflows/hermetic_library_generation.yaml.
3648
while [[ $# -gt 0 ]]; do
3749
key="$1"
3850
case "${key}" in
@@ -48,6 +60,10 @@ case "${key}" in
4860
generation_config="$2"
4961
shift
5062
;;
63+
--workflow)
64+
workflow="$2"
65+
shift
66+
;;
5167
*)
5268
echo "Invalid option: [$1]"
5369
exit 1
@@ -71,21 +87,34 @@ if [ -z "${generation_config}" ]; then
7187
echo "Use default generation config: ${generation_config}"
7288
fi
7389

90+
if [ -z "${workflow}" ]; then
91+
workflow=".github/workflows/hermetic_library_generation.yaml"
92+
echo "Use default library generation workflow file: ${workflow}"
93+
fi
94+
7495
current_branch="generate-libraries-${base_branch}"
7596
title="chore: Update generation configuration at $(date)"
7697

77-
# try to find a open pull request associated with the branch
98+
git checkout "${base_branch}"
99+
# Try to find a open pull request associated with the branch
78100
pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number")
79-
# create a branch if there's no open pull request associated with the
101+
# Create a branch if there's no open pull request associated with the
80102
# branch; otherwise checkout the pull request.
81103
if [ -z "${pr_num}" ]; then
82104
git checkout -b "${current_branch}"
105+
# Push the current branch to remote so that we can
106+
# compare the commits later.
107+
git push -u origin "${current_branch}"
83108
else
84109
gh pr checkout "${pr_num}"
85110
fi
86111

112+
# Only allow fast-forward merging; exit with non-zero result if there's merging
113+
# conflict.
114+
git merge -m "chore: merge ${base_branch} into ${current_branch}" "${base_branch}"
115+
87116
mkdir tmp-googleapis
88-
# use partial clone because only commit history is needed.
117+
# Use partial clone because only commit history is needed.
89118
git clone --filter=blob:none https://github.com/googleapis/googleapis.git tmp-googleapis
90119
pushd tmp-googleapis
91120
git pull
@@ -94,25 +123,43 @@ popd
94123
rm -rf tmp-googleapis
95124
update_config "googleapis_commitish" "${latest_commit}" "${generation_config}"
96125

97-
# update gapic-generator-java version to the latest
126+
# Update gapic-generator-java version to the latest
98127
latest_version=$(get_latest_released_version "com.google.api" "gapic-generator-java")
99128
update_config "gapic_generator_version" "${latest_version}" "${generation_config}"
100129

101-
# update libraries-bom version to the latest
130+
# Update composite action version to latest gapic-generator-java version
131+
update_action "googleapis/sdk-platform-java/.github/scripts" \
132+
"${latest_version}" \
133+
"${workflow}"
134+
135+
# Update libraries-bom version to the latest
102136
latest_version=$(get_latest_released_version "com.google.cloud" "libraries-bom")
103137
update_config "libraries_bom_version" "${latest_version}" "${generation_config}"
104138

105-
git add "${generation_config}"
139+
git add "${generation_config}" "${workflow}"
106140
changed_files=$(git diff --cached --name-only)
107141
if [[ "${changed_files}" == "" ]]; then
108142
echo "The latest generation config is not changed."
109143
echo "Skip committing to the pull request."
144+
else
145+
git commit -m "${title}"
146+
fi
147+
148+
# There are potentially at most two commits: merge commit and change commit.
149+
# We want to exit the script if no commit happens (otherwise this will be an
150+
# infinite loop).
151+
# `git cherry` is a way to find whether the local branch has commits that are
152+
# not in the remote branch.
153+
# If we find any such commit, push them to remote branch.
154+
unpushed_commit=$(git cherry -v "origin/${current_branch}" | wc -l)
155+
if [[ "${unpushed_commit}" -eq 0 ]]; then
156+
echo "No unpushed commits, exit"
110157
exit 0
111158
fi
112-
git commit -m "${title}"
159+
113160
if [ -z "${pr_num}" ]; then
114161
git remote add remote_repo https://cloud-java-bot:"${GH_TOKEN}@github.com/${repo}.git"
115-
git fetch -q --unshallow remote_repo
162+
git fetch -q remote_repo
116163
git push -f remote_repo "${current_branch}"
117164
gh pr create --title "${title}" --head "${current_branch}" --body "${title}" --base "${base_branch}"
118165
else

Diff for: ‎.github/workflows/hermetic_library_generation.yaml

+1-1
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.50.0
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.51.0
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

Diff for: ‎.github/workflows/unmanaged_dependency_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
# repository
1818
.kokoro/build.sh
1919
- name: Unmanaged dependency check
20-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.40.0
20+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.41.0
2121
with:
2222
bom-path: google-cloud-spanner-bom/pom.xml

Diff for: ‎.kokoro/presubmit/graalvm-native-17.cfg

+1-1
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_b:3.40.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.41.0"
77
}
88

99
env_vars: {

Diff for: ‎.kokoro/presubmit/graalvm-native.cfg

+1-1
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.40.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.41.0"
77
}
88

99
env_vars: {

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
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.50.0')
52+
implementation platform('com.google.cloud:libraries-bom:26.51.0')
5353
5454
implementation 'com.google.cloud:google-cloud-spanner'
5555
```

Diff for: ‎benchmarks/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>com.google.cloud</groupId>
2626
<artifactId>google-cloud-spanner-parent</artifactId>
27-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
27+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
2828
</parent>
2929

3030
<properties>

Diff for: ‎generation_config.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
gapic_generator_version: 2.50.0
2-
googleapis_commitish: 349841abac6c3e580ccce6e3d6fcc182ed2512c2
3-
libraries_bom_version: 26.50.0
1+
gapic_generator_version: 2.51.0
2+
googleapis_commitish: 7d0c6bee2517d77635beb2a1dd6d6e7d4d943512
3+
libraries_bom_version: 26.51.0
44
libraries:
55
- api_shortname: spanner
66
name_pretty: Cloud Spanner

Diff for: ‎google-cloud-spanner-bom/pom.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-spanner-bom</artifactId>
6-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
6+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>sdk-platform-java-config</artifactId>
11-
<version>3.40.0</version>
11+
<version>3.41.0</version>
1212
</parent>
1313

1414
<name>Google Cloud Spanner BOM</name>
@@ -53,43 +53,43 @@
5353
<dependency>
5454
<groupId>com.google.cloud</groupId>
5555
<artifactId>google-cloud-spanner</artifactId>
56-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
56+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
5757
</dependency>
5858
<dependency>
5959
<groupId>com.google.cloud</groupId>
6060
<artifactId>google-cloud-spanner</artifactId>
6161
<type>test-jar</type>
62-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
62+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
6363
</dependency>
6464
<dependency>
6565
<groupId>com.google.api.grpc</groupId>
6666
<artifactId>grpc-google-cloud-spanner-v1</artifactId>
67-
<version>6.82.0</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
67+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
6868
</dependency>
6969
<dependency>
7070
<groupId>com.google.api.grpc</groupId>
7171
<artifactId>grpc-google-cloud-spanner-admin-instance-v1</artifactId>
72-
<version>6.82.0</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
72+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
7373
</dependency>
7474
<dependency>
7575
<groupId>com.google.api.grpc</groupId>
7676
<artifactId>grpc-google-cloud-spanner-admin-database-v1</artifactId>
77-
<version>6.82.0</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
77+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
7878
</dependency>
7979
<dependency>
8080
<groupId>com.google.api.grpc</groupId>
8181
<artifactId>proto-google-cloud-spanner-admin-instance-v1</artifactId>
82-
<version>6.82.0</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
82+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
8383
</dependency>
8484
<dependency>
8585
<groupId>com.google.api.grpc</groupId>
8686
<artifactId>proto-google-cloud-spanner-v1</artifactId>
87-
<version>6.82.0</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
87+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
8888
</dependency>
8989
<dependency>
9090
<groupId>com.google.api.grpc</groupId>
9191
<artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
92-
<version>6.82.0</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
92+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
9393
</dependency>
9494
</dependencies>
9595
</dependencyManagement>

Diff for: ‎google-cloud-spanner-executor/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.google.cloud</groupId>
77
<artifactId>google-cloud-spanner-executor</artifactId>
8-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
8+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
99
<packaging>jar</packaging>
1010
<name>Google Cloud Spanner Executor</name>
1111

1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>google-cloud-spanner-parent</artifactId>
15-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
15+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1616
</parent>
1717

1818
<properties>

Diff for: ‎google-cloud-spanner/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-spanner</artifactId>
6-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
6+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
77
<packaging>jar</packaging>
88
<name>Google Cloud Spanner</name>
99
<url>https://github.com/googleapis/java-spanner</url>
1010
<description>Java idiomatic client for Google Cloud Spanner.</description>
1111
<parent>
1212
<groupId>com.google.cloud</groupId>
1313
<artifactId>google-cloud-spanner-parent</artifactId>
14-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
14+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1515
</parent>
1616
<properties>
1717
<site.installationModule>google-cloud-spanner</site.installationModule>

Diff for: ‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ static UnitOfWorkType of(TransactionMode transactionMode) {
292292
statementExecutorType =
293293
options.isUseVirtualThreads()
294294
? StatementExecutorType.VIRTUAL_THREAD
295-
: StatementExecutorType.DIRECT_EXECUTOR;
295+
: StatementExecutorType.PLATFORM_THREAD;
296296
}
297297
this.statementExecutor =
298298
new StatementExecutor(statementExecutorType, options.getStatementExecutionInterceptors());
@@ -342,7 +342,7 @@ && getDialect() == Dialect.POSTGRESQL
342342
new StatementExecutor(
343343
options.isUseVirtualThreads()
344344
? StatementExecutorType.VIRTUAL_THREAD
345-
: StatementExecutorType.DIRECT_EXECUTOR,
345+
: StatementExecutorType.PLATFORM_THREAD,
346346
Collections.emptyList());
347347
this.spannerPool = Preconditions.checkNotNull(spannerPool);
348348
this.options = Preconditions.checkNotNull(options);

Diff for: ‎grpc-google-cloud-spanner-admin-database-v1/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>grpc-google-cloud-spanner-admin-database-v1</artifactId>
7-
<version>6.82.0</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
7+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
88
<name>grpc-google-cloud-spanner-admin-database-v1</name>
99
<description>GRPC library for grpc-google-cloud-spanner-admin-database-v1</description>
1010
<parent>
1111
<groupId>com.google.cloud</groupId>
1212
<artifactId>google-cloud-spanner-parent</artifactId>
13-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
13+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>

Diff for: ‎grpc-google-cloud-spanner-admin-instance-v1/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>grpc-google-cloud-spanner-admin-instance-v1</artifactId>
7-
<version>6.82.0</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
7+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
88
<name>grpc-google-cloud-spanner-admin-instance-v1</name>
99
<description>GRPC library for grpc-google-cloud-spanner-admin-instance-v1</description>
1010
<parent>
1111
<groupId>com.google.cloud</groupId>
1212
<artifactId>google-cloud-spanner-parent</artifactId>
13-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
13+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>

Diff for: ‎grpc-google-cloud-spanner-executor-v1/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>grpc-google-cloud-spanner-executor-v1</artifactId>
7-
<version>6.82.0</version><!-- {x-version-update:grpc-google-cloud-spanner-executor-v1:current} -->
7+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-executor-v1:current} -->
88
<name>grpc-google-cloud-spanner-executor-v1</name>
99
<description>GRPC library for google-cloud-spanner</description>
1010
<parent>
1111
<groupId>com.google.cloud</groupId>
1212
<artifactId>google-cloud-spanner-parent</artifactId>
13-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
13+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>

Diff for: ‎grpc-google-cloud-spanner-v1/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>grpc-google-cloud-spanner-v1</artifactId>
7-
<version>6.82.0</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
7+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
88
<name>grpc-google-cloud-spanner-v1</name>
99
<description>GRPC library for grpc-google-cloud-spanner-v1</description>
1010
<parent>
1111
<groupId>com.google.cloud</groupId>
1212
<artifactId>google-cloud-spanner-parent</artifactId>
13-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
13+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>

Diff for: ‎pom.xml

+11-11
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-spanner-parent</artifactId>
66
<packaging>pom</packaging>
7-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
7+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
88
<name>Google Cloud Spanner Parent</name>
99
<url>https://github.com/googleapis/java-spanner</url>
1010
<description>
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>sdk-platform-java-config</artifactId>
17-
<version>3.40.0</version>
17+
<version>3.41.0</version>
1818
</parent>
1919

2020
<developers>
@@ -61,47 +61,47 @@
6161
<dependency>
6262
<groupId>com.google.api.grpc</groupId>
6363
<artifactId>proto-google-cloud-spanner-admin-instance-v1</artifactId>
64-
<version>6.82.0</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
64+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
6565
</dependency>
6666
<dependency>
6767
<groupId>com.google.api.grpc</groupId>
6868
<artifactId>proto-google-cloud-spanner-executor-v1</artifactId>
69-
<version>6.82.0</version><!-- {x-version-update:proto-google-cloud-spanner-executor-v1:current} -->
69+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-executor-v1:current} -->
7070
</dependency>
7171
<dependency>
7272
<groupId>com.google.api.grpc</groupId>
7373
<artifactId>grpc-google-cloud-spanner-executor-v1</artifactId>
74-
<version>6.82.0</version><!-- {x-version-update:grpc-google-cloud-spanner-executor-v1:current} -->
74+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-executor-v1:current} -->
7575
</dependency>
7676
<dependency>
7777
<groupId>com.google.api.grpc</groupId>
7878
<artifactId>proto-google-cloud-spanner-v1</artifactId>
79-
<version>6.82.0</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
79+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
8080
</dependency>
8181
<dependency>
8282
<groupId>com.google.api.grpc</groupId>
8383
<artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
84-
<version>6.82.0</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
84+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
8585
</dependency>
8686
<dependency>
8787
<groupId>com.google.api.grpc</groupId>
8888
<artifactId>grpc-google-cloud-spanner-v1</artifactId>
89-
<version>6.82.0</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
89+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
9090
</dependency>
9191
<dependency>
9292
<groupId>com.google.api.grpc</groupId>
9393
<artifactId>grpc-google-cloud-spanner-admin-instance-v1</artifactId>
94-
<version>6.82.0</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
94+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
9595
</dependency>
9696
<dependency>
9797
<groupId>com.google.api.grpc</groupId>
9898
<artifactId>grpc-google-cloud-spanner-admin-database-v1</artifactId>
99-
<version>6.82.0</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
99+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
100100
</dependency>
101101
<dependency>
102102
<groupId>com.google.cloud</groupId>
103103
<artifactId>google-cloud-spanner</artifactId>
104-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
104+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
105105
</dependency>
106106

107107
<dependency>

Diff for: ‎proto-google-cloud-spanner-admin-database-v1/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
7-
<version>6.82.0</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
7+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
88
<name>proto-google-cloud-spanner-admin-database-v1</name>
99
<description>PROTO library for proto-google-cloud-spanner-admin-database-v1</description>
1010
<parent>
1111
<groupId>com.google.cloud</groupId>
1212
<artifactId>google-cloud-spanner-parent</artifactId>
13-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
13+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>

Diff for: ‎proto-google-cloud-spanner-admin-instance-v1/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>proto-google-cloud-spanner-admin-instance-v1</artifactId>
7-
<version>6.82.0</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
7+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
88
<name>proto-google-cloud-spanner-admin-instance-v1</name>
99
<description>PROTO library for proto-google-cloud-spanner-admin-instance-v1</description>
1010
<parent>
1111
<groupId>com.google.cloud</groupId>
1212
<artifactId>google-cloud-spanner-parent</artifactId>
13-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
13+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>

Diff for: ‎proto-google-cloud-spanner-executor-v1/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>proto-google-cloud-spanner-executor-v1</artifactId>
7-
<version>6.82.0</version><!-- {x-version-update:proto-google-cloud-spanner-executor-v1:current} -->
7+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-executor-v1:current} -->
88
<name>proto-google-cloud-spanner-executor-v1</name>
99
<description>Proto library for google-cloud-spanner</description>
1010
<parent>
1111
<groupId>com.google.cloud</groupId>
1212
<artifactId>google-cloud-spanner-parent</artifactId>
13-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
13+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>

Diff for: ‎proto-google-cloud-spanner-v1/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>proto-google-cloud-spanner-v1</artifactId>
7-
<version>6.82.0</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
7+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
88
<name>proto-google-cloud-spanner-v1</name>
99
<description>PROTO library for proto-google-cloud-spanner-v1</description>
1010
<parent>
1111
<groupId>com.google.cloud</groupId>
1212
<artifactId>google-cloud-spanner-parent</artifactId>
13-
<version>6.82.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
13+
<version>6.82.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>

Diff for: ‎proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeCode.java

+24
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,17 @@ public enum TypeCode implements com.google.protobuf.ProtocolMessageEnum {
228228
* <code>INTERVAL = 16;</code>
229229
*/
230230
INTERVAL(16),
231+
/**
232+
*
233+
*
234+
* <pre>
235+
* Encoded as `string`, in lower-case hexa-decimal format, as described
236+
* in RFC 9562, section 4.
237+
* </pre>
238+
*
239+
* <code>UUID = 17;</code>
240+
*/
241+
UUID(17),
231242
UNRECOGNIZED(-1),
232243
;
233244

@@ -424,6 +435,17 @@ public enum TypeCode implements com.google.protobuf.ProtocolMessageEnum {
424435
* <code>INTERVAL = 16;</code>
425436
*/
426437
public static final int INTERVAL_VALUE = 16;
438+
/**
439+
*
440+
*
441+
* <pre>
442+
* Encoded as `string`, in lower-case hexa-decimal format, as described
443+
* in RFC 9562, section 4.
444+
* </pre>
445+
*
446+
* <code>UUID = 17;</code>
447+
*/
448+
public static final int UUID_VALUE = 17;
427449

428450
public final int getNumber() {
429451
if (this == UNRECOGNIZED) {
@@ -481,6 +503,8 @@ public static TypeCode forNumber(int value) {
481503
return ENUM;
482504
case 16:
483505
return INTERVAL;
506+
case 17:
507+
return UUID;
484508
default:
485509
return null;
486510
}

Diff for: ‎proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,20 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
6060
+ "pe_fqn\030\005 \001(\t\"\177\n\nStructType\0223\n\006fields\030\001 \003"
6161
+ "(\0132#.google.spanner.v1.StructType.Field\032"
6262
+ "<\n\005Field\022\014\n\004name\030\001 \001(\t\022%\n\004type\030\002 \001(\0132\027.g"
63-
+ "oogle.spanner.v1.Type*\325\001\n\010TypeCode\022\031\n\025TY"
63+
+ "oogle.spanner.v1.Type*\337\001\n\010TypeCode\022\031\n\025TY"
6464
+ "PE_CODE_UNSPECIFIED\020\000\022\010\n\004BOOL\020\001\022\t\n\005INT64"
6565
+ "\020\002\022\013\n\007FLOAT64\020\003\022\013\n\007FLOAT32\020\017\022\r\n\tTIMESTAM"
6666
+ "P\020\004\022\010\n\004DATE\020\005\022\n\n\006STRING\020\006\022\t\n\005BYTES\020\007\022\t\n\005"
6767
+ "ARRAY\020\010\022\n\n\006STRUCT\020\t\022\013\n\007NUMERIC\020\n\022\010\n\004JSON"
68-
+ "\020\013\022\t\n\005PROTO\020\r\022\010\n\004ENUM\020\016\022\014\n\010INTERVAL\020\020*d\n"
69-
+ "\022TypeAnnotationCode\022$\n TYPE_ANNOTATION_C"
70-
+ "ODE_UNSPECIFIED\020\000\022\016\n\nPG_NUMERIC\020\002\022\014\n\010PG_"
71-
+ "JSONB\020\003\022\n\n\006PG_OID\020\004B\254\001\n\025com.google.spann"
72-
+ "er.v1B\tTypeProtoP\001Z5cloud.google.com/go/"
73-
+ "spanner/apiv1/spannerpb;spannerpb\252\002\027Goog"
74-
+ "le.Cloud.Spanner.V1\312\002\027Google\\Cloud\\Spann"
75-
+ "er\\V1\352\002\032Google::Cloud::Spanner::V1b\006prot"
76-
+ "o3"
68+
+ "\020\013\022\t\n\005PROTO\020\r\022\010\n\004ENUM\020\016\022\014\n\010INTERVAL\020\020\022\010\n"
69+
+ "\004UUID\020\021*d\n\022TypeAnnotationCode\022$\n TYPE_AN"
70+
+ "NOTATION_CODE_UNSPECIFIED\020\000\022\016\n\nPG_NUMERI"
71+
+ "C\020\002\022\014\n\010PG_JSONB\020\003\022\n\n\006PG_OID\020\004B\254\001\n\025com.go"
72+
+ "ogle.spanner.v1B\tTypeProtoP\001Z5cloud.goog"
73+
+ "le.com/go/spanner/apiv1/spannerpb;spanne"
74+
+ "rpb\252\002\027Google.Cloud.Spanner.V1\312\002\027Google\\C"
75+
+ "loud\\Spanner\\V1\352\002\032Google::Cloud::Spanner"
76+
+ "::V1b\006proto3"
7777
};
7878
descriptor =
7979
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

Diff for: ‎proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/type.proto

+4
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,10 @@ enum TypeCode {
175175
// For example, `P1Y2M3DT4H5M6.5S` represents time duration of 1 year, 2
176176
// months, 3 days, 4 hours, 5 minutes, and 6.5 seconds.
177177
INTERVAL = 16;
178+
179+
// Encoded as `string`, in lower-case hexa-decimal format, as described
180+
// in RFC 9562, section 4.
181+
UUID = 17;
178182
}
179183

180184
// `TypeAnnotationCode` is used as a part of [Type][google.spanner.v1.Type] to

Diff for: ‎renovate.json

-17
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,6 @@
4141
],
4242
"depNameTemplate": "com.google.cloud:sdk-platform-java-config",
4343
"datasourceTemplate": "maven"
44-
},
45-
{
46-
"fileMatch": [
47-
"^.github/workflows/hermetic_library_generation.yaml$"
48-
],
49-
"matchStrings": [
50-
"uses: googleapis/sdk-platform-java/.github/scripts@v(?<currentValue>.+?)\\n"
51-
],
52-
"depNameTemplate": "com.google.api:gapic-generator-java",
53-
"datasourceTemplate": "maven"
5444
}
5545
],
5646
"packageRules": [
@@ -111,13 +101,6 @@
111101
"^com.fasterxml.jackson.core"
112102
],
113103
"groupName": "jackson dependencies"
114-
},
115-
{
116-
"matchPackagePatterns": [
117-
"^com.google.api:gapic-generator-java",
118-
"^com.google.cloud:sdk-platform-java-config"
119-
],
120-
"groupName": "SDK platform Java dependencies"
121104
}
122105
],
123106
"semanticCommits": true,

Diff for: ‎samples/snapshot/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>com.google.cloud</groupId>
3434
<artifactId>google-cloud-spanner</artifactId>
35-
<version>6.82.0</version>
35+
<version>6.82.1-SNAPSHOT</version>
3636
</dependency>
3737
<!-- {x-version-update-end} -->
3838

Diff for: ‎versions.txt

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Format:
22
# module:released-version:current-version
33

4-
proto-google-cloud-spanner-admin-instance-v1:6.82.0:6.82.0
5-
proto-google-cloud-spanner-v1:6.82.0:6.82.0
6-
proto-google-cloud-spanner-admin-database-v1:6.82.0:6.82.0
7-
grpc-google-cloud-spanner-v1:6.82.0:6.82.0
8-
grpc-google-cloud-spanner-admin-instance-v1:6.82.0:6.82.0
9-
grpc-google-cloud-spanner-admin-database-v1:6.82.0:6.82.0
10-
google-cloud-spanner:6.82.0:6.82.0
11-
google-cloud-spanner-executor:6.82.0:6.82.0
12-
proto-google-cloud-spanner-executor-v1:6.82.0:6.82.0
13-
grpc-google-cloud-spanner-executor-v1:6.82.0:6.82.0
4+
proto-google-cloud-spanner-admin-instance-v1:6.82.0:6.82.1-SNAPSHOT
5+
proto-google-cloud-spanner-v1:6.82.0:6.82.1-SNAPSHOT
6+
proto-google-cloud-spanner-admin-database-v1:6.82.0:6.82.1-SNAPSHOT
7+
grpc-google-cloud-spanner-v1:6.82.0:6.82.1-SNAPSHOT
8+
grpc-google-cloud-spanner-admin-instance-v1:6.82.0:6.82.1-SNAPSHOT
9+
grpc-google-cloud-spanner-admin-database-v1:6.82.0:6.82.1-SNAPSHOT
10+
google-cloud-spanner:6.82.0:6.82.1-SNAPSHOT
11+
google-cloud-spanner-executor:6.82.0:6.82.1-SNAPSHOT
12+
proto-google-cloud-spanner-executor-v1:6.82.0:6.82.1-SNAPSHOT
13+
grpc-google-cloud-spanner-executor-v1:6.82.0:6.82.1-SNAPSHOT

0 commit comments

Comments
 (0)
Please sign in to comment.