This is an automated email from the ASF dual-hosted git repository. michaelsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/impala.git
commit 7fb986e47aaabb781876575e5897f56c10769dc0 Author: Michael Smith <[email protected]> AuthorDate: Tue Oct 14 11:58:21 2025 -0700 IMPALA-14504: Use shaded hbase, protobuf from Hadoop Switches to shaded Hbase so it can include its own versions of dependencies. Note that hbase-client includes hbase-common, hbase-protocol. Excludes older protobuf-java from mysql-connector so we get it from Hadoop. Allows orc-format 1.0, which is a dependency in future ORC releases. Change-Id: I386d03c3123ce1159abc54c505f60e0ae619f5fe Reviewed-on: http://gerrit.cloudera.org:8080/23553 Reviewed-by: Joe McDonnell <[email protected]> Reviewed-by: Riza Suminto <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> --- fe/pom.xml | 14 ++++++++------ java/executor-deps/pom.xml | 8 +------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/fe/pom.xml b/fe/pom.xml index 05baf8aac..d73a07ad5 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -200,12 +200,6 @@ under the License. </exclusions> </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-protocol</artifactId> - <version>${hbase.version}</version> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> @@ -239,6 +233,12 @@ under the License. <groupId>com.mysql</groupId> <artifactId>mysql-connector-j</artifactId> <version>8.2.0</version> + <exclusions> + <exclusion> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -852,6 +852,8 @@ under the License. <include>org.apache.parquet:*:${parquet.version}</include> <include>org.apache.orc:*:${orc.version}</include> <include>org.apache.ozone:*:${ozone.version}</include> + <!-- orc-format does not match orc version --> + <include>org.apache.orc:orc-format:1.0</include> </includes> </bannedDependencies> </rules> diff --git a/java/executor-deps/pom.xml b/java/executor-deps/pom.xml index e917c993e..eaace953f 100644 --- a/java/executor-deps/pom.xml +++ b/java/executor-deps/pom.xml @@ -118,13 +118,7 @@ under the License. <dependency> <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <version>${hbase.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-common</artifactId> + <artifactId>hbase-shaded-client-byo-hadoop</artifactId> <version>${hbase.version}</version> </dependency>
