Support generating assembling JAR for store-sdk module Support generating assembling JAR for store-sdk module and remove junit dependency
This closes #1976 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/33a6d2bc Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/33a6d2bc Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/33a6d2bc Branch: refs/heads/carbonstore-rebase4 Commit: 33a6d2bc31d377a2d1ccbdd422979cd61ac66292 Parents: d6d6f10 Author: Jacky Li <jacky.li...@qq.com> Authored: Tue Feb 13 09:12:09 2018 +0800 Committer: Jacky Li <jacky.li...@qq.com> Committed: Tue Feb 27 09:20:47 2018 +0800 ---------------------------------------------------------------------- common/pom.xml | 2 + core/pom.xml | 2 + hadoop/pom.xml | 1 + integration/presto/pom.xml | 3 +- integration/spark-common-cluster-test/pom.xml | 2 +- integration/spark-common-test/pom.xml | 3 +- integration/spark-common/pom.xml | 2 +- integration/spark2/pom.xml | 2 +- pom.xml | 5 +++ processing/pom.xml | 1 + store/sdk/pom.xml | 50 +++++++++++++++++++++- streaming/pom.xml | 1 - 12 files changed, 66 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/33a6d2bc/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index 5550129..433d575 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -42,10 +42,12 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/carbondata/blob/33a6d2bc/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 92c9607..824de0d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -70,10 +70,12 @@ <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.spark</groupId> http://git-wip-us.apache.org/repos/asf/carbondata/blob/33a6d2bc/hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop/pom.xml b/hadoop/pom.xml index 2aaac99..c3964c5 100644 --- a/hadoop/pom.xml +++ b/hadoop/pom.xml @@ -42,6 +42,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/carbondata/blob/33a6d2bc/integration/presto/pom.xml ---------------------------------------------------------------------- diff --git a/integration/presto/pom.xml b/integration/presto/pom.xml index aaaf175..0abcf38 100644 --- a/integration/presto/pom.xml +++ b/integration/presto/pom.xml @@ -193,7 +193,7 @@ </exclusion> <exclusion> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.11</artifactId> + <artifactId>scalatest_${scala.binary.version}</artifactId> </exclusion> <exclusion> <groupId>org.apache.zookeeper</groupId> @@ -330,7 +330,6 @@ <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> - <version>2.2.1</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/carbondata/blob/33a6d2bc/integration/spark-common-cluster-test/pom.xml ---------------------------------------------------------------------- diff --git a/integration/spark-common-cluster-test/pom.xml b/integration/spark-common-cluster-test/pom.xml index fd907a3..028da11 100644 --- a/integration/spark-common-cluster-test/pom.xml +++ b/integration/spark-common-cluster-test/pom.xml @@ -49,11 +49,11 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> - <version>2.2.1</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/carbondata/blob/33a6d2bc/integration/spark-common-test/pom.xml ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/pom.xml b/integration/spark-common-test/pom.xml index 67a2317..d1c04ae 100644 --- a/integration/spark-common-test/pom.xml +++ b/integration/spark-common-test/pom.xml @@ -106,16 +106,17 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> - <version>2.2.1</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> + <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/carbondata/blob/33a6d2bc/integration/spark-common/pom.xml ---------------------------------------------------------------------- diff --git a/integration/spark-common/pom.xml b/integration/spark-common/pom.xml index 295d62b..16f327d 100644 --- a/integration/spark-common/pom.xml +++ b/integration/spark-common/pom.xml @@ -58,11 +58,11 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> - <version>2.2.1</version> <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/carbondata/blob/33a6d2bc/integration/spark2/pom.xml ---------------------------------------------------------------------- diff --git a/integration/spark2/pom.xml b/integration/spark2/pom.xml index aac1ff6..5b2da93 100644 --- a/integration/spark2/pom.xml +++ b/integration/spark2/pom.xml @@ -50,11 +50,11 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> - <version>2.2.1</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/carbondata/blob/33a6d2bc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 520d770..0891972 100644 --- a/pom.xml +++ b/pom.xml @@ -262,6 +262,11 @@ <version>4.11</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.scalatest</groupId> + <artifactId>scalatest_${scala.binary.version}</artifactId> + <version>2.2.1</version> + </dependency> </dependencies> </dependencyManagement> http://git-wip-us.apache.org/repos/asf/carbondata/blob/33a6d2bc/processing/pom.xml ---------------------------------------------------------------------- diff --git a/processing/pom.xml b/processing/pom.xml index acd97fb..466a300 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -68,6 +68,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/carbondata/blob/33a6d2bc/store/sdk/pom.xml ---------------------------------------------------------------------- diff --git a/store/sdk/pom.xml b/store/sdk/pom.xml index 51d2cf9..54fba55 100644 --- a/store/sdk/pom.xml +++ b/store/sdk/pom.xml @@ -32,7 +32,6 @@ <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> - <version>2.2.1</version> <scope>test</scope> </dependency> </dependencies> @@ -125,6 +124,55 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <configuration> + <shadedArtifactAttached>false</shadedArtifactAttached> + <promoteTransitiveDependencies>true</promoteTransitiveDependencies> + <outputFile>carbondata-sdk.jar</outputFile> + <artifactSet> + <includes> + <include>*:*</include> + </includes> + </artifactSet> + <filters> + <filter> + <artifact>*:*</artifact> + <excludes> + <exclude>org/datanucleus/**</exclude> + <exclude>META-INF/*.SF</exclude> + <exclude>META-INF/*.DSA</exclude> + <exclude>META-INF/*.RSA</exclude> + <exclude>META-INF/vfs-providers.xml</exclude> + <exclude>io/netty/**</exclude> + </excludes> + </filter> + </filters> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/carbondata/blob/33a6d2bc/streaming/pom.xml ---------------------------------------------------------------------- diff --git a/streaming/pom.xml b/streaming/pom.xml index 987e530..dc66aa8 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -33,7 +33,6 @@ <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> - <version>2.2.1</version> <scope>test</scope> </dependency> </dependencies>
