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 b7881aee20 PHOENIX-7613 Update Apache parent pom to 31 (#2172)
b7881aee20 is described below
commit b7881aee20c499dc2fde81b2b6f7d3ed56bbba77
Author: Istvan Toth <[email protected]>
AuthorDate: Fri Nov 7 08:47:22 2025 +0100
PHOENIX-7613 Update Apache parent pom to 31 (#2172)
also clean up some test/compile dependency scopes
---
phoenix-core/pom.xml | 24 ++++++++++++++++++++++--
phoenix-pherf/pom.xml | 5 +++++
pom.xml | 17 +++++++++++++----
3 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 32080670f1..0570a64a8d 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -31,6 +31,9 @@
</properties>
<dependencies>
+ <!-- As phoenix-core servers both as a module for tests and as a backwards
compatibility module
+ phoenix-core-client and phoenix-core-server must be compile scope so that
dependents get
+ all required transitive dependencies -->
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-core-client</artifactId>
@@ -108,6 +111,12 @@
<artifactId>hbase-zookeeper</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-zookeeper</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-hadoop2-compat</artifactId>
@@ -129,12 +138,14 @@
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
+ <scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mongodb/bson -->
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>bson</artifactId>
+ <scope>test</scope>
</dependency>
<!-- Omid dependencies -->
@@ -163,7 +174,6 @@
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
@@ -248,12 +258,14 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
+ <scope>test</scope>
</dependency>
<!-- Other test dependencies -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.phoenix.thirdparty</groupId>
@@ -348,14 +360,17 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
+ <scope>test</scope>
</dependency>
<!-- logging -->
@@ -439,7 +454,6 @@
<ignoredUnusedDeclaredDependency>org.apache.hbase:hbase-testing-util</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.apache.omid:omid-hbase-client</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.apache.zookeeper:zookeeper-jute</ignoredUnusedDeclaredDependency>
-
<ignoredUnusedDeclaredDependency>org.apache.phoenix:phoenix-hbase-compat-${hbase.compat.version}</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-api</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
@@ -447,6 +461,12 @@
<ignoredUnusedDeclaredDependency>org.slf4j:jul-to-slf4j</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.slf4j:jcl-over-slf4j</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
+ <ignoredNonTestScopedDependencies>
+
<ignoredNonTestScopedDependency>org.apache.phoenix:phoenix-core-client</ignoredNonTestScopedDependency>
+
<ignoredNonTestScopedDependency>org.apache.phoenix:phoenix-core-server</ignoredNonTestScopedDependency>
+
<ignoredNonTestScopedDependency>org.apache.phoenix:phoenix-hbase-compat-${hbase.compat.version}</ignoredNonTestScopedDependency>
+
<ignoredNonTestScopedDependency>org.apache.hbase.thirdparty:hbase-shaded-miscellaneous</ignoredNonTestScopedDependency>
+ </ignoredNonTestScopedDependencies>
<ignoredUsedUndeclaredDependencies/>
</configuration>
<executions>
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index e02e8d8ae6..a2fff7b36f 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -201,6 +201,11 @@
<scope>test</scope>
<optional>false</optional>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-it</artifactId>
diff --git a/pom.xml b/pom.xml
index 3114d5e4a9..f7a553bd3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>30</version>
+ <version>31</version>
</parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix</artifactId>
@@ -157,7 +157,6 @@
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
<exec-maven-plugin.version>3.1.1</exec-maven-plugin.version>
- <maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version>
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
<!-- This overrides the property in the ASF parent project-->
<version.maven-site-plugin>3.21.0</version.maven-site-plugin>
@@ -898,6 +897,18 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-zookeeper</artifactId>
+ <version>${hbase.version}</version>
+ <type>test-jar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- HBase test dependencies -->
<dependency>
@@ -1602,7 +1613,6 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.1</version>
<configuration>
<ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>org.apache.omid:*</ignoredUnusedDeclaredDependency>
@@ -1750,7 +1760,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin.version}</version>
<configuration>
<configLocation>${top.dir}/src/main/config/checkstyle/checker.xml</configLocation>
<suppressionsLocation>${top.dir}/src/main/config/checkstyle/suppressions.xml</suppressionsLocation>
