diff options
| -rw-r--r-- | core/pom.xml | 29 | ||||
| -rw-r--r-- | pom.xml | 4 | ||||
| -rw-r--r-- | repl/pom.xml | 30 | ||||
| -rw-r--r-- | yarn/pom.xml | 30 |
4 files changed, 4 insertions, 89 deletions
diff --git a/core/pom.xml b/core/pom.xml index bab50f5ce2..0777c5b1f0 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> @@ -814,6 +814,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> diff --git a/repl/pom.xml b/repl/pom.xml index b761a176ce..bcdb24b040 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> diff --git a/yarn/pom.xml b/yarn/pom.xml index 6993c89525..2811ffffbd 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> |