Revert "PHOENIX-4781 Fix phoenix-client and phoenix-server jar naming convention"
This reverts commit 17217faed59c45a8c4f181fe49d84e7b7ee240bb. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/52b563d7 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/52b563d7 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/52b563d7 Branch: refs/heads/master Commit: 52b563d70830454609ad416ee8dd271e37eeeb70 Parents: 27bf35b Author: Vincent Poon <[email protected]> Authored: Fri Nov 30 16:25:49 2018 -0800 Committer: Vincent Poon <[email protected]> Committed: Fri Nov 30 16:25:49 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/52b563d7/bin/phoenix_utils.py ---------------------------------------------------------------------- diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py index 1b5a2d6..98a0896 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/52b563d7/phoenix-client/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index 8defdd8..2d50d2c 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -60,7 +60,7 @@ <executions> <execution> <id>default-jar</id> - <phase>package</phase> + <phase>none</phase> </execution> </executions> </plugin> @@ -80,7 +80,7 @@ </execution> </executions> <configuration> - <file>${basedir}/target/phoenix-client-${project.version}.jar</file> + <file>${basedir}/target/phoenix-${project.version}-client.jar</file> <pomFile>${basedir}/pom.xml</pomFile> </configuration> </plugin> @@ -94,7 +94,7 @@ <goal>shade</goal> </goals> <configuration> - <finalName>phoenix-client-${project.version}</finalName> + <finalName>phoenix-${project.version}-client</finalName> <shadedArtifactAttached>false</shadedArtifactAttached> <promoteTransitiveDependencies>true</promoteTransitiveDependencies> <shadeTestJar>false</shadeTestJar> http://git-wip-us.apache.org/repos/asf/phoenix/blob/52b563d7/phoenix-server/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index d92194a..48d6aa7 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -65,7 +65,7 @@ <executions> <execution> <id>default-jar</id> - <phase>package</phase> + <phase>none</phase> </execution> </executions> </plugin> @@ -85,7 +85,7 @@ </execution> </executions> <configuration> - <file>${basedir}/target/phoenix-server-${project.version}.jar</file> + <file>${basedir}/target/phoenix-${project.version}-server.jar</file> <pomFile>${basedir}/pom.xml</pomFile> </configuration> </plugin> @@ -100,7 +100,7 @@ <goal>shade</goal> </goals> <configuration> - <finalName>phoenix-server-${project.version}</finalName> + <finalName>phoenix-${project.version}-server</finalName> <shadedArtifactAttached>false</shadedArtifactAttached> <promoteTransitiveDependencies>true</promoteTransitiveDependencies> <shadeTestJar>false</shadeTestJar>
