This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 4.x in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push: new 4ddbe26 PHOENIX-6063 Remove bugus jline and sqlline dependency from phoenix-core 4ddbe26 is described below commit 4ddbe2688b78645bc73857141cec12cb1c08993b Author: Istvan Toth <st...@apache.org> AuthorDate: Thu Aug 6 11:16:31 2020 +0200 PHOENIX-6063 Remove bugus jline and sqlline dependency from phoenix-core and add it to phoenix-client instead Closes #851 --- phoenix-client/pom.xml | 4 ++++ phoenix-core/pom.xml | 8 -------- .../org/apache/phoenix/end2end/index/MutableIndexExtendedIT.java | 1 - .../java/org/apache/phoenix/pherf/workload/WorkloadExecutor.java | 1 - 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index 58af450..7ce1a8c 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -409,6 +409,10 @@ <artifactId>phoenix-core</artifactId> </dependency> <dependency> + <groupId>sqlline</groupId> + <artifactId>sqlline</artifactId> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>1.7.7</version> diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 700fe8c..549ecb0 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -283,14 +283,6 @@ <artifactId>antlr-runtime</artifactId> </dependency> <dependency> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - </dependency> - <dependency> - <groupId>sqlline</groupId> - <artifactId>sqlline</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexExtendedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexExtendedIT.java index 8676da0..1268058 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexExtendedIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexExtendedIT.java @@ -17,7 +17,6 @@ */ package org.apache.phoenix.end2end.index; -import jline.internal.Log; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.*; diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WorkloadExecutor.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WorkloadExecutor.java index ff599b8..1d38e3d 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WorkloadExecutor.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/WorkloadExecutor.java @@ -19,7 +19,6 @@ package org.apache.phoenix.pherf.workload; import com.google.common.annotations.VisibleForTesting; -import jline.internal.TestAccessible; import org.apache.phoenix.pherf.PherfConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory;