Skip to content
This repository was archived by the owner on Apr 7, 2026. It is now read-only.

Commit 46f23e9

Browse files
aseeringaseering
authored
Merge branch 'main' into secure-parameters
2 parents dccce56 + 8813c9a commit 46f23e9

93 files changed

Lines changed: 3051 additions & 15735 deletions

File tree

Some content is hidden

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

‎.github/release-please.yml‎

Lines changed: 23 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,60 +2,26 @@ releaseType: java-yoshi
22
bumpMinorPreMajor: true
33
handleGHRelease: true
44
branches:
5-
- branch: 3.3.x
6-
releaseType: java-yoshi
7-
bumpMinorPreMajor: true
8-
handleGHRelease: true
9-
- branch: 4.0.x
10-
releaseType: java-yoshi
11-
bumpMinorPreMajor: true
12-
handleGHRelease: true
13-
- branch: 5.2.x
14-
releaseType: java-yoshi
15-
bumpMinorPreMajor: true
16-
handleGHRelease: true
17-
- releaseType: java-lts
18-
bumpMinorPreMajor: true
19-
handleGHRelease: true
20-
branch: 6.4.4-sp
21-
- releaseType: java-backport
22-
bumpMinorPreMajor: true
23-
handleGHRelease: true
24-
branch: 6.14.x
25-
- releaseType: java-yoshi
26-
bumpMinorPreMajor: true
27-
handleGHRelease: true
28-
branch: 6.23.x
29-
- releaseType: java-yoshi
30-
bumpMinorPreMajor: true
31-
handleGHRelease: true
32-
branch: 6.33.x
33-
- releaseType: java-backport
34-
bumpMinorPreMajor: true
35-
handleGHRelease: true
36-
branch: 6.55.x
37-
- releaseType: java-backport
38-
bumpMinorPreMajor: true
39-
handleGHRelease: true
40-
branch: 6.67.x
41-
- releaseType: java-backport
42-
bumpMinorPreMajor: true
43-
handleGHRelease: true
44-
branch: 6.66.x
45-
- releaseType: java-backport
46-
bumpMinorPreMajor: true
47-
handleGHRelease: true
48-
branch: 6.88.x
49-
- releaseType: java-backport
50-
bumpMinorPreMajor: true
51-
handleGHRelease: true
52-
branch: 6.96.x
53-
- releaseType: java-backport
54-
bumpMinorPreMajor: true
55-
handleGHRelease: true
56-
branch: 6.95.x
57-
- releaseType: java-yoshi
58-
bumpMinorPreMajor: true
59-
handleGHRelease: true
60-
branch: protobuf-4.x-rc
61-
manifest: true
5+
- branch: 3.3.x
6+
- branch: 4.0.x
7+
- branch: 5.2.x
8+
- branch: 6.4.4-sp
9+
releaseType: java-lts
10+
- branch: 6.14.x
11+
releaseType: java-backport
12+
- branch: 6.23.x
13+
- branch: 6.33.x
14+
- branch: 6.55.x
15+
releaseType: java-backport
16+
- branch: 6.67.x
17+
releaseType: java-backport
18+
- branch: 6.66.x
19+
releaseType: java-backport
20+
- branch: 6.88.x
21+
releaseType: java-backport
22+
- branch: 6.96.x
23+
releaseType: java-backport
24+
- branch: 6.95.x
25+
releaseType: java-backport
26+
- branch: protobuf-4.x-rc
27+
manifest: true

