This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new 623ba47dcd PHOENIX-6893 Remove explicit dependency declaration on
hbase-thirdparty artifacts
623ba47dcd is described below
commit 623ba47dcdde465bcada05fb4fe96298921a583e
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Mar 6 13:48:35 2023 +0100
PHOENIX-6893 Remove explicit dependency declaration on hbase-thirdparty
artifacts
---
phoenix-core/pom.xml | 8 --------
phoenix-pherf/pom.xml | 4 ----
phoenix-server/pom.xml | 11 +----------
pom.xml | 21 +++++----------------
4 files changed, 6 insertions(+), 38 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 1299653f18..e6d7c35670 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -355,14 +355,6 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-zookeeper</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>hbase-shaded-miscellaneous</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>hbase-shaded-protobuf</artifactId>
- </dependency>
<!-- HBase test dependencies -->
<dependency>
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 62e6d46f6b..4ef0b92670 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -157,10 +157,6 @@
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>hbase-shaded-miscellaneous</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index c66538860c..ff47520a8e 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -120,6 +120,7 @@
<exclude>ch.qos.reload4j:*</exclude>
<exclude>org.slf4j:*</exclude>
<exclude>org.apache.logging.log4j:*</exclude>
+ <exclude>org.apache.hbase.thirdparty:*</exclude>
</excludes>
</artifactSet>
<filters>
@@ -344,16 +345,6 @@
<artifactId>hbase-zookeeper</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>hbase-shaded-miscellaneous</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>hbase-shaded-protobuf</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
diff --git a/pom.xml b/pom.xml
index 454b0ded3d..3cb3809677 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,6 @@
<!-- These are expected to be overridden to conform to cluster versions
along with hbase.version (defined in profiles) -->
<hadoop.version>3.1.4</hadoop.version>
- <hbase.thirdparty.version>2.2.1</hbase.thirdparty.version>
<phoenix.thirdparty.version>2.0.0</phoenix.thirdparty.version>
<hbase.suffix>hbase-${hbase.profile}</hbase.suffix>
@@ -394,8 +393,13 @@
</ignoredUnusedDeclaredDependencies>
<ignoredUsedUndeclaredDependencies>
<ignoredUsedUndeclaredDependency>
+ <!-- couldn't figure out what's the deal with this -->
dnsjava:dnsjava
</ignoredUsedUndeclaredDependency>
+ <ignoredUsedUndeclaredDependency>
+ <!-- These change too frequently, so we just rely on the
hbase transitive deps -->
+ org.apache.hbase.thirdparty:*
+ </ignoredUsedUndeclaredDependency>
</ignoredUsedUndeclaredDependencies>
</configuration>
<executions>
@@ -996,17 +1000,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>hbase-shaded-miscellaneous</artifactId>
- <version>${hbase.thirdparty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>hbase-shaded-protobuf</artifactId>
- <version>${hbase.thirdparty.version}</version>
- </dependency>
-
<!-- HBase test dependencies -->
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -1552,7 +1545,6 @@
<hbase.profile>2.4</hbase.profile>
<hbase.compat.version>2.4.1</hbase.compat.version>
<hbase.version>${hbase-2.4.runtime.version}</hbase.version>
- <hbase.thirdparty.version>3.4.1</hbase.thirdparty.version>
</properties>
</profile>
<profile>
@@ -1568,7 +1560,6 @@
<hbase.profile>2.4.0</hbase.profile>
<hbase.compat.version>2.4.0</hbase.compat.version>
<hbase.version>${hbase-2.4.0.runtime.version}</hbase.version>
- <hbase.thirdparty.version>3.4.1</hbase.thirdparty.version>
</properties>
</profile>
<profile>
@@ -1584,7 +1575,6 @@
<hbase.profile>2.4</hbase.profile>
<hbase.compat.version>2.4.1</hbase.compat.version>
<hbase.version>${hbase-2.4.runtime.version}</hbase.version>
- <hbase.thirdparty.version>3.4.1</hbase.thirdparty.version>
</properties>
</profile>
<profile>
@@ -1601,7 +1591,6 @@
<hbase.compat.version>2.5.0</hbase.compat.version>
<hadoop.version>3.2.3</hadoop.version>
<hbase.version>${hbase-2.5.runtime.version}</hbase.version>
- <hbase.thirdparty.version>4.1.1</hbase.thirdparty.version>
<tephra.hbase.compat.version>2.4</tephra.hbase.compat.version>
</properties>
</profile>
