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 /external/java8-tests/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 'external/java8-tests/pom.xml')
-rw-r--r-- | external/java8-tests/pom.xml | 75 |
1 files changed, 11 insertions, 64 deletions
diff --git a/external/java8-tests/pom.xml b/external/java8-tests/pom.xml index 0ad9c5303a..f5a06467ee 100644 --- a/external/java8-tests/pom.xml +++ b/external/java8-tests/pom.xml @@ -27,7 +27,7 @@ <groupId>org.apache.spark</groupId> <artifactId>java8-tests_2.11</artifactId> <packaging>pom</packaging> - <name>Spark Project Java8 Tests POM</name> + <name>Spark Project Java 8 Tests</name> <properties> <sbt.project.name>java8-tests</sbt.project.name> @@ -64,11 +64,6 @@ </dependency> </dependencies> - <profiles> - <profile> - <id>java8-tests</id> - </profile> - </profiles> <build> <plugins> <plugin> @@ -87,74 +82,26 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>test</id> - <goals> - <goal>test</goal> - </goals> - </execution> - </executions> - <configuration> - <systemPropertyVariables> - <!-- For some reason surefire isn't setting this log4j file on the - test classpath automatically. So we add it manually. --> - <log4j.configuration> - file:src/test/resources/log4j.properties - </log4j.configuration> - </systemPropertyVariables> - <skipTests>false</skipTests> - <includes> - <include>**/Suite*.java</include> - <include>**/*Suite.java</include> - </includes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <executions> - <execution> - <id>test-compile-first</id> - <phase>process-test-resources</phase> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> <configuration> - <fork>true</fork> - <verbose>true</verbose> <forceJavacCompilerUse>true</forceJavacCompilerUse> <source>1.8</source> - <compilerVersion>1.8</compilerVersion> <target>1.8</target> - <encoding>UTF-8</encoding> - <maxmem>1024m</maxmem> + <compilerVersion>1.8</compilerVersion> </configuration> </plugin> <plugin> - <!-- disabled --> <groupId>net.alchim31.maven</groupId> <artifactId>scala-maven-plugin</artifactId> - <executions> - <execution> - <phase>none</phase> - </execution> - <execution> - <id>scala-compile-first</id> - <phase>none</phase> - </execution> - <execution> - <id>scala-test-compile-first</id> - <phase>none</phase> - </execution> - <execution> - <id>attach-scaladocs</id> - <phase>none</phase> - </execution> - </executions> + <configuration> + <javacArgs> + <javacArg>-source</javacArg> + <javacArg>1.8</javacArg> + <javacArg>-target</javacArg> + <javacArg>1.8</javacArg> + <javacArg>-Xlint:all,-serial,-path</javacArg> + </javacArgs> + </configuration> </plugin> </plugins> </build> |