Skip to content

Commit d8c005d

Browse files
witgopwendell
witgo
authored and
pwendell
committed
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
1 parent 9909efc commit d8c005d

File tree

4 files changed

+4
-89
lines changed

4 files changed

+4
-89
lines changed

‎core/pom.xml‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -258,35 +258,6 @@
258258
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
259259
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
260260
<plugins>
261-
<plugin>
262-
<groupId>org.apache.maven.plugins</groupId>
263-
<artifactId>maven-antrun-plugin</artifactId>
264-
<executions>
265-
<execution>
266-
<phase>test</phase>
267-
<goals>
268-
<goal>run</goal>
269-
</goals>
270-
<configuration>
271-
<exportAntProperties>true</exportAntProperties>
272-
<target>
273-
<property name="spark.classpath" refid="maven.test.classpath" />
274-
<property environment="env" />
275-
<fail message="Please set the SCALA_HOME (or SCALA_LIBRARY_PATH if scala is on the path) environment variables and retry.">
276-
<condition>
277-
<not>
278-
<or>
279-
<isset property="env.SCALA_HOME" />
280-
<isset property="env.SCALA_LIBRARY_PATH" />
281-
</or>
282-
</not>
283-
</condition>
284-
</fail>
285-
</target>
286-
</configuration>
287-
</execution>
288-
</executions>
289-
</plugin>
290261
<plugin>
291262
<groupId>org.scalatest</groupId>
292263
<artifactId>scalatest-maven-plugin</artifactId>

‎pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -814,6 +814,10 @@
814814
<filereports>${project.build.directory}/SparkTestSuite.txt</filereports>
815815
<argLine>-Xmx3g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=512m</argLine>
816816
<stderr/>
817+
<environmentVariables>
818+
<SPARK_HOME>${session.executionRootDirectory}</SPARK_HOME>
819+
<SPARK_TESTING>1</SPARK_TESTING>
820+
</environmentVariables>
817821
</configuration>
818822
<executions>
819823
<execution>

‎repl/pom.xml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -92,42 +92,12 @@
9292
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
9393
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
9494
<plugins>
95-
<plugin>
96-
<groupId>org.apache.maven.plugins</groupId>
97-
<artifactId>maven-antrun-plugin</artifactId>
98-
<executions>
99-
<execution>
100-
<phase>test</phase>
101-
<goals>
102-
<goal>run</goal>
103-
</goals>
104-
<configuration>
105-
<exportAntProperties>true</exportAntProperties>
106-
<target>
107-
<property name="spark.classpath" refid="maven.test.classpath" />
108-
<property environment="env" />
109-
<fail message="Please set the SCALA_HOME (or SCALA_LIBRARY_PATH if scala is on the path) environment variables and retry.">
110-
<condition>
111-
<not>
112-
<or>
113-
<isset property="env.SCALA_HOME" />
114-
<isset property="env.SCALA_LIBRARY_PATH" />
115-
</or>
116-
</not>
117-
</condition>
118-
</fail>
119-
</target>
120-
</configuration>
121-
</execution>
122-
</executions>
123-
</plugin>
12495
<plugin>
12596
<groupId>org.scalatest</groupId>
12697
<artifactId>scalatest-maven-plugin</artifactId>
12798
<configuration>
12899
<environmentVariables>
129100
<SPARK_HOME>${basedir}/..</SPARK_HOME>
130-
<SPARK_TESTING>1</SPARK_TESTING>
131101
</environmentVariables>
132102
</configuration>
133103
</plugin>

‎yarn/pom.xml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -117,42 +117,12 @@
117117
</execution>
118118
</executions>
119119
</plugin>
120-
<plugin>
121-
<groupId>org.apache.maven.plugins</groupId>
122-
<artifactId>maven-antrun-plugin</artifactId>
123-
<executions>
124-
<execution>
125-
<phase>test</phase>
126-
<goals>
127-
<goal>run</goal>
128-
</goals>
129-
<configuration>
130-
<exportAntProperties>true</exportAntProperties>
131-
<target>
132-
<property name="spark.classpath" refid="maven.test.classpath" />
133-
<property environment="env" />
134-
<fail message="Please set the SCALA_HOME (or SCALA_LIBRARY_PATH if scala is on the path) environment variables and retry.">
135-
<condition>
136-
<not>
137-
<or>
138-
<isset property="env.SCALA_HOME" />
139-
<isset property="env.SCALA_LIBRARY_PATH" />
140-
</or>
141-
</not>
142-
</condition>
143-
</fail>
144-
</target>
145-
</configuration>
146-
</execution>
147-
</executions>
148-
</plugin>
149120
<plugin>
150121
<groupId>org.scalatest</groupId>
151122
<artifactId>scalatest-maven-plugin</artifactId>
152123
<configuration>
153124
<environmentVariables>
154125
<SPARK_HOME>${basedir}/../..</SPARK_HOME>
155-
<SPARK_TESTING>1</SPARK_TESTING>
156126
<SPARK_CLASSPATH>${spark.classpath}</SPARK_CLASSPATH>
157127
</environmentVariables>
158128
</configuration>

0 commit comments

Comments
 (0)