Skip to content

Commit e1cea44

Browse files
authored
Merge branch 'main' into mux-rw-8
2 parents 59879af + 8a7d533 commit e1cea44

File tree

137 files changed

+3735
-1117
lines changed

Some content is hidden

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

137 files changed

+3735
-1117
lines changed

.github/sync-repo-settings.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ branchProtectionRules:
2121
- compile (11)
2222
- units-with-multiplexed-session (8)
2323
- units-with-multiplexed-session (11)
24+
- unmanaged_dependency_check
25+
- library_generation
2426
- pattern: 3.3.x
2527
isAdminEnforced: true
2628
requiredApprovingReviewCount: 1

.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.49.0
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.50.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.39.0
20+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.40.0
2121
with:
2222
bom-path: google-cloud-spanner-bom/pom.xml

.kokoro/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ integration-directpath-enabled)
113113
-Dclirr.skip=true \
114114
-Denforcer.skip=true \
115115
-Dmaven.main.skip=true \
116-
-Dspanner.gce.config.project_id=gcloud-devel \
117-
-Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests-directpath \
116+
-Dspanner.testenv.instance=projects/span-cloud-testing/instances/spanner-java-client-directpath \
117+
-Dspanner.gce.config.project_id=span-cloud-testing \
118118
-fae \
119119
verify
120120
RETURN_CODE=$?

.kokoro/nightly/integration-directpath-enabled.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ env_vars: {
2828

2929
env_vars: {
3030
key: "GOOGLE_APPLICATION_CREDENTIALS"
31-
value: "secret_manager/java-it-service-account"
31+
value: "secret_manager/java-client-testing"
3232
}
3333

3434
env_vars: {
3535
key: "SECRET_MANAGER_KEYS"
36-
value: "java-it-service-account"
36+
value: "java-client-testing"
3737
}
3838

3939
env_vars: {

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

99
env_vars: {

.kokoro/presubmit/integration-directpath-enabled.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ env_vars: {
2424

2525
env_vars: {
2626
key: "GOOGLE_APPLICATION_CREDENTIALS"
27-
value: "secret_manager/java-it-service-account"
27+
value: "secret_manager/java-client-testing"
2828
}
2929

3030
env_vars: {
3131
key: "SECRET_MANAGER_KEYS"
32-
value: "java-it-service-account"
32+
value: "java-client-testing"
3333
}
3434

3535
env_vars: {

.kokoro/readme.sh

Lines changed: 0 additions & 45 deletions
This file was deleted.

.repo-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"api_shortname": "spanner",
33
"name_pretty": "Cloud Spanner",
44
"product_documentation": "https://cloud.google.com/spanner/docs/",
5-
"api_description": "is a fully managed, mission-critical, relational database service that offers transactional consistency at global scale, \\nschemas, SQL (ANSI 2011 with extensions), and automatic, synchronous replication \\nfor high availability.\\n\\nBe sure to activate the Cloud Spanner API on the Developer's Console to\\nuse Cloud Spanner from your project.",
5+
"api_description": "is a fully managed, mission-critical, relational database service that offers transactional consistency at global scale, schemas, SQL (ANSI 2011 with extensions), and automatic, synchronous replication for high availability. Be sure to activate the Cloud Spanner API on the Developer's Console to use Cloud Spanner from your project.",
66
"client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-spanner/latest/history",
77
"release_level": "stable",
88
"transport": "grpc",

0 commit comments

Comments
 (0)