This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push: new 164f5f5bee PHOENIX-6893 Remove explicit dependency declaration on hbase-thirdparty artifacts 164f5f5bee is described below commit 164f5f5beeac6f901809166ce1945126b65d88b7 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 | 9 --------- phoenix-pherf/pom.xml | 4 ---- phoenix-server/pom.xml | 11 +---------- pom.xml | 17 ----------------- 4 files changed, 1 insertion(+), 40 deletions(-) diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 9d24733cc2..7f753c94d3 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -342,15 +342,6 @@ <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> <groupId>org.apache.hbase</groupId> diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 513cfa256b..c1cc21c597 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 1f3eba0cc7..1e5969183a 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -121,6 +121,7 @@ <exclude>org.slf4j:slf4j-api</exclude> <exclude>org.slf4j:slf4j-log4j12</exclude> <exclude>org.slf4j:slf4j-reload4j</exclude> + <exclude>org.apache.hbase.thirdparty:*</exclude> </excludes> </artifactSet> <filters> @@ -362,16 +363,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 94702faf0d..9515d08fb2 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,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>1.1.0</phoenix.thirdparty.version> <hbase.suffix>hbase-${hbase.profile}</hbase.suffix> @@ -983,17 +982,6 @@ <version>${hbase.version}</version> </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> @@ -1659,7 +1647,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> <zookeeper.version>3.5.7</zookeeper.version> <tephra.hbase.compat.version>2.4</tephra.hbase.compat.version> </properties> @@ -1713,7 +1700,6 @@ <hbase.profile>2.3</hbase.profile> <hbase.compat.version>2.3.0</hbase.compat.version> <hbase.version>${hbase-2.3.runtime.version}</hbase.version> - <hbase.thirdparty.version>3.3.0</hbase.thirdparty.version> <zookeeper.version>3.5.7</zookeeper.version> <hadoop.version>3.1.3</hadoop.version> <tephra.hbase.compat.version>2.3</tephra.hbase.compat.version> @@ -1732,7 +1718,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> <zookeeper.version>3.5.7</zookeeper.version> <tephra.hbase.compat.version>2.4</tephra.hbase.compat.version> </properties> @@ -1750,7 +1735,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> <zookeeper.version>3.5.7</zookeeper.version> <tephra.hbase.compat.version>2.4</tephra.hbase.compat.version> </properties> @@ -1769,7 +1753,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> <zookeeper.version>3.5.7</zookeeper.version> <tephra.hbase.compat.version>2.4</tephra.hbase.compat.version> </properties>