Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson
2017-03-28 20:00:21 +01:00

View File

@@ -505,7 +505,7 @@
<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion> <propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput> <consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError> <failOnViolation>true</failOnViolation>
<includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration> </configuration>
<goals> <goals>