Repository: phoenix Updated Branches: refs/heads/txn aaf8b4fe6 -> 0d44dd806
More pom changes Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/0d44dd80 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/0d44dd80 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/0d44dd80 Branch: refs/heads/txn Commit: 0d44dd806bf0473a7d1884fab5c3e9841f0baf9d Parents: aaf8b4f Author: Thomas D'Silva <[email protected]> Authored: Fri Mar 13 15:46:11 2015 -0700 Committer: Thomas D'Silva <[email protected]> Committed: Fri Mar 13 15:46:11 2015 -0700 ---------------------------------------------------------------------- bin/phoenix_utils.py | 2 +- phoenix-assembly/src/build/client.xml | 4 ++++ phoenix-assembly/src/build/server.xml | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/0d44dd80/bin/phoenix_utils.py ---------------------------------------------------------------------- diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py index 5a9145d..eb17c43 100755 --- a/bin/phoenix_utils.py +++ b/bin/phoenix_utils.py @@ -49,7 +49,7 @@ def findFileInPathWithoutRecursion(pattern, path): return "" def setPath(): - PHOENIX_CLIENT_JAR_PATTERN = "phoenix-*-client*.jar" + PHOENIX_CLIENT_JAR_PATTERN = "phoenix-*-client.jar" PHOENIX_TESTS_JAR_PATTERN = "phoenix-core-*-tests*.jar" global current_dir current_dir = os.path.dirname(os.path.abspath(__file__)) http://git-wip-us.apache.org/repos/asf/phoenix/blob/0d44dd80/phoenix-assembly/src/build/client.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/src/build/client.xml b/phoenix-assembly/src/build/client.xml index f674331..4df6b0a 100644 --- a/phoenix-assembly/src/build/client.xml +++ b/phoenix-assembly/src/build/client.xml @@ -49,6 +49,10 @@ <include>org.cloudera.htrace:htrace-core</include> <include>io.netty:netty</include> <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> </includes> </dependencySet> http://git-wip-us.apache.org/repos/asf/phoenix/blob/0d44dd80/phoenix-assembly/src/build/server.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/src/build/server.xml b/phoenix-assembly/src/build/server.xml index 5ec2106..12a0569 100644 --- a/phoenix-assembly/src/build/server.xml +++ b/phoenix-assembly/src/build/server.xml @@ -36,6 +36,8 @@ <includes> <include>org.apache.phoenix:phoenix-core</include> <include>org.iq80.snappy:snappy</include> + <include>co.cask.tephra:tephra*</include> + <include>com.google.code.gson:gson*</include> </includes> </dependencySet> <dependencySet>
