From d8c005d5371f81a2a06c5d27c7021e1ae43d7193 Mon Sep 17 00:00:00 2001
From: witgo <witgo@qq.com>
Date: Sat, 31 May 2014 14:36:27 -0700
Subject: [PATCH] Improve maven plugin configuration
Author: witgo <witgo@qq.com>
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
---
core/pom.xml | 29 -----------------------------
pom.xml | 4 ++++
repl/pom.xml | 30 ------------------------------
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
@@ -258,35 +258,6 @@
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<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>
diff --git a/pom.xml b/pom.xml
index 7bf9f135fd..fe43a9518b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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
@@ -92,42 +92,12 @@
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<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
@@ -117,42 +117,12 @@
</execution>
</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>
--
GitLab