Repository: incubator-hivemall Updated Branches: refs/heads/v0.5.0 26e3d705f -> caf502d6e
Updated pom for building Spark 2.2 and for shade Project: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/commit/caf502d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/tree/caf502d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/diff/caf502d6 Branch: refs/heads/v0.5.0 Commit: caf502d6ef10ef200a1b69bf9f4369a8063ed107 Parents: 26e3d70 Author: Makoto Yui <[email protected]> Authored: Tue Jan 23 12:51:12 2018 +0900 Committer: Makoto Yui <[email protected]> Committed: Tue Jan 23 12:51:12 2018 +0900 ---------------------------------------------------------------------- core/pom.xml | 4 ---- mixserv/pom.xml | 5 ----- nlp/pom.xml | 10 +++------- pom.xml | 45 +++++++++++++++++++++++++++++++++++--------- spark/spark-2.0/pom.xml | 10 ---------- spark/spark-2.1/pom.xml | 10 ---------- spark/spark-2.2/pom.xml | 22 ++++++++++------------ xgboost/pom.xml | 16 +++------------- 8 files changed, 52 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/caf502d6/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 160c8ed..da5a9bd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -153,10 +153,6 @@ </dependencies> <build> - <directory>target</directory> - <outputDirectory>target/classes</outputDirectory> - <finalName>${project.artifactId}-${project.version}</finalName> - <testOutputDirectory>target/test-classes</testOutputDirectory> <plugins> <!-- hivemall-core-xx-with-dependencies.jar including minimum dependencies --> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/caf502d6/mixserv/pom.xml ---------------------------------------------------------------------- diff --git a/mixserv/pom.xml b/mixserv/pom.xml index 09b134f..51f20e6 100644 --- a/mixserv/pom.xml +++ b/mixserv/pom.xml @@ -113,10 +113,6 @@ </dependencies> <build> - <directory>target</directory> - <outputDirectory>target/classes</outputDirectory> - <finalName>${project.artifactId}-${project.version}</finalName> - <testOutputDirectory>target/test-classes</testOutputDirectory> <plugins> <!-- hivemall-mixserv-xx-fat.jar including all dependencies --> <plugin> @@ -140,7 +136,6 @@ <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/caf502d6/nlp/pom.xml ---------------------------------------------------------------------- diff --git a/nlp/pom.xml b/nlp/pom.xml index 429de86..15fb179 100644 --- a/nlp/pom.xml +++ b/nlp/pom.xml @@ -76,14 +76,14 @@ <artifactId>guava</artifactId> <scope>provided</scope> </dependency> + + <!-- compile scope --> <dependency> <groupId>org.apache.hivemall</groupId> <artifactId>hivemall-core</artifactId> <version>${project.version}</version> - <scope>provided</scope> + <scope>compile</scope> </dependency> - - <!-- compile scope --> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-analyzers-kuromoji</artifactId> @@ -113,10 +113,6 @@ </dependencies> <build> - <directory>target</directory> - <outputDirectory>target/classes</outputDirectory> - <finalName>${project.artifactId}-${project.version}</finalName> - <testOutputDirectory>target/test-classes</testOutputDirectory> <plugins> <!-- hivemall-nlp-xx-with-dependencies.jar including minimum dependencies --> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/caf502d6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c31e9f8..84e149e 100644 --- a/pom.xml +++ b/pom.xml @@ -253,8 +253,7 @@ </modules> <properties> - <java.source.version>1.7</java.source.version> - <java.target.version>1.7</java.target.version> + <main.basedir>${project.basedir}</main.basedir> <maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.target>1.7</maven.compiler.target> <maven.build.timestamp.format>yyyy</maven.build.timestamp.format> @@ -268,8 +267,7 @@ <guava.version>11.0.2</guava.version> <junit.version>4.12</junit.version> <dependency.locations.enabled>false</dependency.locations.enabled> - <main.basedir>${project.basedir}</main.basedir> - <maven-enforcer-plugin.version>3.3.1</maven-enforcer-plugin.version> + <maven-enforcer.requireMavenVersion>[3.3.1,)</maven-enforcer.requireMavenVersion> <surefire.version>2.19.1</surefire.version> </properties> @@ -442,7 +440,7 @@ <version>3.0.2</version> <configuration> <finalName>${project.artifactId}-${project.version}</finalName> - <outputDirectory>${main.basedir}</outputDirectory> + <outputDirectory>${main.basedir}/target</outputDirectory> </configuration> </plugin> <plugin> @@ -584,16 +582,45 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M1</version> <executions> <execution> - <id>enforce-maven</id> + <id>enforce-JAVA_HOME-is-set</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireEnvironmentVariable> + <variableName>JAVA_HOME</variableName> + </requireEnvironmentVariable> + </rules> + <fail>true</fail> + </configuration> + </execution> + <execution> + <id>enforce-JAVA8_HOME-is-set</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireEnvironmentVariable> + <variableName>JAVA8_HOME</variableName> + </requireEnvironmentVariable> + </rules> + <fail>true</fail> + </configuration> + </execution> + <execution> + <id>required-maven-version</id> <goals> <goal>enforce</goal> </goals> <configuration> <rules> <requireMavenVersion> - <version>[3.3.1,)</version> + <version>${maven-enforcer.requireMavenVersion}</version> </requireMavenVersion> </rules> </configuration> @@ -621,8 +648,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>${java.source.version}</source> - <target>${java.target.version}</target> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> <debug>true</debug> <debuglevel>lines,vars,source</debuglevel> <encoding>UTF-8</encoding> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/caf502d6/spark/spark-2.0/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-2.0/pom.xml b/spark/spark-2.0/pom.xml index 9286697..50fd818 100644 --- a/spark/spark-2.0/pom.xml +++ b/spark/spark-2.0/pom.xml @@ -55,11 +55,6 @@ <version>${project.version}</version> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <scope>compile</scope> - </dependency> <!-- provided scope --> <dependency> @@ -139,11 +134,6 @@ <include>org.apache.hivemall:hivemall-core</include> <include>org.apache.hivemall:hivemall-xgboost</include> <include>org.apache.hivemall:hivemall-spark-common</include> - <include>com.github.haifengl:smile-core</include> - <include>com.github.haifengl:smile-math</include> - <include>com.github.haifengl:smile-data</include> - <include>ml.dmlc:xgboost4j</include> - <include>com.esotericsoftware.kryo:kryo</include> </includes> </artifactSet> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/caf502d6/spark/spark-2.1/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-2.1/pom.xml b/spark/spark-2.1/pom.xml index 003226e..3890233 100644 --- a/spark/spark-2.1/pom.xml +++ b/spark/spark-2.1/pom.xml @@ -55,11 +55,6 @@ <version>${project.version}</version> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <scope>compile</scope> - </dependency> <!-- provided scope --> <dependency> @@ -139,11 +134,6 @@ <include>org.apache.hivemall:hivemall-core</include> <include>org.apache.hivemall:hivemall-xgboost</include> <include>org.apache.hivemall:hivemall-spark-common</include> - <include>com.github.haifengl:smile-core</include> - <include>com.github.haifengl:smile-math</include> - <include>com.github.haifengl:smile-data</include> - <include>ml.dmlc:xgboost4j</include> - <include>com.esotericsoftware.kryo:kryo</include> </includes> </artifactSet> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/caf502d6/spark/spark-2.2/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-2.2/pom.xml b/spark/spark-2.2/pom.xml index 9e96d80..01f34d9 100644 --- a/spark/spark-2.2/pom.xml +++ b/spark/spark-2.2/pom.xml @@ -36,8 +36,6 @@ <spark.version>2.2.0</spark.version> <spark.binary.version>2.2</spark.binary.version> <scalatest.jvm.opts>-ea -Xms768m -Xmx2g -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:ReservedCodeCacheSize=512m</scalatest.jvm.opts> - <java.source.version>1.8</java.source.version> - <java.target.version>1.8</java.target.version> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> </properties> @@ -60,11 +58,6 @@ <version>${project.version}</version> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <scope>compile</scope> - </dependency> <!-- provided scope --> <dependency> @@ -144,11 +137,6 @@ <include>org.apache.hivemall:hivemall-core</include> <include>org.apache.hivemall:hivemall-xgboost</include> <include>org.apache.hivemall:hivemall-spark-common</include> - <include>com.github.haifengl:smile-core</include> - <include>com.github.haifengl:smile-math</include> - <include>com.github.haifengl:smile-data</include> - <include>ml.dmlc:xgboost4j</include> - <include>com.esotericsoftware.kryo:kryo</include> </includes> </artifactSet> </configuration> @@ -176,6 +164,16 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.scalatest</groupId> + <artifactId>scalatest-maven-plugin</artifactId> + <configuration> + <environmentVariables> + <JAVA_HOME>${env.JAVA8_HOME}</JAVA_HOME> + <PATH>${env.JAVA8_HOME}/bin:${env.PATH}</PATH> + </environmentVariables> + </configuration> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/caf502d6/xgboost/pom.xml ---------------------------------------------------------------------- diff --git a/xgboost/pom.xml b/xgboost/pom.xml index b0ba6c1..ba5abdd 100644 --- a/xgboost/pom.xml +++ b/xgboost/pom.xml @@ -67,14 +67,14 @@ <artifactId>log4j</artifactId> <scope>provided</scope> </dependency> + + <!-- compile scope --> <dependency> <groupId>org.apache.hivemall</groupId> <artifactId>hivemall-core</artifactId> <version>${project.version}</version> - <scope>provided</scope> + <scope>compile</scope> </dependency> - - <!-- compile scope --> <dependency> <groupId>io.github.myui</groupId> <artifactId>xgboost4j</artifactId> @@ -91,10 +91,6 @@ </dependencies> <build> - <directory>target</directory> - <outputDirectory>target/classes</outputDirectory> - <finalName>${project.artifactId}-${project.version}</finalName> - <testOutputDirectory>target/test-classes</testOutputDirectory> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -115,13 +111,7 @@ <artifactSet> <includes> <include>org.apache.hivemall:hivemall-core</include> - <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>io.github.myui:xgboost4j</include> - <include>com.esotericsoftware.kryo:kryo</include> </includes> </artifactSet> <filters>
