This is an automated email from the ASF dual-hosted git repository.
pboado pushed a commit to branch 5.x-cdh6
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 1d8240ffeccedfd0b9e4e12b8828eeef09b96513
Author: Pedro Boado <pbo...@apache.org>
AuthorDate: Sun Apr 7 18:37:25 2019 +0100
PHOENIX-4956 Distribution of Apache Phoenix 5.1 for CDH 6.1 (addendum)
---
phoenix-parcel/pom.xml | 12 --
.../src/build/components/all-common-jars.xml | 150 ---------------------
2 files changed, 162 deletions(-)
diff --git a/phoenix-parcel/pom.xml b/phoenix-parcel/pom.xml
index 09d0037..332cf40 100644
--- a/phoenix-parcel/pom.xml
+++ b/phoenix-parcel/pom.xml
@@ -140,17 +140,5 @@
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-flume</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-pig</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-spark</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/phoenix-parcel/src/build/components/all-common-jars.xml
b/phoenix-parcel/src/build/components/all-common-jars.xml
index c659ab8..80d2716 100644
--- a/phoenix-parcel/src/build/components/all-common-jars.xml
+++ b/phoenix-parcel/src/build/components/all-common-jars.xml
@@ -36,102 +36,7 @@
</excludes>
<fileMode>0644</fileMode>
</fileSet>
- <fileSet>
- <directory>${project.basedir}/../phoenix-server/target</directory>
- <outputDirectory>${parcel.folder}/lib/phoenix/</outputDirectory>
- <includes>
- <include>phoenix-*-server.jar</include>
- </includes>
- <excludes>
- <exclude>*-minimal.jar</exclude>
- <exclude>*-sources.jar</exclude>
- <exclude>*-tests.jar</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../phoenix-queryserver/target/</directory>
- <outputDirectory>${parcel.folder}/lib/phoenix/</outputDirectory>
- <includes>
- <include>phoenix-*-queryserver.jar</include>
- </includes>
- <excludes>
- <exclude>*-minimal.jar</exclude>
- <exclude>*-sources.jar</exclude>
- <exclude>*-tests.jar</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
-
<directory>${project.basedir}/../phoenix-queryserver-client/target/</directory>
- <outputDirectory>${parcel.folder}/lib/phoenix/</outputDirectory>
- <includes>
- <include>phoenix-*-thin-client.jar</include>
- </includes>
- <excludes>
- <exclude>*-minimal.jar</exclude>
- <exclude>*-sources.jar</exclude>
- <exclude>*-tests.jar</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../phoenix-hive/target/</directory>
- <outputDirectory>${parcel.folder}/lib/phoenix/</outputDirectory>
- <includes>
- <include>phoenix-*-hive.jar</include>
- </includes>
- <excludes>
- <exclude>*-minimal.jar</exclude>
- <exclude>*-sources.jar</exclude>
- <exclude>*-tests.jar</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- </fileSet>
- <!-- This is only necessary until maven fixes the intra-project dependency
bug
- in maven 3.0. Until then, we have to include the jars for sub-projects
explicitly.
- Otherwise, test jars are pulled in wrongly.
- -->
- <fileSet>
-
<directory>${project.basedir}/../phoenix-hadoop-compat/target/</directory>
- <outputDirectory>${parcel.folder}/lib/phoenix/lib</outputDirectory>
- <includes>
- <include>phoenix-*.jar</include>
- </includes>
- <excludes>
- <exclude>*-minimal.jar</exclude>
- <exclude>*-sources.jar</exclude>
- <exclude>*-tests.jar</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../phoenix-pig/target/</directory>
- <outputDirectory>${parcel.folder}/lib/phoenix/lib</outputDirectory>
- <includes>
- <include>phoenix-pig-*.jar</include>
- </includes>
- <excludes>
- <exclude>*-minimal.jar</exclude>
- <exclude>*-sources.jar</exclude>
- <exclude>*-tests.jar</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../phoenix-flume/target/</directory>
- <outputDirectory>${parcel.folder}/lib/phoenix/lib</outputDirectory>
- <includes>
- <include>phoenix-*.jar</include>
- </includes>
- <excludes>
- <exclude>*-minimal.jar</exclude>
- <exclude>*-sources.jar</exclude>
- <exclude>*-tests.jar</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- </fileSet>
<fileSet>
<directory>${project.basedir}/../phoenix-core/target/</directory>
<outputDirectory>${parcel.folder}/lib/phoenix/lib</outputDirectory>
@@ -146,61 +51,6 @@
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../phoenix-spark/target/</directory>
- <outputDirectory>${parcel.folder}/lib/phoenix/lib</outputDirectory>
- <includes>
- <include>phoenix-*.jar</include>
- </includes>
- <excludes>
- <exclude>*-javadoc.jar</exclude>
- <exclude>*-minimal.jar</exclude>
- <exclude>*-sources.jar</exclude>
- <exclude>*-tests.jar</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../phoenix-queryserver/target/</directory>
- <outputDirectory>${parcel.folder}/lib/phoenix/lib</outputDirectory>
- <includes>
- <include>phoenix-queryserver-*.jar</include>
- </includes>
- <excludes>
- <exclude>*-minimal.jar</exclude>
- <exclude>*-sources.jar</exclude>
- <exclude>*-tests.jar</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../phoenix-hive/target/</directory>
- <outputDirectory>${parcel.folder}/lib/phoenix/lib</outputDirectory>
- <includes>
- <include>phoenix-hive-*.jar</include>
- </includes>
- <excludes>
- <exclude>*-minimal.jar</exclude>
- <exclude>*-sources.jar</exclude>
- <exclude>*-tests.jar</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
-
<directory>${project.basedir}/../phoenix-queryserver-client/target/</directory>
- <outputDirectory>${parcel.folder}/lib/phoenix/lib</outputDirectory>
- <includes>
- <include>phoenix-*.jar</include>
- </includes>
- <excludes>
- <exclude>*-minimal.jar</exclude>
- <exclude>*-sources.jar</exclude>
- <exclude>*-tests.jar</exclude>
- <!-- this one goes in project root instead -->
- <exclude>phoenix-*-thin-client.jar</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
<directory>${project.basedir}/../phoenix-pherf/target/</directory>
<outputDirectory>${parcel.folder}/lib/phoenix/lib</outputDirectory>
<includes>
