diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml
index 07769c9f685..7e733d196eb 100644
--- a/phoenix-core-client/pom.xml
+++ b/phoenix-core-client/pom.xml
@@ -34,6 +34,11 @@
       <artifactId>phoenix-shaded-guava</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.phoenix.thirdparty</groupId>
+      <artifactId>phoenix-shaded-protobuf</artifactId>
+    </dependency>
+
     <!-- HBase compat dependency -->
     <dependency>
       <groupId>org.apache.phoenix</groupId>
diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionContext.java b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionContext.java
index ab862423b66..ef27d34bb94 100644
--- a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionContext.java
+++ b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionContext.java
@@ -17,7 +17,7 @@
  */
 package org.apache.phoenix.transaction;
 
-import com.google.protobuf.InvalidProtocolBufferException;
+import org.apache.phoenix.thirdparty.com.google.protobuf.InvalidProtocolBufferException;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/pom.xml b/pom.xml
index 3114d5e4a9d..d2cabdf9b22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
     along with hbase.version (defined in profiles) -->
     <hadoop.version>3.4.2</hadoop.version>
 
-    <phoenix.thirdparty.version>2.1.0</phoenix.thirdparty.version>
+    <phoenix.thirdparty.version>2.2.0</phoenix.thirdparty.version>
     <hbase.suffix>hbase-${hbase.profile}</hbase.suffix>
 
     <!-- This is used by the release script only -->
@@ -359,6 +359,11 @@
         <artifactId>phoenix-shaded-guava</artifactId>
         <version>${phoenix.thirdparty.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.phoenix.thirdparty</groupId>
+        <artifactId>phoenix-shaded-protobuf</artifactId>
+        <version>${phoenix.thirdparty.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.phoenix</groupId>
         <artifactId>phoenix-hbase-compat-2.5.0</artifactId>