diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8d5352c9907..1a97183677b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+## [2.23.4](https://github.com/googleapis/java-bigtable/compare/v2.23.3...v2.23.4) (2023-11-06)
+
+
+### Bug Fixes
+
+* A rare race condition in the row merger ([#1939](https://github.com/googleapis/java-bigtable/issues/1939)) ([#1988](https://github.com/googleapis/java-bigtable/issues/1988)) ([31b084a](https://github.com/googleapis/java-bigtable/commit/31b084abc9c4d609314f232e616b59a4016b991f))
+
## [2.23.3](https://github.com/googleapis/java-bigtable/compare/v2.23.2...v2.23.3) (2023-06-08)
diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
index 6792b3cfc70d..9c58071b35f8 100644
--- a/google-cloud-bigtable-bom/pom.xml
+++ b/google-cloud-bigtable-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-bigtable-bom
- 2.23.4-SNAPSHOT
+ 2.23.4
pom
com.google.cloud
@@ -63,42 +63,42 @@
com.google.cloud
google-cloud-bigtable
- 2.23.4-SNAPSHOT
+ 2.23.4
com.google.cloud
google-cloud-bigtable-emulator
- 0.160.4-SNAPSHOT
+ 0.160.4
com.google.cloud
google-cloud-bigtable-emulator-core
- 0.160.4-SNAPSHOT
+ 0.160.4
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 2.23.4-SNAPSHOT
+ 2.23.4
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 2.23.4-SNAPSHOT
+ 2.23.4
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 2.23.4-SNAPSHOT
+ 2.23.4
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 2.23.4-SNAPSHOT
+ 2.23.4
com.google.cloud
google-cloud-bigtable-stats
- 2.23.4-SNAPSHOT
+ 2.23.4
diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml
index acdd1b011b54..f9b5792f4055 100644
--- a/google-cloud-bigtable-deps-bom/pom.xml
+++ b/google-cloud-bigtable-deps-bom/pom.xml
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.23.4-SNAPSHOT
+ 2.23.4
pom
diff --git a/google-cloud-bigtable-emulator-core/pom.xml b/google-cloud-bigtable-emulator-core/pom.xml
index 28756b7c4e77..5ff394493568 100644
--- a/google-cloud-bigtable-emulator-core/pom.xml
+++ b/google-cloud-bigtable-emulator-core/pom.xml
@@ -7,11 +7,11 @@
google-cloud-bigtable-parent
com.google.cloud
- 2.23.4-SNAPSHOT
+ 2.23.4
google-cloud-bigtable-emulator-core
- 0.160.4-SNAPSHOT
+ 0.160.4
A Java wrapper for the Cloud Bigtable emulator.
diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml
index 8eb45b9f4971..e3acaed458d0 100644
--- a/google-cloud-bigtable-emulator/pom.xml
+++ b/google-cloud-bigtable-emulator/pom.xml
@@ -5,7 +5,7 @@
4.0.0
google-cloud-bigtable-emulator
- 0.160.4-SNAPSHOT
+ 0.160.4
Google Cloud Java - Bigtable Emulator
https://github.com/googleapis/java-bigtable
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-bigtable-parent
- 2.23.4-SNAPSHOT
+ 2.23.4
scm:git:git@github.com:googleapis/java-bigtable.git
@@ -81,14 +81,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.23.4-SNAPSHOT
+ 2.23.4
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.23.4-SNAPSHOT
+ 2.23.4
pom
import
@@ -99,7 +99,7 @@
com.google.cloud
google-cloud-bigtable-emulator-core
- 0.160.4-SNAPSHOT
+ 0.160.4
diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml
index 394490bbf8d1..e0fef5c7ddbe 100644
--- a/google-cloud-bigtable-stats/pom.xml
+++ b/google-cloud-bigtable-stats/pom.xml
@@ -5,7 +5,7 @@
com.google.cloud
google-cloud-bigtable-parent
- 2.23.4-SNAPSHOT
+ 2.23.4
4.0.0
@@ -13,7 +13,7 @@
through Stackdriver. Built-in metrics will be implemented with shaded OpenCensus so it won't interfere with
customer's application metrics. -->
google-cloud-bigtable-stats
- 2.23.4-SNAPSHOT
+ 2.23.4
Experimental project to shade OpenCensus dependencies.
@@ -21,7 +21,7 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.23.4-SNAPSHOT
+ 2.23.4
pom
import
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index 0ebbfda24f84..d23d5ed365f7 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -2,7 +2,7 @@
4.0.0
google-cloud-bigtable
- 2.23.4-SNAPSHOT
+ 2.23.4
jar
Google Cloud Bigtable
https://github.com/googleapis/java-bigtable
@@ -12,11 +12,11 @@
com.google.cloud
google-cloud-bigtable-parent
- 2.23.4-SNAPSHOT
+ 2.23.4
- 2.23.4-SNAPSHOT
+ 2.23.4
google-cloud-bigtable
@@ -47,14 +47,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.23.4-SNAPSHOT
+ 2.23.4
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.23.4-SNAPSHOT
+ 2.23.4
pom
import
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
index 4e336920af93..99e7373c194f 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
@@ -20,6 +20,6 @@
@InternalApi("For internal use only")
public final class Version {
// {x-version-update-start:google-cloud-bigtable:current}
- public static String VERSION = "2.23.4-SNAPSHOT";
+ public static String VERSION = "2.23.4";
// {x-version-update-end}
}
diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml
index 12412d6196d3..d0cc40e554dd 100644
--- a/grpc-google-cloud-bigtable-admin-v2/pom.xml
+++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 2.23.4-SNAPSHOT
+ 2.23.4
grpc-google-cloud-bigtable-admin-v2
GRPC library for grpc-google-cloud-bigtable-admin-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.23.4-SNAPSHOT
+ 2.23.4
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.23.4-SNAPSHOT
+ 2.23.4
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.23.4-SNAPSHOT
+ 2.23.4
pom
import
diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml
index 2f2630a9b78d..e9454f9d9c33 100644
--- a/grpc-google-cloud-bigtable-v2/pom.xml
+++ b/grpc-google-cloud-bigtable-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 2.23.4-SNAPSHOT
+ 2.23.4
grpc-google-cloud-bigtable-v2
GRPC library for grpc-google-cloud-bigtable-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.23.4-SNAPSHOT
+ 2.23.4
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.23.4-SNAPSHOT
+ 2.23.4
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.23.4-SNAPSHOT
+ 2.23.4
pom
import
diff --git a/pom.xml b/pom.xml
index 86812d6323ba..099ad6a7a932 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
google-cloud-bigtable-parent
pom
- 2.23.4-SNAPSHOT
+ 2.23.4
Google Cloud Bigtable Parent
https://github.com/googleapis/java-bigtable
@@ -153,27 +153,27 @@
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 2.23.4-SNAPSHOT
+ 2.23.4
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 2.23.4-SNAPSHOT
+ 2.23.4
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 2.23.4-SNAPSHOT
+ 2.23.4
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 2.23.4-SNAPSHOT
+ 2.23.4
com.google.cloud
google-cloud-bigtable
- 2.23.4-SNAPSHOT
+ 2.23.4
diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml
index a47ea0cf8845..1ce806c05215 100644
--- a/proto-google-cloud-bigtable-admin-v2/pom.xml
+++ b/proto-google-cloud-bigtable-admin-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 2.23.4-SNAPSHOT
+ 2.23.4
proto-google-cloud-bigtable-admin-v2
PROTO library for proto-google-cloud-bigtable-admin-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.23.4-SNAPSHOT
+ 2.23.4
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.23.4-SNAPSHOT
+ 2.23.4
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.23.4-SNAPSHOT
+ 2.23.4
pom
import
diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml
index 75fa4453cd92..3fc8a46a90bd 100644
--- a/proto-google-cloud-bigtable-v2/pom.xml
+++ b/proto-google-cloud-bigtable-v2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 2.23.4-SNAPSHOT
+ 2.23.4
proto-google-cloud-bigtable-v2
PROTO library for proto-google-cloud-bigtable-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.23.4-SNAPSHOT
+ 2.23.4
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.23.4-SNAPSHOT
+ 2.23.4
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.23.4-SNAPSHOT
+ 2.23.4
pom
import
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index b389704455ff..0a355270c6c0 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-bigtable
- 2.23.4-SNAPSHOT
+ 2.23.4
diff --git a/test-proxy/pom.xml b/test-proxy/pom.xml
index 4ca3ec5e0ac6..58a28cb061e6 100644
--- a/test-proxy/pom.xml
+++ b/test-proxy/pom.xml
@@ -12,11 +12,11 @@
google-cloud-bigtable-parent
com.google.cloud
- 2.23.4-SNAPSHOT
+ 2.23.4
- 2.23.4-SNAPSHOT
+ 2.23.4
diff --git a/versions.txt b/versions.txt
index de3428b089ae..92d8235d8843 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
# Format:
# module:released-version:current-version
-google-cloud-bigtable:2.23.3:2.23.4-SNAPSHOT
-grpc-google-cloud-bigtable-admin-v2:2.23.3:2.23.4-SNAPSHOT
-grpc-google-cloud-bigtable-v2:2.23.3:2.23.4-SNAPSHOT
-proto-google-cloud-bigtable-admin-v2:2.23.3:2.23.4-SNAPSHOT
-proto-google-cloud-bigtable-v2:2.23.3:2.23.4-SNAPSHOT
-google-cloud-bigtable-emulator:0.160.3:0.160.4-SNAPSHOT
-google-cloud-bigtable-emulator-core:2.23.3:2.23.4-SNAPSHOT
+google-cloud-bigtable:2.23.4:2.23.4
+grpc-google-cloud-bigtable-admin-v2:2.23.4:2.23.4
+grpc-google-cloud-bigtable-v2:2.23.4:2.23.4
+proto-google-cloud-bigtable-admin-v2:2.23.4:2.23.4
+proto-google-cloud-bigtable-v2:2.23.4:2.23.4
+google-cloud-bigtable-emulator:0.160.4:0.160.4
+google-cloud-bigtable-emulator-core:2.23.4:2.23.4