Fix argLine for jacoco, and update to war plugin 3.0.0

This commit is contained in:
Sean Owen 2016-09-04 21:31:26 +01:00
parent e9e2bd280b
commit 343ddc7a98
2 changed files with 2 additions and 5 deletions

View file

@ -400,7 +400,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>com.simpligility.maven.plugins</groupId>
@ -807,7 +807,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Limit memory for unit tests in Travis -->
<argLine>-Xmx512m</argLine>
<argLine>@{argLine} -Xmx512m</argLine>
<forkCount>1</forkCount>
</configuration>
</plugin>

View file

@ -53,9 +53,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>