This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push: new 4247983 PHOENIX-6121 hbase-compat-2.3 jar missing from assembly root 4247983 is described below commit 4247983bacc0565d2b979bc5c159a9fb4e97e15a Author: Istvan Toth <st...@apache.org> AuthorDate: Fri Sep 11 10:32:30 2020 +0200 PHOENIX-6121 hbase-compat-2.3 jar missing from assembly root --- phoenix-assembly/pom.xml | 4 ++++ .../src/build/components/all-common-dependencies.xml | 1 + .../src/build/components/all-common-jars.xml | 18 ------------------ 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index b42c5e9..099ac03 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -165,6 +165,10 @@ <groupId>org.apache.phoenix</groupId> <artifactId>phoenix-hbase-compat-2.2.1</artifactId> </dependency> + <dependency> + <groupId>org.apache.phoenix</groupId> + <artifactId>phoenix-hbase-compat-2.3.0</artifactId> + </dependency> <dependency> <groupId>com.fasterxml.woodstox</groupId> diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml b/phoenix-assembly/src/build/components/all-common-dependencies.xml index c571f87..52bd8fd 100644 --- a/phoenix-assembly/src/build/components/all-common-dependencies.xml +++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml @@ -28,6 +28,7 @@ <includes> <include>org.apache.phoenix:phoenix-hbase-compat-2.1.6</include> <include>org.apache.phoenix:phoenix-hbase-compat-2.2.1</include> + <include>org.apache.phoenix:phoenix-hbase-compat-2.3.0</include> </includes> </dependencySet> <dependencySet> diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml b/phoenix-assembly/src/build/components/all-common-jars.xml index dfb5afa..8f97784 100644 --- a/phoenix-assembly/src/build/components/all-common-jars.xml +++ b/phoenix-assembly/src/build/components/all-common-jars.xml @@ -45,14 +45,6 @@ Otherwise, test jars are pulled in wrongly. --> <fileSet> - <directory>${project.basedir}/../phoenix-hadoop-compat/target/</directory> - <outputDirectory>lib</outputDirectory> - <includes> - <include>phoenix-*.jar</include> - </includes> - <fileMode>0644</fileMode> - </fileSet> - <fileSet> <directory>${project.basedir}/../phoenix-core/target/</directory> <outputDirectory>lib</outputDirectory> <includes> @@ -68,15 +60,5 @@ </includes> <fileMode>0644</fileMode> </fileSet> - <fileSet> - <directory> - ${project.basedir}/../phoenix-hbase-compat-${hbase.compat.version}/target/ - </directory> - <outputDirectory>lib</outputDirectory> - <includes> - <include>phoenix-*.jar</include> - </includes> - <fileMode>0644</fileMode> - </fileSet> </fileSets> </component>