Merge branch 'master' into 2.0.x

This commit is contained in:
Marcin Grzejszczak
2017-08-29 15:40:52 +02:00
2 changed files with 1 additions and 1 deletions

View File

@@ -51,7 +51,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.12</version>
<inherited>false</inherited>
</plugin>
</plugins>

View File

@@ -433,6 +433,7 @@
<configuration>
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>${surefireArgLine}</argLine>
<argLine>${surefireArgLine}</argLine>
</configuration>
</plugin>
</plugins>