Repository: spark Updated Branches: refs/heads/branch-1.0 3d79166d9 -> a54a48f83
Improve maven plugin configuration Author: witgo <[email protected]> Closes #786 from witgo/maven_plugin and squashes the following commits: 5de86a2 [witgo] Merge branch 'master' of https://github.com/apache/spark into maven_plugin c35ef73 [witgo] Improve maven plugin configuration Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a54a48f8 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a54a48f8 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a54a48f8 Branch: refs/heads/branch-1.0 Commit: a54a48f83674bb3c6f9aca9f736448338b029dfd Parents: 3d79166 Author: witgo <[email protected]> Authored: Sat May 31 14:36:27 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Sun Jun 1 11:17:51 2014 -0700 ---------------------------------------------------------------------- core/pom.xml | 29 ----------------------------- pom.xml | 4 ++++ repl/pom.xml | 30 ------------------------------ yarn/pom.xml | 30 ------------------------------ 4 files changed, 4 insertions(+), 89 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/a54a48f8/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 47c2507..bd739e5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -259,35 +259,6 @@ <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <exportAntProperties>true</exportAntProperties> - <target> - <property name="spark.classpath" refid="maven.test.classpath" /> - <property environment="env" /> - <fail message="Please set the SCALA_HOME (or SCALA_LIBRARY_PATH if scala is on the path) environment variables and retry."> - <condition> - <not> - <or> - <isset property="env.SCALA_HOME" /> - <isset property="env.SCALA_LIBRARY_PATH" /> - </or> - </not> - </condition> - </fail> - </target> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.scalatest</groupId> <artifactId>scalatest-maven-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/spark/blob/a54a48f8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2d42eb6..c1d87bd 100644 --- a/pom.xml +++ b/pom.xml @@ -813,6 +813,10 @@ <filereports>${project.build.directory}/SparkTestSuite.txt</filereports> <argLine>-Xmx3g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=512m</argLine> <stderr /> + <environmentVariables> + <SPARK_HOME>${session.executionRootDirectory}</SPARK_HOME> + <SPARK_TESTING>1</SPARK_TESTING> + </environmentVariables> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/spark/blob/a54a48f8/repl/pom.xml ---------------------------------------------------------------------- diff --git a/repl/pom.xml b/repl/pom.xml index 4670e87..6b20aa1 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -93,41 +93,11 @@ <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <exportAntProperties>true</exportAntProperties> - <target> - <property name="spark.classpath" refid="maven.test.classpath" /> - <property environment="env" /> - <fail message="Please set the SCALA_HOME (or SCALA_LIBRARY_PATH if scala is on the path) environment variables and retry."> - <condition> - <not> - <or> - <isset property="env.SCALA_HOME" /> - <isset property="env.SCALA_LIBRARY_PATH" /> - </or> - </not> - </condition> - </fail> - </target> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.scalatest</groupId> <artifactId>scalatest-maven-plugin</artifactId> <configuration> <environmentVariables> <SPARK_HOME>${basedir}/..</SPARK_HOME> - <SPARK_TESTING>1</SPARK_TESTING> </environmentVariables> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/spark/blob/a54a48f8/yarn/pom.xml ---------------------------------------------------------------------- diff --git a/yarn/pom.xml b/yarn/pom.xml index 983ce6f..5b1b606 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -118,41 +118,11 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <exportAntProperties>true</exportAntProperties> - <target> - <property name="spark.classpath" refid="maven.test.classpath" /> - <property environment="env" /> - <fail message="Please set the SCALA_HOME (or SCALA_LIBRARY_PATH if scala is on the path) environment variables and retry."> - <condition> - <not> - <or> - <isset property="env.SCALA_HOME" /> - <isset property="env.SCALA_LIBRARY_PATH" /> - </or> - </not> - </condition> - </fail> - </target> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.scalatest</groupId> <artifactId>scalatest-maven-plugin</artifactId> <configuration> <environmentVariables> <SPARK_HOME>${basedir}/../..</SPARK_HOME> - <SPARK_TESTING>1</SPARK_TESTING> <SPARK_CLASSPATH>${spark.classpath}</SPARK_CLASSPATH> </environmentVariables> </configuration>
