Revert "PHOENIX-4781 Fix phoenix-client and phoenix-server jar naming convention"
This reverts commit fb130affacb24f9a16a022cf95ad118f3cf1274f. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d6cde8ed Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d6cde8ed Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d6cde8ed Branch: refs/heads/4.x-HBase-1.4 Commit: d6cde8ed219de368087d700c8eb1265a3805829e Parents: e4b3191 Author: Vincent Poon <[email protected]> Authored: Fri Nov 30 15:56:48 2018 -0800 Committer: Vincent Poon <[email protected]> Committed: Fri Nov 30 15:56:48 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/d6cde8ed/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/d6cde8ed/phoenix-client/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index 4866f9f..b8c4dd6 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/d6cde8ed/phoenix-server/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 0ec7b39..34b5130 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -64,7 +64,7 @@ <executions> <execution> <id>default-jar</id> - <phase>package</phase> + <phase>none</phase> </execution> </executions> </plugin> @@ -84,7 +84,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> @@ -99,7 +99,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>
