提交 3b5daaaa 编写于 作者: J Jesse Glick

Removing maven-junit-plugin as it does not support JUnit 4 and Surefire has...

Removing maven-junit-plugin as it does not support JUnit 4 and Surefire has parallel testing features.
上级 d5e513e6
......@@ -347,7 +347,7 @@ THE SOFTWARE.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.10</version>
<version>2.12.2</version>
<configuration>
<systemPropertyVariables>
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
......@@ -433,12 +433,6 @@ THE SOFTWARE.
</execution>
</executions>
</plugin>
<plugin>
<!-- see http://maven-junit-plugin.kenai.com/ for more info -->
<groupId>org.kohsuke</groupId>
<artifactId>maven-junit-plugin</artifactId>
<version>1.9</version>
</plugin>
<plugin>
<groupId>org.jvnet.localizer</groupId>
<artifactId>maven-localizer-plugin</artifactId>
......
......@@ -40,7 +40,6 @@ THE SOFTWARE.
</description>
<properties>
<concurrency>2</concurrency> <!-- -1 means # of processors in the system -->
<mavenDebug>false</mavenDebug>
</properties>
......@@ -171,8 +170,22 @@ THE SOFTWARE.
<artifactId>maven-surefire-plugin</artifactId>
<!-- version specified in grandparent pom -->
<configuration>
<skip>true</skip>
<!-- tests now run by maven-junit-plugin -->
<argLine>-Dfile.encoding=UTF-8 -XX:MaxPermSize=128m</argLine>
<systemProperties>
<property>
<!-- use AntClassLoader that supports predictable file handle release -->
<name>hudson.ClassicPluginStrategy.useAntClassLoader</name>
<value>true</value>
</property>
<property>
<name>hudson.maven.debug</name>
<value>${mavenDebug}</value>
</property>
<property>
<name>buildDirectory</name>
<value>${project.build.directory}</value>
</property>
</systemProperties>
</configuration>
</plugin>
<plugin>
......@@ -216,79 +229,6 @@ THE SOFTWARE.
</build>
<profiles>
<profile>
<id>run-test-harness</id>
<activation>
<property>
<name>!skip-test-harness</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<!-- JUnit4 test is failed with maven-junit-plugin-->
<artifactId>maven-surefire-plugin</artifactId>
<!-- version specified in grandparent pom -->
<configuration>
<skip>false</skip>
<includes>
<include>**/UseRecipesWithJenkinsRuleTest.java</include>
<include>hudson/model/CauseTest.java</include>
</includes>
</configuration>
</plugin>
<plugin>
<!-- see http://maven-junit-plugin.kenai.com/ for more info -->
<groupId>org.kohsuke</groupId>
<artifactId>maven-junit-plugin</artifactId>
<!-- version specified in grandparent pom -->
<executions>
<execution>
<goals>
<goal>test</goal>
</goals>
<configuration>
<fork>true</fork>
<concurrency>${concurrency}</concurrency>
<argLine>-Dfile.encoding=UTF-8 -XX:MaxPermSize=128m</argLine>
<timeout>300</timeout>
<systemProperties>
<property>
<!-- use AntClassLoader that supports predictable file handle release -->
<name>hudson.ClassicPluginStrategy.useAntClassLoader</name>
<value>true</value>
</property>
<property>
<name>hudson.maven.debug</name>
<value>${mavenDebug}</value>
</property>
<property>
<name>java.io.tmpdir</name>
<value>${project.build.directory}</value>
</property>
<property>
<name>buildDirectory</name>
<value>${project.build.directory}</value>
</property>
<property>
<name>java.awt.headless</name>
<value>true</value>
</property>
</systemProperties>
<excludes>
<exclude>org/jvnet/hudson/main/UseRecipesWithJenkinsRuleTest.class</exclude>
<exclude>hudson/model/CauseTest.java</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>light-test</id>
<properties>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册