Repository: incubator-hivemall Updated Branches: refs/heads/v0.5.0 3404c6df4 -> 44cbbe7fb
Changed jar building scheme Project: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/commit/44cbbe7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/tree/44cbbe7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/diff/44cbbe7f Branch: refs/heads/v0.5.0 Commit: 44cbbe7fba9d54d0a196e914bf7eb1081c4d074f Parents: 3404c6d Author: Makoto Yui <[email protected]> Authored: Wed Jan 24 11:14:19 2018 +0900 Committer: Makoto Yui <[email protected]> Committed: Wed Jan 24 11:14:19 2018 +0900 ---------------------------------------------------------------------- core/pom.xml | 56 ----------------- dist/pom.xml | 147 +++++++++++++++++++++++++++++++++++++++++++ mixserv/pom.xml | 1 + nlp/pom.xml | 78 ----------------------- pom.xml | 31 ++------- spark/pom.xml | 62 ++++++++++++++++-- spark/spark-2.0/pom.xml | 27 -------- spark/spark-2.1/pom.xml | 27 -------- spark/spark-2.2/pom.xml | 27 -------- xgboost/pom.xml | 40 ------------ 10 files changed, 210 insertions(+), 286 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/44cbbe7f/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index da5a9bd..82cb369 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -152,60 +152,4 @@ </dependency> </dependencies> - <build> - <plugins> - <!-- hivemall-core-xx-with-dependencies.jar including minimum dependencies --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <id>jar-with-dependencies</id> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <finalName>${project.artifactId}-${project.version}-with-dependencies</finalName> - <outputDirectory>${project.parent.build.directory}</outputDirectory> - <minimizeJar>true</minimizeJar> - <createDependencyReducedPom>false</createDependencyReducedPom> - <artifactSet> - <includes> - <include>io.netty:netty-all</include> - <include>com.github.haifengl:smile-core</include> - <include>com.github.haifengl:smile-math</include> - <include>com.github.haifengl:smile-data</include> - <include>org.tukaani:xz</include> - <include>org.apache.commons:commons-math3</include> - <include>org.roaringbitmap:RoaringBitmap</include> - <include>it.unimi.dsi:fastutil</include> - <include>com.clearspring.analytics:stream</include> - </includes> - </artifactSet> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <manifestEntries> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - </manifestEntries> - </transformer> - </transformers> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/LICENSE.txt</exclude> - <exclude>META-INF/NOTICE.txt</exclude> - </excludes> - </filter> - </filters> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/44cbbe7f/dist/pom.xml ---------------------------------------------------------------------- diff --git a/dist/pom.xml b/dist/pom.xml new file mode 100644 index 0000000..a5ad6f4 --- /dev/null +++ b/dist/pom.xml @@ -0,0 +1,147 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.hivemall</groupId> + <artifactId>hivemall</artifactId> + <version>0.5.1-incubating-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>hivemall-all</artifactId> + <name>Hivemall Distribution</name> + <packaging>jar</packaging> + + <properties> + <main.basedir>${project.parent.basedir}</main.basedir> + </properties> + + <dependencies> + <!-- compile scope --> + <dependency> + <groupId>org.apache.hivemall</groupId> + <artifactId>hivemall-core</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hivemall</groupId> + <artifactId>hivemall-nlp</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.hivemall</groupId> + <artifactId>hivemall-xgboost</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <finalName>${project.artifactId}-${project.version}</finalName> + <archive> + <index>true</index> + <compress>true</compress> + <manifest> + <addClasspath>false</addClasspath> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <id>jar-with-dependencies</id> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <finalName>${project.artifactId}-${project.version}</finalName> + <outputDirectory>${project.parent.build.directory}</outputDirectory> + <minimizeJar>false</minimizeJar> + <createDependencyReducedPom>false</createDependencyReducedPom> + <createSourcesJar>true</createSourcesJar> + <promoteTransitiveDependencies>true</promoteTransitiveDependencies> + <artifactSet> + <includes> + <include>org.apache.hivemall:hivemall-core</include> + <include>org.apache.hivemall:hivemall-nlp</include> + <include>org.apache.hivemall:hivemall-xgboost</include> + </includes> + <excludes> + <exclude>org.apache.hivemall:hivemall-all</exclude> + </excludes> + </artifactSet> + <transformers> + <transformer + implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <manifestEntries> + <Implementation-Title>${project.name}</Implementation-Title> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> + </manifestEntries> + </transformer> + </transformers> + <filters> + <filter> + <artifact>org.apache.lucene:*</artifact> + <includes> + <include>**</include> + </includes> + </filter> + <filter> + <artifact>com.esotericsoftware.kryo:kryo</artifact> + <includes> + <include>**</include> + </includes> + </filter> + <filter> + <artifact>*:*</artifact> + <excludes> + <exclude>META-INF/LICENSE.txt</exclude> + <exclude>META-INF/NOTICE.txt</exclude> + <exclude>META-INF/*.SF</exclude> + <exclude>META-INF/*.DSA</exclude> + <exclude>META-INF/*.RSA</exclude> + <exclude>*.jar</exclude> + <exclude>tracker.py</exclude> + </excludes> + </filter> + </filters> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/44cbbe7f/mixserv/pom.xml ---------------------------------------------------------------------- diff --git a/mixserv/pom.xml b/mixserv/pom.xml index 51f20e6..ff27b09 100644 --- a/mixserv/pom.xml +++ b/mixserv/pom.xml @@ -136,6 +136,7 @@ <include>commons-cli:commons-cli</include> <include>commons-logging:commons-logging</include> <include>log4j:log4j</include> + <include>io.netty.netty-all</include> </includes> </artifactSet> <!-- maven-shade-plugin cannot handle the dependency of log4j because http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/44cbbe7f/nlp/pom.xml ---------------------------------------------------------------------- diff --git a/nlp/pom.xml b/nlp/pom.xml index 15fb179..782e41d 100644 --- a/nlp/pom.xml +++ b/nlp/pom.xml @@ -112,82 +112,4 @@ </dependencies> - <build> - <plugins> - <!-- hivemall-nlp-xx-with-dependencies.jar including minimum dependencies --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <id>jar-with-dependencies</id> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <finalName>${project.artifactId}-${project.version}-with-dependencies</finalName> - <outputDirectory>${project.parent.build.directory}</outputDirectory> - <minimizeJar>true</minimizeJar> - <createDependencyReducedPom>false</createDependencyReducedPom> - <artifactSet> - <includes> - <include>org.apache.hivemall:hivemall-core</include> - <include>org.apache.lucene:lucene-analyzers-kuromoji</include> - <include>org.apache.lucene:lucene-analyzers-smartcn</include> - <include>org.apache.lucene:lucene-analyzers-common</include> - <include>org.apache.lucene:lucene-core</include> - </includes> - </artifactSet> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/LICENSE.txt</exclude> - </excludes> - </filter> - <filter> - <artifact>org.apache.lucene:lucene-analyzers-kuromoji</artifact> - <includes> - <include>**</include> - </includes> - </filter> - <filter> - <artifact>org.apache.lucene:lucene-analyzers-smartcn</artifact> - <includes> - <include>**</include> - </includes> - </filter> - <filter> - <artifact>org.apache.lucene:lucene-analyzers-common</artifact> - <includes> - <include>**</include> - </includes> - </filter> - <filter> - <artifact>org.apache.lucene:lucene-core</artifact> - <includes> - <include>**</include> - </includes> - </filter> - </filters> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <manifestEntries> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - </manifestEntries> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> - <addHeader>false</addHeader> - </transformer> - </transformers> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/44cbbe7f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 84e149e..4d20b01 100644 --- a/pom.xml +++ b/pom.xml @@ -250,6 +250,7 @@ <module>xgboost</module> <module>mixserv</module> <module>spark</module> + <module>dist</module> </modules> <properties> @@ -449,6 +450,11 @@ <version>3.1.0</version> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M1</version> + </plugin> + <plugin> <!-- mvn formatter:format --> <groupId>net.revelc.code</groupId> <artifactId>formatter-maven-plugin</artifactId> @@ -582,7 +588,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.0.0-M1</version> <executions> <execution> <id>enforce-JAVA_HOME-is-set</id> @@ -726,30 +731,6 @@ </dependencies> </plugin> <!-- end mvn site --> - <plugin> - <groupId>org.scalastyle</groupId> - <artifactId>scalastyle-maven-plugin</artifactId> - <version>0.8.0</version> - <configuration> - <verbose>false</verbose> - <failOnViolation>true</failOnViolation> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <failOnWarning>false</failOnWarning> - <sourceDirectory>${basedir}/src/main/scala</sourceDirectory> - <testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory> - <configLocation>spark/scalastyle-config.xml</configLocation> - <outputFile>${basedir}/target/scalastyle-output.xml</outputFile> - <inputEncoding>${project.build.sourceEncoding}</inputEncoding> - <outputEncoding>${project.reporting.outputEncoding}</outputEncoding> - </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> <!-- mvn apache-rat:check --> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/44cbbe7f/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index fb85eef..2b39dc8 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -83,12 +83,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.xerial</groupId> - <artifactId>xerial-core</artifactId> - <version>3.2.3</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> <version>2.2.4</version> @@ -142,11 +136,67 @@ <tagsToExclude>${test.exclude.tags}</tagsToExclude> </configuration> </plugin> + <!-- hivemall-spark_xx-xx-with-dependencies.jar including minimum dependencies --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <id>jar-with-dependencies</id> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <finalName>${project.artifactId}-${project.version}-with-dependencies</finalName> + <outputDirectory>${main.basedir}/target</outputDirectory> + <minimizeJar>false</minimizeJar> + <createDependencyReducedPom>false</createDependencyReducedPom> + <artifactSet> + <includes> + <include>org.apache.hivemall:hivemall-core</include> + <include>org.apache.hivemall:hivemall-nlp</include> + <include>org.apache.hivemall:hivemall-xgboost</include> + <include>org.apache.hivemall:hivemall-spark-common</include> + </includes> + </artifactSet> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.scalastyle</groupId> + <artifactId>scalastyle-maven-plugin</artifactId> + <version>0.8.0</version> + </plugin> </plugins> </pluginManagement> <plugins> <plugin> + <groupId>org.scalastyle</groupId> + <artifactId>scalastyle-maven-plugin</artifactId> + <configuration> + <verbose>false</verbose> + <failOnViolation>true</failOnViolation> + <includeTestSourceDirectory>true</includeTestSourceDirectory> + <failOnWarning>false</failOnWarning> + <sourceDirectory>${basedir}/src/main/scala</sourceDirectory> + <testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory> + <configLocation>spark/scalastyle-config.xml</configLocation> + <outputFile>${basedir}/target/scalastyle-output.xml</outputFile> + <inputEncoding>${project.build.sourceEncoding}</inputEncoding> + <outputEncoding>${project.reporting.outputEncoding}</outputEncoding> + </configuration> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>net.alchim31.maven</groupId> <artifactId>scala-maven-plugin</artifactId> <executions> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/44cbbe7f/spark/spark-2.0/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-2.0/pom.xml b/spark/spark-2.0/pom.xml index 50fd818..5b4a606 100644 --- a/spark/spark-2.0/pom.xml +++ b/spark/spark-2.0/pom.xml @@ -100,11 +100,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.xerial</groupId> - <artifactId>xerial-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> <scope>test</scope> @@ -117,28 +112,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <id>jar-with-dependencies</id> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <finalName>${project.artifactId}-${project.version}-with-dependencies</finalName> - <outputDirectory>${project.parent.parent.build.directory}</outputDirectory> - <minimizeJar>false</minimizeJar> - <createDependencyReducedPom>false</createDependencyReducedPom> - <artifactSet> - <includes> - <include>org.apache.hivemall:hivemall-core</include> - <include>org.apache.hivemall:hivemall-xgboost</include> - <include>org.apache.hivemall:hivemall-spark-common</include> - </includes> - </artifactSet> - </configuration> - </execution> - </executions> </plugin> <!-- disable surefire because there is no java test --> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/44cbbe7f/spark/spark-2.1/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-2.1/pom.xml b/spark/spark-2.1/pom.xml index 3890233..0423045 100644 --- a/spark/spark-2.1/pom.xml +++ b/spark/spark-2.1/pom.xml @@ -100,11 +100,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.xerial</groupId> - <artifactId>xerial-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> <scope>test</scope> @@ -117,28 +112,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <id>jar-with-dependencies</id> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <finalName>${project.artifactId}-${project.version}-with-dependencies</finalName> - <outputDirectory>${project.parent.parent.build.directory}</outputDirectory> - <minimizeJar>false</minimizeJar> - <createDependencyReducedPom>false</createDependencyReducedPom> - <artifactSet> - <includes> - <include>org.apache.hivemall:hivemall-core</include> - <include>org.apache.hivemall:hivemall-xgboost</include> - <include>org.apache.hivemall:hivemall-spark-common</include> - </includes> - </artifactSet> - </configuration> - </execution> - </executions> </plugin> <!-- disable surefire because there is no java test --> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/44cbbe7f/spark/spark-2.2/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-2.2/pom.xml b/spark/spark-2.2/pom.xml index 8afcecf..059d6fd 100644 --- a/spark/spark-2.2/pom.xml +++ b/spark/spark-2.2/pom.xml @@ -104,11 +104,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.xerial</groupId> - <artifactId>xerial-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> <scope>test</scope> @@ -121,28 +116,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <id>jar-with-dependencies</id> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <finalName>${project.artifactId}-${project.version}-with-dependencies</finalName> - <outputDirectory>${project.parent.parent.build.directory}</outputDirectory> - <minimizeJar>false</minimizeJar> - <createDependencyReducedPom>false</createDependencyReducedPom> - <artifactSet> - <includes> - <include>org.apache.hivemall:hivemall-core</include> - <include>org.apache.hivemall:hivemall-xgboost</include> - <include>org.apache.hivemall:hivemall-spark-common</include> - </includes> - </artifactSet> - </configuration> - </execution> - </executions> </plugin> <!-- disable surefire because there is no java test --> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/44cbbe7f/xgboost/pom.xml ---------------------------------------------------------------------- diff --git a/xgboost/pom.xml b/xgboost/pom.xml index ba5abdd..41b1be7 100644 --- a/xgboost/pom.xml +++ b/xgboost/pom.xml @@ -90,44 +90,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <!-- hivemall-xgboost-xx-with-dependencies.jar including minimum dependencies --> - <execution> - <id>jar-with-dependencies</id> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <finalName>${project.artifactId}-${project.version}-with-dependencies</finalName> - <outputDirectory>${project.parent.build.directory}</outputDirectory> - <minimizeJar>true</minimizeJar> - <createDependencyReducedPom>false</createDependencyReducedPom> - <artifactSet> - <includes> - <include>org.apache.hivemall:hivemall-core</include> - <include>io.github.myui:xgboost4j</include> - </includes> - </artifactSet> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>*.jar</exclude> - <exclude>tracker.py</exclude> - </excludes> - </filter> - </filters> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project>
