You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2019/12/17 16:03:59 UTC
[phoenix] branch master updated: PHOENIX-5635 Refactor curator
dependency handling and clean up erroneous direct references
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 ac6831f PHOENIX-5635 Refactor curator dependency handling and clean up erroneous direct references
ac6831f is described below
commit ac6831fe32ecfc44ee0cf160d361f04b6afd5894
Author: Istvan Toth <st...@stoty.hu>
AuthorDate: Tue Dec 17 16:04:55 2019 +0100
PHOENIX-5635 Refactor curator dependency handling and clean up erroneous direct references
---
phoenix-core/pom.xml | 32 ----------------------
.../phoenix/end2end/SplitSystemCatalogIT.java | 2 +-
.../it/java/org/apache/phoenix/end2end/ViewIT.java | 2 +-
.../org/apache/phoenix/iterate/PhoenixQueues.java | 2 +-
pom.xml | 20 ++++++++++++--
5 files changed, 20 insertions(+), 38 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 69dd5d6..e6c5021 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -192,19 +192,6 @@
<artifactId>omid-hbase-client-hbase2.x</artifactId>
<exclusions>
<exclusion>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-recipes</artifactId>
- </exclusion>
-
- <exclusion>
<groupId>org.apache.omid</groupId>
<artifactId>omid-hbase-commit-table-hbase1.x</artifactId>
</exclusion>
@@ -338,18 +325,6 @@
<type>test-jar</type>
<exclusions>
<exclusion>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-recipes</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.apache.omid</groupId>
<artifactId>omid-hbase-common-hbase1.x</artifactId>
</exclusion>
@@ -646,13 +621,6 @@
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
- </dependency>
-
-
</dependencies>
<reporting>
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SplitSystemCatalogIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SplitSystemCatalogIT.java
index 673c632..9d95825 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SplitSystemCatalogIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SplitSystemCatalogIT.java
@@ -25,13 +25,13 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.curator.shaded.com.google.common.collect.Lists;
import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
/**
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
index 14e067b..1ee3dd7 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
@@ -53,7 +53,6 @@ import java.util.concurrent.Future;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
-import org.apache.curator.shaded.com.google.common.collect.Lists;
import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Scan;
@@ -90,6 +89,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@RunWith(Parameterized.class)
public class ViewIT extends SplitSystemCatalogIT {
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/PhoenixQueues.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/PhoenixQueues.java
index 1685f5e..a987a32 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/PhoenixQueues.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/PhoenixQueues.java
@@ -21,13 +21,13 @@ import java.io.IOException;
import java.util.Comparator;
import java.util.LinkedList;
-import org.apache.curator.shaded.com.google.common.collect.Lists;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.iterate.OrderedResultIterator.ResultEntry;
import org.apache.phoenix.schema.tuple.Tuple;
import org.apache.phoenix.util.PhoenixKeyValueUtil;
+import com.google.common.collect.Lists;
import com.google.common.collect.MinMaxPriorityQueue;
public class PhoenixQueues {
diff --git a/pom.xml b/pom.xml
index 3c73d3f..2357516 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<!-- Set default encoding so multi-byte tests work correctly on the Mac -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <curator.version>4.0.0</curator.version>
+ <curator.version>4.0.0</curator.version>
</properties>
@@ -792,8 +792,22 @@
</exclusion>
</exclusions>
</dependency>
-
-
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-client</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-recipes</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
+
<!-- Make sure we have all the antlr dependencies -->
<dependency>
<groupId>org.antlr</groupId>