diff options
| author | Josh Rosen <joshrosen@databricks.com> | 2016-03-31 13:52:59 -0700 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2016-03-31 13:52:59 -0700 |
| commit | a7af6cd2eaf9f6ff491b9e1fabfc9c6f3d0f54bf (patch) | |
| tree | ed2f42c05660c73bec8a1e396780d91205883bd8 /pom.xml | |
| parent | b11887c086974dbab18b9f53e99a26bbe06e9c86 (diff) | |
| download | spark-a7af6cd2eaf9f6ff491b9e1fabfc9c6f3d0f54bf.tar.gz spark-a7af6cd2eaf9f6ff491b9e1fabfc9c6f3d0f54bf.tar.bz2 spark-a7af6cd2eaf9f6ff491b9e1fabfc9c6f3d0f54bf.zip | |
[SPARK-14281][TESTS] Fix java8-tests and simplify their build
This patch fixes a compilation / build break in Spark's `java8-tests` and refactors their POM to simplify the build. See individual commit messages for more details.
Author: Josh Rosen <joshrosen@databricks.com>
Closes #12073 from JoshRosen/fix-java8-tests.
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 31 |
1 files changed, 13 insertions, 18 deletions
@@ -1920,6 +1920,7 @@ <JAVA_HOME>${test.java.home}</JAVA_HOME> </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> @@ -1935,6 +1936,14 @@ <failIfNoTests>false</failIfNoTests> <excludedGroups>${test.exclude.tags}</excludedGroups> </configuration> + <executions> + <execution> + <id>test</id> + <goals> + <goal>test</goal> + </goals> + </execution> + </executions> </plugin> <!-- Scalatest runs all Scala tests --> <plugin> @@ -1959,6 +1968,7 @@ <JAVA_HOME>${test.java.home}</JAVA_HOME> </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> @@ -2343,27 +2353,12 @@ <profile> <id>java8-tests</id> - <build> - <plugins> - <!-- Needed for publishing test jars as it is needed by java8-tests --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - + <activation> + <jdk>[1.8,)</jdk> + </activation> <modules> <module>external/java8-tests</module> </modules> - </profile> <profile> |