Merged 5.2.0 (5.2.0) to HEAD (5.2)

REPO-1710 Complete 5.2 branding items for Alfresco Community Edition
   - Deferred merges: 133228-133238,133589-133594,133748,133750-133761,133853-133854

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134173 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2017-01-11 10:28:37 +00:00
parent 596bbb5174
commit ec17295260

View File

@@ -6,9 +6,9 @@
<artifactId>alfresco-enterprise-packaging</artifactId>
<version>5.2-SNAPSHOT</version>
</parent>
<artifactId>alfresco-one-installer-resources</artifactId>
<artifactId>alfresco-content-services-installer-resources</artifactId>
<packaging>jar</packaging>
<name>Alfresco One Installer Resources + Platform Installers</name>
<name>Alfresco Content Services Installer Resources + Platform Installers</name>
<properties>
<binaries.folder>${user.home}/binaries</binaries.folder>
@@ -18,7 +18,7 @@
<bitrock.arguments>
project.outputDirectory=${project.build.directory}
project.version=${project.version}
project.fullName='Alfresco One Platform'
project.fullName='Alfresco Content Services Platform'
project.osxSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd-osx.p12
project.osxSigningPkcs12Password=${p12Password}
project.windowsSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd.p12
@@ -305,7 +305,7 @@
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-one-platform-distributionzip</artifactId>
<artifactId>alfresco-content-services-platform-distributionzip</artifactId>
<version>${project.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/distribution</outputDirectory>