diff --git a/.github/release-please.yml b/.github/release-please.yml
index 67621e4ea6..be8096d847 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -34,3 +34,7 @@ branches:
bumpMinorPreMajor: true
handleGHRelease: true
branch: 6.55.x
+ - releaseType: java-backport
+ bumpMinorPreMajor: true
+ handleGHRelease: true
+ branch: 6.67.x
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df2d86a134..053164e3c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+## [6.68.1](https://github.com/googleapis/java-spanner/compare/v6.68.0...v6.68.1) (2024-05-29)
+
+
+### Bug Fixes
+
+* Make SessionPoolOptions#setUseMultiplexedSession(boolean) package private ([#3130](https://github.com/googleapis/java-spanner/issues/3130)) ([575c3e0](https://github.com/googleapis/java-spanner/commit/575c3e01541e12294dd37a622f0b1dca52d200ba))
+
## [6.68.0](https://github.com/googleapis/java-spanner/compare/v6.67.0...v6.68.0) (2024-05-27)
diff --git a/README.md b/README.md
index ba3bc5d59c..d6a6934de4 100644
--- a/README.md
+++ b/README.md
@@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-spanner'
If you are using Gradle without BOM, add this to your dependencies:
```Groovy
-implementation 'com.google.cloud:google-cloud-spanner:6.67.0'
+implementation 'com.google.cloud:google-cloud-spanner:6.68.0'
```
If you are using SBT, add this to your dependencies:
```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.67.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.68.0"
```
@@ -671,7 +671,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner/java11.html
[stability-image]: https://img.shields.io/badge/stability-stable-green
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-spanner.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.67.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.68.0
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 5d9d436fc2..eb95604e70 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -24,7 +24,7 @@
com.google.cloud
google-cloud-spanner-parent
- 6.68.0
+ 6.68.1
diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml
index 75f97b7fc2..27904194d2 100644
--- a/google-cloud-spanner-bom/pom.xml
+++ b/google-cloud-spanner-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-spanner-bom
- 6.68.0
+ 6.68.1
pom
com.google.cloud
@@ -53,43 +53,43 @@
com.google.cloud
google-cloud-spanner
- 6.68.0
+ 6.68.1
com.google.cloud
google-cloud-spanner
test-jar
- 6.68.0
+ 6.68.1
com.google.api.grpc
grpc-google-cloud-spanner-v1
- 6.68.0
+ 6.68.1
com.google.api.grpc
grpc-google-cloud-spanner-admin-instance-v1
- 6.68.0
+ 6.68.1
com.google.api.grpc
grpc-google-cloud-spanner-admin-database-v1
- 6.68.0
+ 6.68.1
com.google.api.grpc
proto-google-cloud-spanner-admin-instance-v1
- 6.68.0
+ 6.68.1
com.google.api.grpc
proto-google-cloud-spanner-v1
- 6.68.0
+ 6.68.1
com.google.api.grpc
proto-google-cloud-spanner-admin-database-v1
- 6.68.0
+ 6.68.1
diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml
index fab27c91ba..0a61879b0c 100644
--- a/google-cloud-spanner-executor/pom.xml
+++ b/google-cloud-spanner-executor/pom.xml
@@ -5,14 +5,14 @@
4.0.0
com.google.cloud
google-cloud-spanner-executor
- 6.68.0
+ 6.68.1
jar
Google Cloud Spanner Executor
com.google.cloud
google-cloud-spanner-parent
- 6.68.0
+ 6.68.1
diff --git a/google-cloud-spanner/clirr-ignored-differences.xml b/google-cloud-spanner/clirr-ignored-differences.xml
index b591c0378d..a0269268b8 100644
--- a/google-cloud-spanner/clirr-ignored-differences.xml
+++ b/google-cloud-spanner/clirr-ignored-differences.xml
@@ -712,4 +712,10 @@
void setProtoDescriptors(byte[])
+
+
+ 7009
+ com/google/cloud/spanner/SessionPoolOptions$Builder
+ com.google.cloud.spanner.SessionPoolOptions$Builder setUseMultiplexedSession(boolean)
+
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
index 511ccc8eec..bf91912dc4 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-spanner/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-spanner
- 6.68.0
+ 6.68.1
jar
Google Cloud Spanner
https://github.com/googleapis/java-spanner
@@ -11,7 +11,7 @@
com.google.cloud
google-cloud-spanner-parent
- 6.68.0
+ 6.68.1
google-cloud-spanner
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java
index 9e75e5e48c..382bef1b5a 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java
@@ -755,7 +755,7 @@ Builder setPoolMaintainerClock(Clock poolMaintainerClock) {
* SessionPoolOptions#maxSessions} based on the traffic load. Failing to do so will result in
* higher latencies.
*/
- public Builder setUseMultiplexedSession(boolean useMultiplexedSession) {
+ Builder setUseMultiplexedSession(boolean useMultiplexedSession) {
this.useMultiplexedSession = useMultiplexedSession;
return this;
}
diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml
index 6629f05bde..7dd9349b4f 100644
--- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-spanner-admin-database-v1
- 6.68.0
+ 6.68.1
grpc-google-cloud-spanner-admin-database-v1
GRPC library for grpc-google-cloud-spanner-admin-database-v1
com.google.cloud
google-cloud-spanner-parent
- 6.68.0
+ 6.68.1
diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
index fa42a38639..573ad0a6e0 100644
--- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-spanner-admin-instance-v1
- 6.68.0
+ 6.68.1
grpc-google-cloud-spanner-admin-instance-v1
GRPC library for grpc-google-cloud-spanner-admin-instance-v1
com.google.cloud
google-cloud-spanner-parent
- 6.68.0
+ 6.68.1
diff --git a/grpc-google-cloud-spanner-executor-v1/pom.xml b/grpc-google-cloud-spanner-executor-v1/pom.xml
index 1194a14748..3ada437d89 100644
--- a/grpc-google-cloud-spanner-executor-v1/pom.xml
+++ b/grpc-google-cloud-spanner-executor-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-spanner-executor-v1
- 6.68.0
+ 6.68.1
grpc-google-cloud-spanner-executor-v1
GRPC library for google-cloud-spanner
com.google.cloud
google-cloud-spanner-parent
- 6.68.0
+ 6.68.1
diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml
index aae151f72d..0ac2247aa1 100644
--- a/grpc-google-cloud-spanner-v1/pom.xml
+++ b/grpc-google-cloud-spanner-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-spanner-v1
- 6.68.0
+ 6.68.1
grpc-google-cloud-spanner-v1
GRPC library for grpc-google-cloud-spanner-v1
com.google.cloud
google-cloud-spanner-parent
- 6.68.0
+ 6.68.1
diff --git a/pom.xml b/pom.xml
index 36916f0f0c..1c30cf4dce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-spanner-parent
pom
- 6.68.0
+ 6.68.1
Google Cloud Spanner Parent
https://github.com/googleapis/java-spanner
@@ -61,47 +61,47 @@
com.google.api.grpc
proto-google-cloud-spanner-admin-instance-v1
- 6.68.0
+ 6.68.1
com.google.api.grpc
proto-google-cloud-spanner-executor-v1
- 6.68.0
+ 6.68.1
com.google.api.grpc
grpc-google-cloud-spanner-executor-v1
- 6.68.0
+ 6.68.1
com.google.api.grpc
proto-google-cloud-spanner-v1
- 6.68.0
+ 6.68.1
com.google.api.grpc
proto-google-cloud-spanner-admin-database-v1
- 6.68.0
+ 6.68.1
com.google.api.grpc
grpc-google-cloud-spanner-v1
- 6.68.0
+ 6.68.1
com.google.api.grpc
grpc-google-cloud-spanner-admin-instance-v1
- 6.68.0
+ 6.68.1
com.google.api.grpc
grpc-google-cloud-spanner-admin-database-v1
- 6.68.0
+ 6.68.1
com.google.cloud
google-cloud-spanner
- 6.68.0
+ 6.68.1
diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml
index e946d3a99a..837f4d334c 100644
--- a/proto-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-spanner-admin-database-v1
- 6.68.0
+ 6.68.1
proto-google-cloud-spanner-admin-database-v1
PROTO library for proto-google-cloud-spanner-admin-database-v1
com.google.cloud
google-cloud-spanner-parent
- 6.68.0
+ 6.68.1
diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml
index df8c9c5f2e..0fce1b35dc 100644
--- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-spanner-admin-instance-v1
- 6.68.0
+ 6.68.1
proto-google-cloud-spanner-admin-instance-v1
PROTO library for proto-google-cloud-spanner-admin-instance-v1
com.google.cloud
google-cloud-spanner-parent
- 6.68.0
+ 6.68.1
diff --git a/proto-google-cloud-spanner-executor-v1/pom.xml b/proto-google-cloud-spanner-executor-v1/pom.xml
index 4c6e9d2ba2..e1cb0e0d04 100644
--- a/proto-google-cloud-spanner-executor-v1/pom.xml
+++ b/proto-google-cloud-spanner-executor-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-spanner-executor-v1
- 6.68.0
+ 6.68.1
proto-google-cloud-spanner-executor-v1
Proto library for google-cloud-spanner
com.google.cloud
google-cloud-spanner-parent
- 6.68.0
+ 6.68.1
diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml
index c265c8f14b..2788821e23 100644
--- a/proto-google-cloud-spanner-v1/pom.xml
+++ b/proto-google-cloud-spanner-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-spanner-v1
- 6.68.0
+ 6.68.1
proto-google-cloud-spanner-v1
PROTO library for proto-google-cloud-spanner-v1
com.google.cloud
google-cloud-spanner-parent
- 6.68.0
+ 6.68.1
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 7ab1684582..0a1c78e1da 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -32,7 +32,7 @@
com.google.cloud
google-cloud-spanner
- 6.68.0
+ 6.68.1
diff --git a/versions.txt b/versions.txt
index c956d228a6..671775924f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,13 +1,13 @@
# Format:
# module:released-version:current-version
-proto-google-cloud-spanner-admin-instance-v1:6.68.0:6.68.0
-proto-google-cloud-spanner-v1:6.68.0:6.68.0
-proto-google-cloud-spanner-admin-database-v1:6.68.0:6.68.0
-grpc-google-cloud-spanner-v1:6.68.0:6.68.0
-grpc-google-cloud-spanner-admin-instance-v1:6.68.0:6.68.0
-grpc-google-cloud-spanner-admin-database-v1:6.68.0:6.68.0
-google-cloud-spanner:6.68.0:6.68.0
-google-cloud-spanner-executor:6.68.0:6.68.0
-proto-google-cloud-spanner-executor-v1:6.68.0:6.68.0
-grpc-google-cloud-spanner-executor-v1:6.68.0:6.68.0
+proto-google-cloud-spanner-admin-instance-v1:6.68.1:6.68.1
+proto-google-cloud-spanner-v1:6.68.1:6.68.1
+proto-google-cloud-spanner-admin-database-v1:6.68.1:6.68.1
+grpc-google-cloud-spanner-v1:6.68.1:6.68.1
+grpc-google-cloud-spanner-admin-instance-v1:6.68.1:6.68.1
+grpc-google-cloud-spanner-admin-database-v1:6.68.1:6.68.1
+google-cloud-spanner:6.68.1:6.68.1
+google-cloud-spanner-executor:6.68.1:6.68.1
+proto-google-cloud-spanner-executor-v1:6.68.1:6.68.1
+grpc-google-cloud-spanner-executor-v1:6.68.1:6.68.1