Merge release/V2.4.0.x into release/V2.4.

This commit is contained in:
Tom Page
2017-02-28 11:59:11 +00:00

View File

@@ -21,9 +21,9 @@
</organization> </organization>
<scm> <scm>
<connection>scm:git:https://gitlab.alfresco.com/records-management/records-management.git</connection> <connection>scm:git:https://git.alfresco.com/records-management/records-management.git</connection>
<developerConnection>scm:git:https://gitlab.alfresco.com/records-management/records-management.git</developerConnection> <developerConnection>scm:git:https://git.alfresco.com/records-management/records-management.git</developerConnection>
<url>https://gitlab.alfresco.com/records-management/records-management</url> <url>https://git.alfresco.com/records-management/records-management</url>
<tag>HEAD</tag> <tag>HEAD</tag>
</scm> </scm>
@@ -92,6 +92,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<argLine>-Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine> <argLine>-Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
<!-- license properties --> <!-- license properties -->
<license.update.dryrun>true</license.update.dryrun> <license.update.dryrun>true</license.update.dryrun>
<license.verbose>false</license.verbose> <license.verbose>false</license.verbose>