Skip to content

Commit f821e2e

Browse files
committed
Merge branch 'main' of github.com:googleapis/java-spanner into uuid_executor
2 parents ff6bab3 + 7a8a29b commit f821e2e

File tree

187 files changed

+13875
-2053
lines changed

Some content is hidden

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

187 files changed

+13875
-2053
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,5 @@
44
# For syntax help see:
55
# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
66

7-
# The @googleapis/api-spanner-java is the default owner for changes in this repo
8-
* @googleapis/yoshi-java @googleapis/api-spanner-java
9-
**/*.java @googleapis/api-spanner-java
10-
11-
# The java-samples-reviewers team is the default owner for samples changes
12-
samples/**/*.java @googleapis/java-samples-reviewers @googleapis/api-spanner-java
7+
# The @googleapis/spanner-client-libraries-java is the default owner for changes in this repo
8+
* @googleapis/yoshi-java @googleapis/spanner-client-libraries-java

.github/release-please.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,7 @@ branches:
4242
bumpMinorPreMajor: true
4343
handleGHRelease: true
4444
branch: 6.66.x
45+
- releaseType: java-backport
46+
bumpMinorPreMajor: true
47+
handleGHRelease: true
48+
branch: 6.88.x

.github/sync-repo-settings.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,27 @@ branchProtectionRules:
161161
- compile (11)
162162
- units-with-multiplexed-session (8)
163163
- units-with-multiplexed-session (11)
164+
- pattern: 6.88.x
165+
isAdminEnforced: true
166+
requiredApprovingReviewCount: 1
167+
requiresCodeOwnerReviews: true
168+
requiresStrictStatusChecks: false
169+
requiredStatusCheckContexts:
170+
- dependencies (17)
171+
- lint
172+
- javadoc
173+
- units (8)
174+
- units (11)
175+
- 'Kokoro - Test: Integration'
176+
- 'Kokoro - Test: Integration with Multiplexed Sessions'
177+
- cla/google
178+
- checkstyle
179+
- compile (8)
180+
- compile (11)
181+
- units-with-multiplexed-session (8)
182+
- units-with-multiplexed-session (11)
183+
- unmanaged_dependency_check
184+
- library_generation
164185
permissionRules:
165186
- team: yoshi-admins
166187
permission: admin

.github/workflows/ci.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
JOB_TYPE: test
5555
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
5656
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
57+
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
5758
units-java8:
5859
# Building using Java 17 and run the tests with Java 8 runtime
5960
name: "units (8)"
@@ -94,6 +95,7 @@ jobs:
9495
JOB_TYPE: test
9596
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
9697
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
98+
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
9799
windows:
98100
runs-on: windows-latest
99101
steps:

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

.github/workflows/integration-tests-against-emulator-with-multiplexed-session.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ jobs:
3939
env:
4040
JOB_TYPE: test
4141
SPANNER_EMULATOR_HOST: localhost:9010
42-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
42+
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true

.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.41.0
20+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.44.0
2121
with:
2222
bom-path: google-cloud-spanner-bom/pom.xml

.kokoro/continuous/integration-cloud-devel-directpath-enabled.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ env_vars: {
2727
}
2828

2929
env_vars: {
30-
key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
30+
key: "GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS"
3131
value: "true"
3232
}

.kokoro/continuous/integration-cloud-staging-directpath-enabled.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ env_vars: {
2727
}
2828

2929
env_vars: {
30-
key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
30+
key: "GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS"
3131
value: "true"
3232
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ env_vars: {
2222
}
2323

2424
env_vars: {
25-
key: "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"
25+
key: "GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS"
2626
value: "true"
2727
}
28-

0 commit comments

Comments
 (0)