Updated pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/commit/26e3d705 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/tree/26e3d705 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/diff/26e3d705 Branch: refs/heads/v0.5.0 Commit: 26e3d705f993b03480ce98633c48cae01c34b5b8 Parents: afb2774 Author: Makoto Yui <[email protected]> Authored: Tue Jan 23 09:49:40 2018 +0900 Committer: Makoto Yui <[email protected]> Committed: Tue Jan 23 09:49:40 2018 +0900 ---------------------------------------------------------------------- core/pom.xml | 5 ----- pom.xml | 43 ++----------------------------------------- spark/pom.xml | 37 +++++++++++++++++++++++++++++++++++-- 3 files changed, 37 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/26e3d705/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index c87ded1..160c8ed 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -195,11 +195,6 @@ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> </manifestEntries> </transformer> - <!-- - <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> - <addHeader>false</addHeader> - </transformer> - --> </transformers> <filters> <filter> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/26e3d705/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index cc3bdce..c31e9f8 100644 --- a/pom.xml +++ b/pom.xml @@ -269,7 +269,7 @@ <junit.version>4.12</junit.version> <dependency.locations.enabled>false</dependency.locations.enabled> <main.basedir>${project.basedir}</main.basedir> - <maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version> + <maven-enforcer-plugin.version>3.3.1</maven-enforcer-plugin.version> <surefire.version>2.19.1</surefire.version> </properties> @@ -314,46 +314,6 @@ <profiles> <profile> - <id>spark-2.1</id> - <modules> - <module>spark/spark-2.1</module> - <module>spark/spark-common</module> - </modules> - <properties> - <spark.version>2.1.1</spark.version> - <spark.binary.version>2.1</spark.binary.version> - </properties> - </profile> - <profile> - <id>spark-2.0</id> - <modules> - <module>spark/spark-2.0</module> - <module>spark/spark-common</module> - </modules> - <properties> - <spark.version>2.0.2</spark.version> - <spark.binary.version>2.0</spark.binary.version> - </properties> - </profile> - <profile> - <id>java7</id> - <properties> - <spark.test.jvm.opts>-ea -Xms768m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=512m</spark.test.jvm.opts> - </properties> - <activation> - <jdk>[,1.8)</jdk> <!-- version < 1.8 --> - </activation> - </profile> - <profile> - <id>java8</id> - <properties> - <spark.test.jvm.opts>-ea -Xms768m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:ReservedCodeCacheSize=512m</spark.test.jvm.opts> - </properties> - <activation> - <jdk>[1.8,)</jdk> <!-- version >= 1.8 --> - </activation> - </profile> - <profile> <id>doclint-java8-disable</id> <activation> <jdk>[1.8,)</jdk> @@ -482,6 +442,7 @@ <version>3.0.2</version> <configuration> <finalName>${project.artifactId}-${project.version}</finalName> + <outputDirectory>${main.basedir}</outputDirectory> </configuration> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/26e3d705/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index 7db85ab..fb85eef 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -42,6 +42,7 @@ <main.basedir>${project.parent.basedir}</main.basedir> <scala.version>2.11.8</scala.version> <scala.binary.version>2.11</scala.binary.version> + <scalatest.jvm.opts>-ea -Xms768m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=512m</scalatest.jvm.opts> </properties> <dependencyManagement> @@ -109,6 +110,38 @@ <artifactId>scala-maven-plugin</artifactId> <version>3.2.2</version> </plugin> + <plugin> + <groupId>org.scalatest</groupId> + <artifactId>scalatest-maven-plugin</artifactId> + <version>1.0</version> + <configuration> + <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> + <junitxml>.</junitxml> + <filereports>SparkTestSuite.txt</filereports> + <argLine>${scalatest.jvm.opts}</argLine> + <stderr /> + <environmentVariables> + <SPARK_PREPEND_CLASSES>1</SPARK_PREPEND_CLASSES> + <SPARK_SCALA_VERSION>${scala.binary.version}</SPARK_SCALA_VERSION> + <SPARK_TESTING>1</SPARK_TESTING> + <JAVA_HOME>${env.JAVA_HOME}</JAVA_HOME> + <PATH>${env.JAVA_HOME}/bin:${env.PATH}</PATH> + </environmentVariables> + <systemProperties> + <log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration> + <derby.system.durability>test</derby.system.durability> + <java.awt.headless>true</java.awt.headless> + <java.io.tmpdir>${project.build.directory}/tmp</java.io.tmpdir> + <spark.testing>1</spark.testing> + <spark.ui.enabled>false</spark.ui.enabled> + <spark.ui.showConsoleProgress>false</spark.ui.showConsoleProgress> + <spark.unsafe.exceptionOnMemoryLeak>true</spark.unsafe.exceptionOnMemoryLeak> + <!-- Needed by sql/hive tests. --> + <test.src.tables>__not_used__</test.src.tables> + </systemProperties> + <tagsToExclude>${test.exclude.tags}</tagsToExclude> + </configuration> + </plugin> </plugins> </pluginManagement> @@ -145,9 +178,9 @@ <!-- <arg>-feature</arg> --> </args> <jvmArgs> - <jvmArg>-Xms512m</jvmArg> + <jvmArg>-Xms768m</jvmArg> <jvmArg>-Xmx1024m</jvmArg> - <jvmArg>-XX:PermSize=64m</jvmArg> + <jvmArg>-XX:PermSize=128m</jvmArg> <jvmArg>-XX:MaxPermSize=512m</jvmArg> <jvmArg>-XX:ReservedCodeCacheSize=512m</jvmArg> </jvmArgs>
