You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by vi...@apache.org on 2018/11/30 18:51:35 UTC
phoenix git commit: PHOENIX-4781 Fix phoenix-client and
phoenix-server jar naming convention
Repository: phoenix
Updated Branches:
refs/heads/master 179eb5076 -> 17217faed
PHOENIX-4781 Fix phoenix-client and phoenix-server jar naming convention
Co-authored-by: Karan Mehta <ka...@apache.org>
Co-authored-by: Vincent Poon <vi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/17217fae
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/17217fae
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/17217fae
Branch: refs/heads/master
Commit: 17217faed59c45a8c4f181fe49d84e7b7ee240bb
Parents: 179eb50
Author: Vincent Poon <vi...@apache.org>
Authored: Thu Nov 29 17:47:02 2018 -0800
Committer: Vincent Poon <vi...@apache.org>
Committed: Fri Nov 30 10:45:27 2018 -0800
----------------------------------------------------------------------
bin/phoenix_utils.py | 2 +-
phoenix-client/pom.xml | 6 +++---
phoenix-server/pom.xml | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/17217fae/bin/phoenix_utils.py
----------------------------------------------------------------------
diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py
index 98a0896..1b5a2d6 100755
--- a/bin/phoenix_utils.py
+++ b/bin/phoenix_utils.py
@@ -68,7 +68,7 @@ def findClasspath(command_name):
return subprocess.Popen(command, shell=True, stdout=subprocess.PIPE).stdout.read()
def setPath():
- PHOENIX_CLIENT_JAR_PATTERN = "phoenix-*-client.jar"
+ PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client-*.jar"
PHOENIX_THIN_CLIENT_JAR_PATTERN = "phoenix-*-thin-client.jar"
PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-*-queryserver.jar"
PHOENIX_LOADBALANCER_JAR_PATTERN = "phoenix-load-balancer-*[!t][!e][!s][!t][!s].jar"
http://git-wip-us.apache.org/repos/asf/phoenix/blob/17217fae/phoenix-client/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index 2d50d2c..8defdd8 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -60,7 +60,7 @@
<executions>
<execution>
<id>default-jar</id>
- <phase>none</phase>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
@@ -80,7 +80,7 @@
</execution>
</executions>
<configuration>
- <file>${basedir}/target/phoenix-${project.version}-client.jar</file>
+ <file>${basedir}/target/phoenix-client-${project.version}.jar</file>
<pomFile>${basedir}/pom.xml</pomFile>
</configuration>
</plugin>
@@ -94,7 +94,7 @@
<goal>shade</goal>
</goals>
<configuration>
- <finalName>phoenix-${project.version}-client</finalName>
+ <finalName>phoenix-client-${project.version}</finalName>
<shadedArtifactAttached>false</shadedArtifactAttached>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<shadeTestJar>false</shadeTestJar>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/17217fae/phoenix-server/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 48d6aa7..d92194a 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -65,7 +65,7 @@
<executions>
<execution>
<id>default-jar</id>
- <phase>none</phase>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
@@ -85,7 +85,7 @@
</execution>
</executions>
<configuration>
- <file>${basedir}/target/phoenix-${project.version}-server.jar</file>
+ <file>${basedir}/target/phoenix-server-${project.version}.jar</file>
<pomFile>${basedir}/pom.xml</pomFile>
</configuration>
</plugin>
@@ -100,7 +100,7 @@
<goal>shade</goal>
</goals>
<configuration>
- <finalName>phoenix-${project.version}-server</finalName>
+ <finalName>phoenix-server-${project.version}</finalName>
<shadedArtifactAttached>false</shadedArtifactAttached>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<shadeTestJar>false</shadeTestJar>