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 fc9027f PHOENIX-5967 phoenix-client transitively pulling in
phoenix-core
fc9027f is described below
commit fc9027fb01898397373e62830d859f0d30e5a9b9
Author: Istvan Toth <st...@apache.org>
AuthorDate: Wed Jul 8 09:32:50 2020 +0200
PHOENIX-5967 phoenix-client transitively pulling in phoenix-core
do not use classifiers for indicating hbase profile
do not shade compat module into phoenix-server jar
---
phoenix-assembly/pom.xml | 54 +++++-----------------
.../build/components/all-common-dependencies.xml | 8 ++++
.../src/build/components/all-common-jars.xml | 2 -
phoenix-client/pom.xml | 52 +++++++--------------
phoenix-server/pom.xml | 3 +-
pom.xml | 1 -
6 files changed, 37 insertions(+), 83 deletions(-)
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 565c734..1b47fad 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -42,7 +42,7 @@
<groupId>org.codehaus.mojo</groupId>
<executions>
<execution>
- <id>client without classifier</id>
+ <id>client without version</id>
<phase>compile</phase>
<goals>
<goal>exec</goal>
@@ -53,28 +53,8 @@
<arguments>
<argument>-fnsv</argument>
<argument>
- phoenix-client-${project.version}-${hbase.profile.string}.jar
- </argument>
- <argument>
phoenix-client-${project.version}.jar
</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <id>client without version and classifier</id>
- <phase>compile</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>ln</executable>
-
<workingDirectory>${project.basedir}/../phoenix-client/target</workingDirectory>
- <arguments>
- <argument>-fnsv</argument>
- <argument>
- phoenix-client-${project.version}-${hbase.profile.string}.jar
- </argument>
<argument>
<!-- We are overwriting the unshaded client JAR, but we
don't care -->
phoenix-client.jar
@@ -83,7 +63,7 @@
</configuration>
</execution>
<execution>
- <id>server without classifier</id>
+ <id>server without version</id>
<phase>compile</phase>
<goals>
<goal>exec</goal>
@@ -94,28 +74,8 @@
<arguments>
<argument>-fnsv</argument>
<argument>
- phoenix-server-${project.version}-${hbase.profile.string}.jar
- </argument>
- <argument>
phoenix-server-${project.version}.jar
</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <id>server without version and classifier</id>
- <phase>compile</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>ln</executable>
-
<workingDirectory>${project.basedir}/../phoenix-server/target</workingDirectory>
- <arguments>
- <argument>-fnsv</argument>
- <argument>
- phoenix-server-${project.version}-${hbase.profile.string}.jar
- </argument>
<argument>
<!-- We are overwriting the unshaded server JAR, but we
don't care -->
phoenix-server.jar
@@ -147,7 +107,7 @@
<goal>single</goal>
</goals>
<configuration>
-
<finalName>phoenix-${project.version}-${hbase.profile.string}</finalName>
+ <finalName>phoenix-${project.version}</finalName>
<attach>false</attach>
<tarLongFileMode>gnu</tarLongFileMode>
<appendAssemblyId>false</appendAssemblyId>
@@ -198,6 +158,14 @@
<artifactId>phoenix-tracing-webapp</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix-hbase-compat-2.1.6</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix-hbase-compat-2.2.1</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.omid</groupId>
<artifactId>omid-hbase-tools-hbase2.x</artifactId>
<version>${omid.version}</version>
diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml
b/phoenix-assembly/src/build/components/all-common-dependencies.xml
index f6293d4..af4a8ea 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -23,6 +23,14 @@
<!-- All of our dependencies -->
<dependencySets>
<dependencySet>
+ <unpack>false</unpack>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org.apache.phoenix:phoenix-hbase-compat-2.1.6</include>
+ <include>org.apache.phoenix:phoenix-hbase-compat-2.2.1</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
<!-- Unpack all the dependencies to class files, since java doesn't
support
jar of jars for running -->
<unpack>false</unpack>
diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml
b/phoenix-assembly/src/build/components/all-common-jars.xml
index 14e4142..dfb5afa 100644
--- a/phoenix-assembly/src/build/components/all-common-jars.xml
+++ b/phoenix-assembly/src/build/components/all-common-jars.xml
@@ -27,7 +27,6 @@
<directory>${project.basedir}/../phoenix-client/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
-
<include>phoenix-client-${project.version}-${hbase.profile.string}.jar</include>
<include>phoenix-client-${project.version}.jar</include>
<include>phoenix-client.jar</include>
</includes>
@@ -36,7 +35,6 @@
<directory>${project.basedir}/../phoenix-server/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
-
<include>phoenix-server-${project.version}-${hbase.profile.string}.jar</include>
<include>phoenix-server-${project.version}.jar</include>
<include>phoenix-server.jar</include>
</includes>
diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml
index d26dab6..8f2820b 100644
--- a/phoenix-client/pom.xml
+++ b/phoenix-client/pom.xml
@@ -66,6 +66,22 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ <exclude>META-INF/license/*</exclude>
+ <exclude>META-INF/NOTICE</exclude>
+ <exclude>LICENSE.*</exclude>
+ <exclude>NOTICE.*</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>README*</exclude>
+ </excludes>
+ </filter>
+ </filters>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
@@ -354,8 +370,6 @@
<goal>shade</goal>
</goals>
<configuration>
- <shadedArtifactAttached>true</shadedArtifactAttached>
-
<shadedClassifierName>${hbase.profile.string}</shadedClassifierName>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<shadeTestJar>false</shadeTestJar>
<createSourcesJar>true</createSourcesJar>
@@ -369,22 +383,6 @@
<exclude>xom:xom</exclude>
</excludes>
</artifactSet>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- <exclude>META-INF/license/*</exclude>
- <exclude>META-INF/NOTICE</exclude>
- <exclude>LICENSE.*</exclude>
- <exclude>NOTICE.*</exclude>
- <exclude>NOTICE</exclude>
- <exclude>README*</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
</execution>
<execution>
@@ -395,7 +393,7 @@
</goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
-
<shadedClassifierName>${hbase.profile.string}-embedded</shadedClassifierName>
+ <shadedClassifierName>embedded</shadedClassifierName>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<shadeTestJar>false</shadeTestJar>
<artifactSet>
@@ -408,22 +406,6 @@
<exclude>org.slf4j:slf4j-log4j12</exclude>
</excludes>
</artifactSet>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- <exclude>META-INF/license/*</exclude>
- <exclude>META-INF/NOTICE</exclude>
- <exclude>LICENSE.*</exclude>
- <exclude>NOTICE.*</exclude>
- <exclude>NOTICE</exclude>
- <exclude>README*</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
</execution>
</executions>
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 3559da6..873380f 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -83,8 +83,6 @@
<goal>shade</goal>
</goals>
<configuration>
- <shadedArtifactAttached>true</shadedArtifactAttached>
-
<shadedClassifierName>${hbase.profile.string}</shadedClassifierName>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<shadeTestJar>false</shadeTestJar>
<transformers>
@@ -122,6 +120,7 @@
<exclude>log4j:log4j</exclude>
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j</exclude>
+
<exlcude>org.apache.phoenix:phoenix-hbase-compat*</exlcude>
</excludes>
</artifactSet>
<filters>
diff --git a/pom.xml b/pom.xml
index 088314a..c6c755a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,6 @@
<!-- The HBase compatibility module that that will be included in
the shaded JARs and the assembly -->
<hbase.profile>2.2</hbase.profile>
- <hbase.profile.string>hbase-${hbase.profile}</hbase.profile.string>
<!-- Hadoop and Hbase-thirdparty version -->
<!-- These are expected to be overridden to conform to cluster versions
