This is an automated email from the ASF dual-hosted git repository. vincentpoon pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git
commit ea98def4c28127b4134980a2f1ff6e8a719418da Author: Vincent Poon <vincentp...@apache.org> AuthorDate: Mon Jan 28 22:19:35 2019 -0800 Attach presto-hbase-testing-util-shaded as test jar of presto-phoenix-client-shaded --- presto-phoenix-shaded/pom.xml | 18 +++++- .../presto-hbase-testing-util-shaded/pom.xml | 5 ++ .../presto-phoenix-client-shaded/pom.xml | 70 +++++++++++++++++++++- 3 files changed, 89 insertions(+), 4 deletions(-) diff --git a/presto-phoenix-shaded/pom.xml b/presto-phoenix-shaded/pom.xml index 27d475e..7820ddc 100644 --- a/presto-phoenix-shaded/pom.xml +++ b/presto-phoenix-shaded/pom.xml @@ -25,8 +25,6 @@ <properties> <phoenix.version>4.15.0-HBase-1.4-SNAPSHOT</phoenix.version> - <!-- Don't make a test-jar --> - <maven.test.skip>true</maven.test.skip> <shadeBase>org.apache.phoenix.shaded</shadeBase> </properties> @@ -70,6 +68,22 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + + <configuration> + <skipIfEmpty>true</skipIfEmpty> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </profile> diff --git a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml index dc4138a..092c412 100644 --- a/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-hbase-testing-util-shaded/pom.xml @@ -23,6 +23,11 @@ </license> </licenses> + <properties> + <maven.test.skip>true</maven.test.skip> + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + <dependencies> <dependency> <groupId>org.apache.hbase</groupId> diff --git a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml index 3f3ede7..9d56cf7 100644 --- a/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml +++ b/presto-phoenix-shaded/presto-phoenix-client-shaded/pom.xml @@ -29,8 +29,8 @@ <artifactId>phoenix-core</artifactId> <version>${phoenix.version}</version> <exclusions> - <!-- Presto uses jcl-over-slf4j and log4j-over-slf4j - to route to slf4j-jdk14 --> + <!-- Presto uses jcl-over-slf4j and log4j-over-slf4j + to route to slf4j-jdk14 --> <exclusion> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> @@ -52,7 +52,73 @@ </dependencies> <build> + <testSourceDirectory> + ${project.build.directory}/test-sources + </testSourceDirectory> + <plugins> + <!-- We use the test source from presto-hbase-testing-util-shaded --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <id>default-testCompile</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>compile</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + + <artifactItems> + <artifactItem> + <groupId>org.apache.phoenix</groupId> + <artifactId>presto-hbase-testing-util-shaded</artifactId> + <version>${project.parent.version}</version> + <type>jar</type> + <classifier>sources</classifier> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/test-sources</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.apache.phoenix</groupId> + <artifactId>presto-hbase-testing-util-shaded</artifactId> + <version>${project.parent.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/test-classes</outputDirectory> + </artifactItem> + </artifactItems> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-test-sources</id> + <goals> + <goal>test-jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId>