From 80f16dafe99131a6f8612b2b6dec88e7c2eb8699 Mon Sep 17 00:00:00 2001
From: Kristen O'Leary <kaoleary@google.com>
Date: Tue, 18 Aug 2020 10:51:20 -0400
Subject: [PATCH 1/3] test(fix): workaround for protobuf-java incompatibility

---
 .../bigtable/grpc/scanner/ReadRowsAcceptanceTest.java      | 2 +-
 .../bigtable-hbase-1.x-benchmarks/pom.xml                  | 7 +++++++
 pom.xml                                                    | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/bigtable-client-core-parent/bigtable-client-core/src/test/java/com/google/cloud/bigtable/grpc/scanner/ReadRowsAcceptanceTest.java b/bigtable-client-core-parent/bigtable-client-core/src/test/java/com/google/cloud/bigtable/grpc/scanner/ReadRowsAcceptanceTest.java
index 5244f3a7cd..3e512aa744 100644
--- a/bigtable-client-core-parent/bigtable-client-core/src/test/java/com/google/cloud/bigtable/grpc/scanner/ReadRowsAcceptanceTest.java
+++ b/bigtable-client-core-parent/bigtable-client-core/src/test/java/com/google/cloud/bigtable/grpc/scanner/ReadRowsAcceptanceTest.java
@@ -181,7 +181,7 @@ private void addResponses(List<FlatRow> responses, List<Throwable> exceptions)
     for (String chunkStr : testCase.chunks) {
       ReadRowsResponse.Builder responseBuilder = ReadRowsResponse.newBuilder();
       CellChunk.Builder ccBuilder = CellChunk.newBuilder();
-      TextFormat.merge(new StringReader(chunkStr), ccBuilder);
+      TextFormat.merge(new StringBuffer(chunkStr), ccBuilder);
       responseBuilder.addChunks(ccBuilder.build());
       rowMerger.onNext(responseBuilder.build());
     }
diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-benchmarks/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-benchmarks/pom.xml
index 946e87156c..591284b4de 100644
--- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-benchmarks/pom.xml
+++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-benchmarks/pom.xml
@@ -127,6 +127,13 @@
           </usedDependencies>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/pom.xml b/pom.xml
index f8ebef9366..6a276f99af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@ limitations under the License.
     <compileSource.1.8>1.8</compileSource.1.8>
 
     <!-- core dependency versions -->
-    <bigtable.version>1.13.0</bigtable.version>
+    <bigtable.version>1.14.1-SNAPSHOT</bigtable.version>
     <dropwizard.metrics.version>3.2.6</dropwizard.metrics.version>
     <!--  keeping at this version to align with hbase-->
     <slf4j.version>1.7.25</slf4j.version>

From 1bf29e0b31255f93f6faf2aac69d51c95ba30cb3 Mon Sep 17 00:00:00 2001
From: Kristen O'Leary <kaoleary@google.com>
Date: Tue, 18 Aug 2020 10:52:35 -0400
Subject: [PATCH 2/3] test(fix): workaround for protobuf-java incompatibility

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6a276f99af..f8ebef9366 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@ limitations under the License.
     <compileSource.1.8>1.8</compileSource.1.8>
 
     <!-- core dependency versions -->
-    <bigtable.version>1.14.1-SNAPSHOT</bigtable.version>
+    <bigtable.version>1.13.0</bigtable.version>
     <dropwizard.metrics.version>3.2.6</dropwizard.metrics.version>
     <!--  keeping at this version to align with hbase-->
     <slf4j.version>1.7.25</slf4j.version>

From af4a77774efe36cb7252137a8a04002213b86071 Mon Sep 17 00:00:00 2001
From: Kristen O'Leary <kaoleary@google.com>
Date: Tue, 18 Aug 2020 10:55:33 -0400
Subject: [PATCH 3/3] code format

---
 .../cloud/bigtable/grpc/scanner/ReadRowsAcceptanceTest.java      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bigtable-client-core-parent/bigtable-client-core/src/test/java/com/google/cloud/bigtable/grpc/scanner/ReadRowsAcceptanceTest.java b/bigtable-client-core-parent/bigtable-client-core/src/test/java/com/google/cloud/bigtable/grpc/scanner/ReadRowsAcceptanceTest.java
index 3e512aa744..f7a9bd40a4 100644
--- a/bigtable-client-core-parent/bigtable-client-core/src/test/java/com/google/cloud/bigtable/grpc/scanner/ReadRowsAcceptanceTest.java
+++ b/bigtable-client-core-parent/bigtable-client-core/src/test/java/com/google/cloud/bigtable/grpc/scanner/ReadRowsAcceptanceTest.java
@@ -25,7 +25,6 @@
 import io.grpc.stub.StreamObserver;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;