Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.2 ceff81708 -> ef0ea6ad6 refs/heads/4.x-HBase-1.3 c936d8151 -> fc35ccecc refs/heads/4.x-HBase-1.4 214f72a56 -> e8ea05fab refs/heads/master fc550666d -> 59a7dd138
PHOENIX-4909 Missing the phoenix-loadbalancer module dependency in phoenix-assembly/pom.xml Closes #352 Signed-off-by: Josh Elser <els...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/59a7dd13 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/59a7dd13 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/59a7dd13 Branch: refs/heads/master Commit: 59a7dd138c661c743d58421776cb5e731e1cda99 Parents: fc55066 Author: Vitaliy <vit34...@mail.ru> Authored: Wed Sep 19 01:09:01 2018 +0300 Committer: Josh Elser <els...@apache.org> Committed: Wed Oct 31 12:09:08 2018 -0400 ---------------------------------------------------------------------- bin/phoenix_utils.py | 2 ++ phoenix-assembly/pom.xml | 4 ++++ phoenix-assembly/src/build/components/all-common-jars.xml | 8 ++++++++ 3 files changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/59a7dd13/bin/phoenix_utils.py ---------------------------------------------------------------------- diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py index aa04a5b..98a0896 100755 --- a/bin/phoenix_utils.py +++ b/bin/phoenix_utils.py @@ -166,6 +166,8 @@ def setPath(): global phoenix_loadbalancer_jar phoenix_loadbalancer_jar = find(PHOENIX_LOADBALANCER_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-loadbalancer", "target", "*")) if phoenix_loadbalancer_jar == "": + phoenix_loadbalancer_jar = findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN, os.path.join(current_dir, "..", "lib")) + if phoenix_loadbalancer_jar == "": phoenix_loadbalancer_jar = findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN, os.path.join(current_dir, "..")) global phoenix_traceserver_jar http://git-wip-us.apache.org/repos/asf/phoenix/blob/59a7dd13/phoenix-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 5cbe55f..d143d93 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -126,5 +126,9 @@ <groupId>org.apache.phoenix</groupId> <artifactId>phoenix-queryserver-client</artifactId> </dependency> + <dependency> + <groupId>org.apache.phoenix</groupId> + <artifactId>phoenix-load-balancer</artifactId> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/phoenix/blob/59a7dd13/phoenix-assembly/src/build/components/all-common-jars.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml b/phoenix-assembly/src/build/components/all-common-jars.xml index 3d27b26..08ca29a 100644 --- a/phoenix-assembly/src/build/components/all-common-jars.xml +++ b/phoenix-assembly/src/build/components/all-common-jars.xml @@ -158,5 +158,13 @@ </includes> <fileMode>0644</fileMode> </fileSet> + <fileSet> + <directory>${project.basedir}/../phoenix-load-balancer/target/</directory> + <outputDirectory>lib</outputDirectory> + <includes> + <include>phoenix-*.jar</include> + </includes> + <fileMode>0644</fileMode> + </fileSet> </fileSets> </component>
