Skip to content

Commit 0d19952

Browse files
committed
PHOENIX-7714 Fix Phoenix build failure caused by Omid protobuf version change
1 parent 5466a0d commit 0d19952

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

phoenix-core-client/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434
<artifactId>phoenix-shaded-guava</artifactId>
3535
</dependency>
3636

37+
<dependency>
38+
<groupId>org.apache.phoenix.thirdparty</groupId>
39+
<artifactId>phoenix-shaded-protobuf</artifactId>
40+
</dependency>
41+
3742
<!-- HBase compat dependency -->
3843
<dependency>
3944
<groupId>org.apache.phoenix</groupId>

phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package org.apache.phoenix.transaction;
1919

20-
import com.google.protobuf.InvalidProtocolBufferException;
20+
import org.apache.phoenix.thirdparty.com.google.protobuf.InvalidProtocolBufferException;
2121
import java.sql.SQLException;
2222
import java.util.Arrays;
2323
import java.util.HashSet;

pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
along with hbase.version (defined in profiles) -->
6969
<hadoop.version>3.4.2</hadoop.version>
7070

71-
<phoenix.thirdparty.version>2.1.0</phoenix.thirdparty.version>
71+
<phoenix.thirdparty.version>2.2.0</phoenix.thirdparty.version>
7272
<hbase.suffix>hbase-${hbase.profile}</hbase.suffix>
7373

7474
<!-- This is used by the release script only -->
@@ -359,6 +359,11 @@
359359
<artifactId>phoenix-shaded-guava</artifactId>
360360
<version>${phoenix.thirdparty.version}</version>
361361
</dependency>
362+
<dependency>
363+
<groupId>org.apache.phoenix.thirdparty</groupId>
364+
<artifactId>phoenix-shaded-protobuf</artifactId>
365+
<version>${phoenix.thirdparty.version}</version>
366+
</dependency>
362367
<dependency>
363368
<groupId>org.apache.phoenix</groupId>
364369
<artifactId>phoenix-hbase-compat-2.5.0</artifactId>

0 commit comments

Comments
 (0)