This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.2
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.2 by this push:
new eaac76a0f6 PHOENIX-7356 Centralize and update versions for
exclude-only dependencies
eaac76a0f6 is described below
commit eaac76a0f631b2d5a86b41ce59ebd69fb7beafe5
Author: Istvan Toth <[email protected]>
AuthorDate: Thu Jul 11 09:55:57 2024 +0200
PHOENIX-7356 Centralize and update versions for exclude-only dependencies
---
phoenix-mapreduce-byo-shaded-hbase/pom.xml | 12 ++++--------
phoenix-server/pom.xml | 12 ++++--------
pom.xml | 7 +++++++
3 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/phoenix-mapreduce-byo-shaded-hbase/pom.xml
b/phoenix-mapreduce-byo-shaded-hbase/pom.xml
index 9b9c171fcd..da5bd699f6 100644
--- a/phoenix-mapreduce-byo-shaded-hbase/pom.xml
+++ b/phoenix-mapreduce-byo-shaded-hbase/pom.xml
@@ -556,30 +556,26 @@
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
<artifactId>hbase-shaded-netty</artifactId>
- <!-- random version, for exclusion only -->
- <version>4.0.0</version>
+ <version>${hbase-thirdparty.excludeonly.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
<artifactId>hbase-shaded-miscellaneous</artifactId>
- <!-- random version, for exclusion only -->
- <version>4.0.0</version>
+ <version>${hbase-thirdparty.excludeonly.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
<artifactId>hbase-shaded-protobuf</artifactId>
- <!-- random version, for exclusion only -->
- <version>4.0.0</version>
+ <version>${hbase-thirdparty.excludeonly.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- provided by Hadoop -->
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
- <!-- random version, for exclusion only -->
- <version>2.1.1</version>
+ <version>${commons-configuration2.excludeonly.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index ad5cd787eb..8d8493ce1c 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -523,30 +523,26 @@
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
<artifactId>hbase-shaded-netty</artifactId>
- <!-- random version, for exclusion only -->
- <version>4.0.0</version>
+ <version>${hbase-thirdparty.excludeonly.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
<artifactId>hbase-shaded-miscellaneous</artifactId>
- <!-- random version, for exclusion only -->
- <version>4.0.0</version>
+ <version>${hbase-thirdparty.excludeonly.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
<artifactId>hbase-shaded-protobuf</artifactId>
- <!-- random version, for exclusion only -->
- <version>4.0.0</version>
+ <version>${hbase-thirdparty.excludeonly.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- provided by Hadoop -->
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
- <!-- random version, for exclusion only -->
- <version>2.1.1</version>
+ <version>${commons-configuration2.excludeonly.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 9b3daa27fe..195e9ea2d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,6 +140,13 @@
<junit.version>4.13.1</junit.version>
<hdrhistogram.version>2.1.12</hdrhistogram.version>
+ <!-- These are only used for exclusion when shading, and the exact version
is completely
+ irrelevant, but we need to keep them up to date to appease static
checkers. While Phoenix does
+ use theses packages, it does not explicitly depend on them, but instead
takes the transitve
+ dependencies from the Hadoop/HBase version used for building. -->
+
<comons-configuration2.excludeonly.version>2.10.1</comons-configuration2.excludeonly.version>
+
<hbase-thirdparty.excludeonly.version>4.1.7</hbase-thirdparty.excludeonly.version>
+
<!-- Plugin versions -->
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
<maven-build-helper-plugin.version>3.5.0</maven-build-helper-plugin.version>
