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 68bd519 PHOENIX-6349 Add and use commons-cli to phoenix-thirdparty 68bd519 is described below commit 68bd5193bd45e03346a947e05dc02a6ad0ba7554 Author: Istvan Toth <st...@apache.org> AuthorDate: Fri Jan 29 13:36:21 2021 +0100 PHOENIX-6349 Add and use commons-cli to phoenix-thirdparty --- phoenix-core/pom.xml | 4 ++-- .../java/org/apache/phoenix/end2end/End2EndTestDriver.java | 1 + .../org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java | 14 +++++++------- .../java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java | 6 +++--- .../org/apache/phoenix/mapreduce/JsonBulkLoadTool.java | 2 +- .../java/org/apache/phoenix/mapreduce/OrphanViewTool.java | 14 +++++++------- .../java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java | 14 +++++++------- .../org/apache/phoenix/mapreduce/RegexBulkLoadTool.java | 6 +++--- .../apache/phoenix/mapreduce/index/IndexScrutinyTool.java | 14 +++++++------- .../java/org/apache/phoenix/mapreduce/index/IndexTool.java | 14 +++++++------- .../apache/phoenix/mapreduce/index/IndexUpgradeTool.java | 14 +++++++------- .../apache/phoenix/schema/stats/UpdateStatisticsTool.java | 14 +++++++------- .../apache/phoenix/util/MergeViewIndexIdSequencesTool.java | 14 +++++++------- .../main/java/org/apache/phoenix/util/PhoenixRuntime.java | 14 +++++++------- .../test/java/org/apache/phoenix/index/IndexToolTest.java | 2 +- .../org/apache/phoenix/index/IndexUpgradeToolTest.java | 2 +- .../org/apache/phoenix/mapreduce/BulkLoadToolTest.java | 2 +- phoenix-pherf/pom.xml | 6 +++--- .../src/main/java/org/apache/phoenix/pherf/Pherf.java | 12 ++++++------ phoenix-server/pom.xml | 1 + phoenix-tools/pom.xml | 4 ++-- .../org/apache/phoenix/schema/SchemaExtractionTool.java | 14 +++++++------- pom.xml | 9 +++++---- 23 files changed, 100 insertions(+), 97 deletions(-) diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 5120edd..7791aa3 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -376,8 +376,8 @@ <artifactId>htrace-core</artifactId> </dependency> <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> + <groupId>org.apache.phoenix.thirdparty</groupId> + <artifactId>phoenix-shaded-commons-cli</artifactId> </dependency> <dependency> <groupId>commons-codec</groupId> diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/End2EndTestDriver.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/End2EndTestDriver.java index 07c12be..3eb2aa4 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/End2EndTestDriver.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/End2EndTestDriver.java @@ -27,6 +27,7 @@ import java.util.Set; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +//This is coming from HBase 1.x, and is intentionally not using the phoenix-thirdparty version import org.apache.commons.cli.CommandLine; import org.apache.hadoop.hbase.ClassFinder; import org.apache.hadoop.hbase.ClassFinder.FileNameFilter; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java index 396bf02..d4582b6 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java @@ -27,13 +27,13 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.PosixParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLineParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.HelpFormatter; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Option; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Options; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.ParseException; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.PosixParser; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.Path; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java index a00dcb8..6e73be7 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java @@ -20,9 +20,9 @@ package org.apache.phoenix.mapreduce; import java.sql.SQLException; import java.util.List; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Option; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Options; import org.apache.commons.lang.StringEscapeUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.Job; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/JsonBulkLoadTool.java b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/JsonBulkLoadTool.java index 1bea3f0..4a14b3a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/JsonBulkLoadTool.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/JsonBulkLoadTool.java @@ -20,7 +20,7 @@ package org.apache.phoenix.mapreduce; import java.sql.SQLException; import java.util.List; -import org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.util.ToolRunner; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java index a916a60..d53f884 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java @@ -47,13 +47,13 @@ import java.util.Map; import java.util.Objects; import java.util.Properties; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.PosixParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLineParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.HelpFormatter; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Option; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Options; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.ParseException; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.PosixParser; import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java index 153e7be..1960d6d 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java @@ -17,13 +17,13 @@ */ package org.apache.phoenix.mapreduce; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.PosixParser; -import org.apache.commons.cli.ParseException; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLineParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Option; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Options; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.HelpFormatter; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.PosixParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.ParseException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.hbase.HBaseConfiguration; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/RegexBulkLoadTool.java b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/RegexBulkLoadTool.java index 94544c9..c29c8ed 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/RegexBulkLoadTool.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/RegexBulkLoadTool.java @@ -20,9 +20,9 @@ package org.apache.phoenix.mapreduce; import java.sql.SQLException; import java.util.List; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Option; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Options; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.util.ToolRunner; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java index f404244..ffdf60c 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java @@ -24,13 +24,13 @@ import java.util.List; import com.google.common.base.Strings; import com.google.inject.Inject; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.PosixParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLineParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.HelpFormatter; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Option; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Options; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.ParseException; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.PosixParser; import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java index 57b6208..8b586a9 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java @@ -39,13 +39,13 @@ import java.util.UUID; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLineParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.DefaultParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.HelpFormatter; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Option; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Options; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.ParseException; import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java index 0034f2c..7cd963d 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java @@ -19,13 +19,13 @@ package org.apache.phoenix.mapreduce.index; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.PosixParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLineParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.HelpFormatter; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Option; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Options; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.ParseException; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.PosixParser; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.hbase.HConstants; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/UpdateStatisticsTool.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/UpdateStatisticsTool.java index 26c6148..763d913 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/UpdateStatisticsTool.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/UpdateStatisticsTool.java @@ -18,13 +18,13 @@ package org.apache.phoenix.schema.stats; import org.antlr.runtime.CharStream; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.PosixParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLineParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.HelpFormatter; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Option; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Options; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.ParseException; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.PosixParser; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseConfiguration; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/MergeViewIndexIdSequencesTool.java b/phoenix-core/src/main/java/org/apache/phoenix/util/MergeViewIndexIdSequencesTool.java index cfd6d84..8512e0e 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/MergeViewIndexIdSequencesTool.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/MergeViewIndexIdSequencesTool.java @@ -17,13 +17,13 @@ */ package org.apache.phoenix.util; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.PosixParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLineParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.HelpFormatter; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Option; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Options; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.ParseException; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.PosixParser; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.hbase.HBaseConfiguration; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java index ac4447f..e47bece 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java @@ -44,13 +44,13 @@ import java.util.TreeSet; import javax.annotation.Nullable; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.PosixParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLineParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.HelpFormatter; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Option; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Options; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.ParseException; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.PosixParser; import org.apache.commons.lang.StringEscapeUtils; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HConstants; diff --git a/phoenix-core/src/test/java/org/apache/phoenix/index/IndexToolTest.java b/phoenix-core/src/test/java/org/apache/phoenix/index/IndexToolTest.java index 916552b..31c59ad 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/index/IndexToolTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/index/IndexToolTest.java @@ -17,7 +17,7 @@ */ package org.apache.phoenix.index; -import org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; import org.apache.phoenix.end2end.IndexToolIT; import org.apache.phoenix.mapreduce.index.IndexScrutinyTool; import org.apache.phoenix.mapreduce.index.IndexTool; diff --git a/phoenix-core/src/test/java/org/apache/phoenix/index/IndexUpgradeToolTest.java b/phoenix-core/src/test/java/org/apache/phoenix/index/IndexUpgradeToolTest.java index 0ce54fb..10ccdf6 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/index/IndexUpgradeToolTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/index/IndexUpgradeToolTest.java @@ -26,7 +26,7 @@ import java.util.Collection; import java.util.List; import java.util.UUID; -import org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; diff --git a/phoenix-core/src/test/java/org/apache/phoenix/mapreduce/BulkLoadToolTest.java b/phoenix-core/src/test/java/org/apache/phoenix/mapreduce/BulkLoadToolTest.java index 425c333..d015f3d 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/mapreduce/BulkLoadToolTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/mapreduce/BulkLoadToolTest.java @@ -20,7 +20,7 @@ package org.apache.phoenix.mapreduce; import java.util.Arrays; import java.util.Collection; -import org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; import org.apache.phoenix.util.SchemaUtil; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 2afb780..e067a17 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -63,8 +63,8 @@ <version>3.3</version> </dependency> <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> + <groupId>org.apache.phoenix.thirdparty</groupId> + <artifactId>phoenix-shaded-commons-cli</artifactId> </dependency> <!-- Test Dependencies --> @@ -230,7 +230,7 @@ <include>com.googlecode.java-diff-utils:diffutils</include> <include>org.apache.commons:commons-lang3</include> <include>org.apache.commons:commons-math3</include> - <include>commons-cli:commons-cli</include> + <include>org.apache.phoenix.thirdparty:phoenix-shaded-commons-cli</include> <include>joda-time:joda-time</include> <include>org.apache.commons:commons-csv</include> <include>commons-lang:commons-lang</include> diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java index 2572a34..cae3213 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java @@ -25,12 +25,12 @@ import java.util.List; import java.util.Properties; import com.google.common.annotations.VisibleForTesting; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.PosixParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLineParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.HelpFormatter; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Options; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.ParseException; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.PosixParser; import org.apache.phoenix.pherf.PherfConstants.CompareType; import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats; import org.apache.phoenix.pherf.configuration.XMLConfigParser; diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 69e593f..1e5ca5b 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -98,6 +98,7 @@ <artifactSet> <includes> <include>org.apache.phoenix:phoenix-core</include> + <include>org.apache.phoenix.thirdparty:phoenix-shaded-commons-cli</include> <include>org.apache.phoenix:phoenix-hbase-compat-${hbase.compat.version}</include> <include>org.iq80.snappy:snappy</include> <include>org.antlr:antlr*</include> diff --git a/phoenix-tools/pom.xml b/phoenix-tools/pom.xml index 7afb95e..847abc0 100644 --- a/phoenix-tools/pom.xml +++ b/phoenix-tools/pom.xml @@ -52,8 +52,8 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> + <groupId>org.apache.phoenix.thirdparty</groupId> + <artifactId>phoenix-shaded-commons-cli</artifactId> </dependency> <dependency> diff --git a/phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaExtractionTool.java b/phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaExtractionTool.java index 8f0042b..8301507 100644 --- a/phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaExtractionTool.java +++ b/phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaExtractionTool.java @@ -17,13 +17,13 @@ */ package org.apache.phoenix.schema; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.PosixParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLineParser; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.HelpFormatter; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Option; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.Options; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.ParseException; +import org.apache.phoenix.thirdparty.org.apache.commons.cli.PosixParser; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; diff --git a/pom.xml b/pom.xml index c0dea31..4739f50 100644 --- a/pom.xml +++ b/pom.xml @@ -82,6 +82,8 @@ <hadoop-two.version>2.7.5</hadoop-two.version> <hbase.suffix>hbase-${hbase.profile}</hbase.suffix> + <phoenix.thirdparty.version>1.1.0</phoenix.thirdparty.version> + <!-- This is used by the release script only --> <hbase.profile.list>1.3 1.4 1.5 1.6</hbase.profile.list> <!-- The default hbase versions to build with (override with hbase.version) --> @@ -97,7 +99,6 @@ <top.dir>${project.basedir}</top.dir> <!-- Dependency versions --> - <commons-cli.version>1.4</commons-cli.version> <hive.version>1.2.1</hive.version> <hadoop.version>2.7.1</hadoop.version> <pig.version>0.13.0</pig.version> @@ -1059,9 +1060,9 @@ <version>${slf4j.version}</version> </dependency> <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>${commons-cli.version}</version> + <groupId>org.apache.phoenix.thirdparty</groupId> + <artifactId>phoenix-shaded-commons-cli</artifactId> + <version>${phoenix.thirdparty.version}</version> </dependency> <dependency> <groupId>org.apache.htrace</groupId>