‎.github/sync-repo-settings.yaml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@ branchProtectionRules:
1414
- units (8)
1515
- units (11)
1616
- 'Kokoro - Test: Integration'
17-
- 'Kokoro - Test: Integration with Multiplexed Sessions'
1817
- cla/google
1918
- checkstyle
2019
- compile (8)
2120
- compile (11)
22-
- units-with-multiplexed-session (8)
23-
- units-with-multiplexed-session (11)
2421
- unmanaged_dependency_check
2522
- library_generation
2623
- pattern: 3.3.x
@@ -154,7 +151,6 @@ branchProtectionRules:
154151
- units (8)
155152
- units (11)
156153
- 'Kokoro - Test: Integration'
157-
- 'Kokoro - Test: Integration with Multiplexed Sessions'
158154
- cla/google
159155
- checkstyle
160156
- compile (8)
@@ -173,7 +169,6 @@ branchProtectionRules:
173169
- units (8)
174170
- units (11)
175171
- 'Kokoro - Test: Integration'
176-
- 'Kokoro - Test: Integration with Multiplexed Sessions'
177172
- cla/google
178173
- checkstyle
179174
- compile (8)
@@ -194,7 +189,6 @@ branchProtectionRules:
194189
- units (8)
195190
- units (11)
196191
- 'Kokoro - Test: Integration'
197-
- 'Kokoro - Test: Integration with Multiplexed Sessions'
198192
- cla/google
199193
- checkstyle
200194
- compile (8)
@@ -215,7 +209,6 @@ branchProtectionRules:
215209
- units (8)
216210
- units (11)
217211
- 'Kokoro - Test: Integration'
218-
- 'Kokoro - Test: Integration with Multiplexed Sessions'
219212
- cla/google
220213
- checkstyle
221214
- compile (8)

‎.github/workflows/ci.yaml‎

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -36,41 +36,6 @@ jobs:
3636
- run: .kokoro/build.sh
3737
env:
3838
JOB_TYPE: test
39-
units-with-multiplexed-session:
40-
runs-on: ubuntu-latest
41-
strategy:
42-
fail-fast: false
43-
matrix:
44-
java: [ 11, 17, 21 ]
45-
steps:
46-
- uses: actions/checkout@v4
47-
- uses: actions/setup-java@v3
48-
with:
49-
distribution: temurin
50-
java-version: ${{matrix.java}}
51-
- run: java -version
52-
- run: .kokoro/build.sh
53-
env:
54-
JOB_TYPE: test
55-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
56-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
57-
units-with-regular-session:
58-
runs-on: ubuntu-latest
59-
strategy:
60-
fail-fast: false
61-
matrix:
62-
java: [ 11, 17, 21 ]
63-
steps:
64-
- uses: actions/checkout@v4
65-
- uses: actions/setup-java@v3
66-
with:
67-
distribution: temurin
68-
java-version: ${{matrix.java}}
69-
- run: java -version
70-
- run: .kokoro/build.sh
71-
env:
72-
JOB_TYPE: test
73-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
7439
units-java8:
7540
# Building using Java 17 and run the tests with Java 8 runtime
7641
name: "units (8)"
@@ -90,48 +55,6 @@ jobs:
9055
- run: .kokoro/build.sh
9156
env:
9257
JOB_TYPE: test
93-
units-with-multiplexed-session8:
94-
# Building using Java 17 and run the tests with Java 8 runtime
95-
name: "units-with-multiplexed-session (8)"
96-
runs-on: ubuntu-latest
97-
steps:
98-
- uses: actions/checkout@v4
99-
- uses: actions/setup-java@v3
100-
with:
101-
java-version: 8
102-
distribution: temurin
103-
- run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
104-
shell: bash
105-
- uses: actions/setup-java@v3
106-
with:
107-
java-version: 17
108-
distribution: temurin
109-
- run: .kokoro/build.sh
110-
env:
111-
JOB_TYPE: test
112-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
113-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
114-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
115-
units-with-regular-session8:
116-
# Building using Java 17 and run the tests with Java 8 runtime
117-
name: "units-with-regular-session (8)"
118-
runs-on: ubuntu-latest
119-
steps:
120-
- uses: actions/checkout@v4
121-
- uses: actions/setup-java@v3
122-
with:
123-
java-version: 8
124-
distribution: temurin
125-
- run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
126-
shell: bash
127-
- uses: actions/setup-java@v3
128-
with:
129-
java-version: 17
130-
distribution: temurin
131-
- run: .kokoro/build.sh
132-
env:
133-
JOB_TYPE: test
134-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
13558
windows:
13659
runs-on: windows-latest
13760
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.64.2
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.66.0
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

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

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

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

‎.kokoro/build.sh‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -104,21 +104,6 @@ integration)
104104
verify
105105
RETURN_CODE=$?
106106
;;
107-
integration-regular-sessions)
108-
mvn -B ${INTEGRATION_TEST_ARGS} \
109-
-ntp \
110-
-Penable-integration-tests \
111-
-Djava.net.preferIPv4Stack=true \
112-
-DtrimStackTrace=false \
113-
-Dclirr.skip=true \
114-
-Denforcer.skip=true \
115-
-Dmaven.main.skip=true \
116-
-Dspanner.gce.config.project_id=gcloud-devel \
117-
-Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests-regular-sessions \
118-
-fae \
119-
verify
120-
RETURN_CODE=$?
121-
;;
122107
integration-directpath-enabled)
123108
mvn -B ${INTEGRATION_TEST_ARGS} \
124109
-ntp \

‎.kokoro/presubmit/integration-regular-sessions-enabled.cfg‎

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

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
# Changelog
22

3+
## [6.107.0](https://github.com/googleapis/java-spanner/compare/v6.106.0...v6.107.0) (2026-01-16)
4+
5+
6+
### Features
7+
8+
* Add Dynamic Channel Pooling (DCP) support to Connection API ([#4299](https://github.com/googleapis/java-spanner/issues/4299)) ([bba03a4](https://github.com/googleapis/java-spanner/commit/bba03a44dbfbd59288ecd33e3e53276809ad69b1))
9+
* Add SsFormat encoding library ([#4292](https://github.com/googleapis/java-spanner/issues/4292)) ([338a9b1](https://github.com/googleapis/java-spanner/commit/338a9b1409cafedcdef674bdff09a72c3f2cd772))
10+
11+
12+
### Dependencies
13+
14+
* Update dependency com.google.api.grpc:proto-google-cloud-trace-v1 to v2.82.0 ([#4227](https://github.com/googleapis/java-spanner/issues/4227)) ([22bc6cf](https://github.com/googleapis/java-spanner/commit/22bc6cf3431f6e507d384f6e86a36503f1175ee7))
15+
* Update dependency com.google.cloud:google-cloud-monitoring to v3.83.0 ([#4169](https://github.com/googleapis/java-spanner/issues/4169)) ([61ae915](https://github.com/googleapis/java-spanner/commit/61ae915242a3c8a0aa1385bc1367f67df2c209d6))
16+
* Update dependency com.google.cloud:sdk-platform-java-config to v3.55.1 ([#4302](https://github.com/googleapis/java-spanner/issues/4302)) ([52acc0c](https://github.com/googleapis/java-spanner/commit/52acc0c620fec0aa67ecd81d634eec271fe4e429))
17+
* Update dependency net.bytebuddy:byte-buddy to v1.18.4 ([#4244](https://github.com/googleapis/java-spanner/issues/4244)) ([c8e4d91](https://github.com/googleapis/java-spanner/commit/c8e4d912155ab6829498822dcf0783fac5fe2747))
18+
* Update google.cloud.monitoring.version to v3.83.0 ([#4270](https://github.com/googleapis/java-spanner/issues/4270)) ([7ae68c8](https://github.com/googleapis/java-spanner/commit/7ae68c8e889f44f1057310bc45b70c086af9c385))
19+
* Update googleapis/sdk-platform-java action to v2.65.1 ([#4301](https://github.com/googleapis/java-spanner/issues/4301)) ([7d98f4e](https://github.com/googleapis/java-spanner/commit/7d98f4e12843826c18cbb8e0998c8687c94fc3d2))
20+
321
## [6.106.0](https://github.com/googleapis/java-spanner/compare/v6.105.0...v6.106.0) (2026-01-07)
422

523

0 commit comments

Comments
 (0)