You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by vi...@apache.org on 2018/12/18 23:58:53 UTC
[phoenix-connectors] 14/15: Add test jars
This is an automated email from the ASF dual-hosted git repository.
vincentpoon pushed a commit to branch 4.x-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git
commit 9f74f2baefa6744874a8cffbc43dc206bdaf53a5
Author: Vincent Poon <vi...@apache.org>
AuthorDate: Fri Dec 7 13:20:20 2018 -0800
Add test jars
---
pom.xml | 2 --
presto-hbase-testing-util-shaded/pom.xml | 58 ++++++++++++++++++++++++++++++--
presto-phoenix-client-shaded/pom.xml | 54 +++++++++++++++++++++++++----
3 files changed, 102 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index fe2e189..03ce587 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,8 +25,6 @@
<properties>
<!-- Don't make a test-jar -->
<maven.test.skip>true</maven.test.skip>
- <!-- Don't make a source-jar -->
- <source.skip>true</source.skip>
<shadeBase>com.facebook.presto.phoenix.shaded</shadeBase>
</properties>
diff --git a/presto-hbase-testing-util-shaded/pom.xml b/presto-hbase-testing-util-shaded/pom.xml
index dd6ed79..1986988 100644
--- a/presto-hbase-testing-util-shaded/pom.xml
+++ b/presto-hbase-testing-util-shaded/pom.xml
@@ -18,7 +18,20 @@
<dependencies>
<dependency>
<groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
+ <artifactId>hbase-common</artifactId>
+ <scope>compile</scope>
+ <type>test-jar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop-compat</artifactId>
<type>test-jar</type>
<scope>compile</scope>
<exclusions>
@@ -31,9 +44,48 @@
<dependency>
<groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
+ <artifactId>hbase-hadoop2-compat</artifactId>
+ <type>test-jar</type>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-it</artifactId>
+ <scope>compile</scope>
+ <type>test-jar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
<type>test-jar</type>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tephra</groupId>
+ <artifactId>tephra-core</artifactId>
+ <type>test-jar</type>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -71,7 +123,7 @@
<filter>
<artifact>*:*</artifact>
<excludes>
- <!-- io.airlift:joni minor version difference. Can't simply exclude -->
+ <!-- io.airlift:joni resources. Can't simply exclude -->
<!-- the dependency because we are depending on a shaded phoenix-client -->
<exclude>tables/*.bin</exclude>
<!-- skip french localization -->
diff --git a/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-client-shaded/pom.xml
index cd9d1b0..e9c1710 100644
--- a/presto-phoenix-client-shaded/pom.xml
+++ b/presto-phoenix-client-shaded/pom.xml
@@ -49,17 +49,57 @@
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
</transformers>
<relocations>
+ <relocation>
+ <pattern>com.google.common</pattern>
+ <shadedPattern>${shadeBase}.com.google.common</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.inject</pattern>
+ <shadedPattern>${shadeBase}.com.google.inject</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.sun.xml</pattern>
+ <shadedPattern>${shadeBase}.com.sun.xml</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.sun.istack</pattern>
+ <shadedPattern>${shadeBase}.com.sun.istack</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.sun.research</pattern>
+ <shadedPattern>${shadeBase}.com.sun.research</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.sun.xml</pattern>
+ <shadedPattern>${shadeBase}.com.sun.xml</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.sun.activation</pattern>
+ <shadedPattern>${shadeBase}.com.sun.activation</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax.activation</pattern>
+ <shadedPattern>${shadeBase}.javax.activation</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax.annotation</pattern>
+ <shadedPattern>${shadeBase}.javax.annotation</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax.inject</pattern>
+ <shadedPattern>${shadeBase}.javax.inject</shadedPattern>
+ </relocation>
<relocation>
- <pattern>com.google</pattern>
- <shadedPattern>${shadeBase}.com.google</shadedPattern>
+ <pattern>javax.xml.bind</pattern>
+ <shadedPattern>${shadeBase}.javax.xml.bind</shadedPattern>
</relocation>
<relocation>
- <pattern>com.sun</pattern>
- <shadedPattern>${shadeBase}.com.sun</shadedPattern>
+ <pattern>javax.servlet</pattern>
+ <shadedPattern>${shadeBase}.javax.servlet</shadedPattern>
</relocation>
<relocation>
- <pattern>javax</pattern>
- <shadedPattern>${shadeBase}.javax</shadedPattern>
+ <pattern>javax.ws</pattern>
+ <shadedPattern>${shadeBase}.javax.ws</shadedPattern>
</relocation>
<relocation>
<pattern>org.slf4j</pattern>
@@ -78,7 +118,7 @@
<filter>
<artifact>*:*</artifact>
<excludes>
- <!-- io.airlift:joni minor version difference. Can't simply exclude -->
+ <!-- io.airlift:joni resource files. Can't simply exclude -->
<!-- the dependency because we are depending on a shaded phoenix-client -->
<exclude>tables/*.bin</exclude>
<!-- skip french localization -->