You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2021/06/19 07:08:20 UTC
[phoenix] branch 5.1 updated: PHOENIX-6495 Include phoenix-tools
jar in assembly
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new 9cba040 PHOENIX-6495 Include phoenix-tools jar in assembly
9cba040 is described below
commit 9cba0401d7f380ee6eacd16765f6206ebc8f3a9a
Author: Istvan Toth <st...@apache.org>
AuthorDate: Fri Jun 18 10:29:58 2021 +0200
PHOENIX-6495 Include phoenix-tools jar in assembly
also restore/add versionsless symlinks
---
phoenix-assembly/pom.xml | 65 ++++++++++++++++++++++
.../src/build/components/all-common-jars.xml | 12 ++++
2 files changed, 77 insertions(+)
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index f293ae5..a9cb434 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -63,6 +63,27 @@
</configuration>
</execution>
<execution>
+ <id>embedded client without version</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>ln</executable>
+ <workingDirectory>${project.basedir}/../phoenix-client-parent/phoenix-client-embedded/target</workingDirectory>
+ <arguments>
+ <argument>-fnsv</argument>
+ <argument>
+ phoenix-client-embedded-${hbase.suffix}-${project.version}.jar
+ </argument>
+ <argument>
+ <!-- We are overwriting the unshaded client JAR, but we don't care -->
+ phoenix-client-embedded-${hbase.suffix}.jar
+ </argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
<id>server without version</id>
<phase>compile</phase>
<goals>
@@ -83,6 +104,46 @@
</arguments>
</configuration>
</execution>
+ <execution>
+ <id>pherf without version</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>ln</executable>
+ <workingDirectory>${project.basedir}/../phoenix-pherf/target</workingDirectory>
+ <arguments>
+ <argument>-fnsv</argument>
+ <argument>
+ phoenix-pherf-${project.version}.jar
+ </argument>
+ <argument>
+ phoenix-pherf.jar
+ </argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tools without version</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>ln</executable>
+ <workingDirectory>${project.basedir}/../phoenix-tools/target</workingDirectory>
+ <arguments>
+ <argument>-fnsv</argument>
+ <argument>
+ phoenix-tools-${project.version}.jar
+ </argument>
+ <argument>
+ phoenix-tools.jar
+ </argument>
+ </arguments>
+ </configuration>
+ </execution>
</executions>
</plugin>
<!-- No jars created for this module -->
@@ -144,6 +205,10 @@
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-tracing-webapp</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix-tools</artifactId>
+ </dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml b/phoenix-assembly/src/build/components/all-common-jars.xml
index d75915a..4afb7e6 100644
--- a/phoenix-assembly/src/build/components/all-common-jars.xml
+++ b/phoenix-assembly/src/build/components/all-common-jars.xml
@@ -28,6 +28,7 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>phoenix-client-${hbase.suffix}-${project.version}.jar</include>
+ <include>phoenix-client-${hbase.suffix}.jar</include>
</includes>
</fileSet>
<fileSet>
@@ -35,6 +36,7 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>phoenix-client-embedded-${hbase.suffix}-${project.version}.jar</include>
+ <include>phoenix-client-embedded-${hbase.suffix}.jar</include>
</includes>
</fileSet>
<fileSet>
@@ -42,6 +44,7 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>phoenix-server-${hbase.suffix}-${project.version}.jar</include>
+ <include>phoenix-server-${hbase.suffix}.jar</include>
</includes>
</fileSet>
<fileSet>
@@ -49,6 +52,15 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>phoenix-pherf-${project.version}.jar</include>
+ <include>phoenix-pherf.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../phoenix-tools/target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>phoenix-tools-${project.version}.jar</include>
+ <include>phoenix-tools.jar</include>
</includes>
</fileSet>
</fileSets>