Skip to content

PHOENIX-7714 Fix Phoenix build failure caused by Omid protobuf versio… #2299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −2
Draft

PHOENIX-7714 Fix Phoenix build failure caused by Omid protobuf versio… #2299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions phoenix-core-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 6 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down