Skip to content

Commit ea452a7

Browse files
authored
Merge branch 'main' into make-async-resultset-state-volatile
2 parents 12232c2 + c2d5614 commit ea452a7

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

.github/workflows/hermetic_library_generation.yaml

Lines 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.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 }}

.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 1 addition & 1 deletion
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

.kokoro/presubmit/graalvm-native-17.cfg

Lines changed: 1 addition & 1 deletion
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: {

.kokoro/presubmit/graalvm-native.cfg

Lines changed: 1 addition & 1 deletion
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: {

google-cloud-spanner-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
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>

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionImpl.java

Lines changed: 2 additions & 2 deletions
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);

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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>

0 commit comments

Comments
 (0)