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 5071df2875 PHOENIX-6904 Clean up some dependencies
5071df2875 is described below
commit 5071df287537a44677a4dba21da74011873471cf
Author: Istvan Toth <st...@apache.org>
AuthorDate: Tue Mar 14 08:25:46 2023 +0100
PHOENIX-6904 Clean up some dependencies
---
phoenix-core/pom.xml | 35 +++++++---------------
.../org/apache/phoenix/jdbc/FailoverPolicy.java | 5 ++--
pom.xml | 30 ++++++++++++++++---
3 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index e6d7c35670..9e76f75967 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -276,18 +276,10 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-annotations</artifactId>
- </dependency>
<!-- Hadoop test dependencies -->
<dependency>
@@ -298,14 +290,18 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop.version}</version>
<scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
<type>test-jar</type>
+ <classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -398,6 +394,10 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper-jute</artifactId>
+ </dependency>
<!-- Transaction dependencies -->
<!-- Omid dependencies -->
@@ -553,10 +553,6 @@
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper-jute</artifactId>
- </dependency>
<dependency>
<groupId>org.jruby.joni</groupId>
<artifactId>joni</artifactId>
@@ -568,17 +564,6 @@
<dependency>
<groupId>org.hdrhistogram</groupId>
<artifactId>HdrHistogram</artifactId>
- <version>2.1.12</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2.3-1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.4.4</version>
</dependency>
<!-- Other test dependencies -->
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/FailoverPolicy.java
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/FailoverPolicy.java
index 52e9da5159..4d81bfd9a2 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/FailoverPolicy.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/FailoverPolicy.java
@@ -21,10 +21,10 @@ import java.sql.Connection;
import java.util.Properties;
import org.apache.commons.lang3.StringUtils;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.http.annotation.Immutable;
import org.apache.phoenix.exception.FailoverSQLException;
+import net.jcip.annotations.Immutable;
+
/**
* A failover policy defines how failover connection deals with existing
connections in case of
* cluster role transition is detected.
@@ -94,7 +94,6 @@ public interface FailoverPolicy {
* In case of {@link FailoverSQLException} exception, clients can still
re-connect to this HA
* group by creating a new failover connection, OR call static method
failover() explicitly.
*/
- @InterfaceStability.Unstable
class FailoverToActivePolicy implements FailoverPolicy {
public static final String NAME = "active";
private static final int MAX_FAILOVER_COUNT_DEFAULT = 3;
diff --git a/pom.xml b/pom.xml
index 90be0f4a14..96b9658802 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,6 +131,7 @@
<mockito.version>1.10.19</mockito.version>
<junit.version>4.13.1</junit.version>
<hamcrest.version>1.3</hamcrest.version>
+ <hdrhistogram.version>2.1.12</hdrhistogram.version>
<!-- Plugin versions -->
<maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version>
@@ -386,10 +387,6 @@
<ignoredUnusedDeclaredDependency>
org.apache.logging.log4j:log4j-core
</ignoredUnusedDeclaredDependency>
- <ignoredUnusedDeclaredDependency>
- <!-- Needed for Hbase 2.5 -->
- com.sun.xml.bind:jaxb-impl
- </ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
<ignoredUsedUndeclaredDependencies>
<ignoredUsedUndeclaredDependency>
@@ -734,6 +731,26 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <type>test-jar</type>
+ <version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core4</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
@@ -1433,6 +1450,11 @@
<artifactId>jcodings</artifactId>
<version>${jcodings.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.hdrhistogram</groupId>
+ <artifactId>HdrHistogram</artifactId>
+ <version>${hdrhistogram.version}</version>
+ </dependency>
<!-- Other test dependencies -->
<dependency>
