Repository: phoenix Updated Branches: refs/heads/master b06e0fc0c -> fe45d287e
PHOENIX-2568 phoenix-spark: client-spark JAR conflicts with some distributions Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fe45d287 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fe45d287 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fe45d287 Branch: refs/heads/master Commit: fe45d287eab8b5f897b06088d4f2e5cb058d90ff Parents: b06e0fc Author: Josh Mahonin <[email protected]> Authored: Thu Jan 7 09:17:57 2016 -0500 Committer: Josh Mahonin <[email protected]> Committed: Thu Jan 7 09:17:57 2016 -0500 ---------------------------------------------------------------------- phoenix-assembly/src/build/client-spark.xml | 13 ------------- 1 file changed, 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe45d287/phoenix-assembly/src/build/client-spark.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/src/build/client-spark.xml b/phoenix-assembly/src/build/client-spark.xml index 748f1d8..10b9163 100644 --- a/phoenix-assembly/src/build/client-spark.xml +++ b/phoenix-assembly/src/build/client-spark.xml @@ -31,16 +31,6 @@ </formats> <includeBaseDirectory>false</includeBaseDirectory> - <containerDescriptorHandlers> - <containerDescriptorHandler> - <!-- - aggregate SPI's so that things like HDFS FileSystem works in uberjar - http://docs.oracle.com/javase/tutorial/sound/SPI-intro.html - --> - <handlerName>metaInf-services</handlerName> - </containerDescriptorHandler> - </containerDescriptorHandlers> - <componentDescriptors> <componentDescriptor>src/build/components-minimal.xml</componentDescriptor> </componentDescriptors> @@ -59,7 +49,6 @@ <include>commons-codec:commons-codec</include> <include>co.cask.tephra:tephra*</include> <include>org.apache.twill:twill*</include> - <include>org.apache.thrift:*</include> <include>com.google.code.gson:gson*</include> <!-- We use a newer version of guava than HBase - this might be an issue? --> <include>com.google.guava:guava</include> @@ -75,8 +64,6 @@ <include>commons-lang:commons-lang</include> <include>commons-cli:commons-cli</include> <include>org.apache.commons:commons-csv</include> - <include>org.codehaus.jackson:jackson-mapper-asl</include> - <include>org.codehaus.jackson:jackson-core-asl</include> <include>commons-collections:commons-collections</include> <include>joda-time:joda-time</include> <include>org.jruby.joni:joni</include>
