From b9e7f51b0049b666eef434d645893ed1c32ff8db Mon Sep 17 00:00:00 2001
From: Norbert Meszaros <meszinorbi2002@gmail.com>
Date: Fri, 26 Sep 2025 23:43:35 +0200
Subject: [PATCH] PHOENIX-7714 Fix Phoenix build failure caused by Omid
 protobuf version change

---
 phoenix-core-client/pom.xml                                | 5 +++++
 .../apache/phoenix/transaction/OmidTransactionContext.java | 2 +-
 pom.xml                                                    | 7 ++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml
index 6c6cea359e6..4161c3d55dc 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 334ec3108f6..5f638f793ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,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 -->
@@ -380,6 +380,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>