inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.2) to HEAD (5.2)

Browse Source 
137096 skopf: Merged REPO-2054 (5.2.1) to 5.2.N (5.2.1)
      136870 anechifor: changes pdfium->alfresco-pdf-renderer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137611 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:20:33 +00:00
parent 4ea5f9dffb
commit 4b19360285
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pom.xml
View File

@@ -15,6 +15,17 @@
<bitrock.folder>${project.build.directory}/installbuilder</bitrock.folder> <bitrock.folder>${project.build.directory}/installbuilder</bitrock.folder>
<signing.key.location>${binaries.folder}/build-classpath/code-signing</signing.key.location> <signing.key.location>${binaries.folder}/build-classpath/code-signing</signing.key.location>
<license.file.location>${binaries.folder}/build-classpath/license.xml</license.file.location> <license.file.location>${binaries.folder}/build-classpath/license.xml</license.file.location>
<bitrock.arguments>
project.outputDirectory=${project.build.directory}
project.version=${project.version}
project.fullName='Alfresco Content Services Platform'
alfresco_edition=enterprise
alfresco_package='${alfresco.package.name}'
alfrescogoogledocs_component_enabled=0
alfrescosolr_component_enabled=0
alfrescowcmqs_component_enabled=0
</bitrock.arguments>
<!--
<bitrock.arguments> <bitrock.arguments>
project.outputDirectory=${project.build.directory} project.outputDirectory=${project.build.directory}
project.version=${project.version} project.version=${project.version}
@@ -29,6 +40,7 @@
alfrescosolr_component_enabled=0 alfrescosolr_component_enabled=0
alfrescowcmqs_component_enabled=0 alfrescowcmqs_component_enabled=0
</bitrock.arguments> </bitrock.arguments>
-->
</properties> </properties>
<dependencies> <dependencies>
@@ -166,25 +178,25 @@
</dependency> </dependency>
<!-- Pdfium --> <!-- Alfresco Pdf Renderer -->
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-pdf-renderer</artifactId> <artifactId>alfresco-pdf-renderer</artifactId>
<version>${installer.pdfium.version}</version> <version>${installer.alfresco-pdf-renderer.version}</version>
<classifier>linux</classifier> <classifier>linux</classifier>
<type>tgz</type> <type>tgz</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-pdf-renderer</artifactId> <artifactId>alfresco-pdf-renderer</artifactId>
<version>${installer.pdfium.version}</version> <version>${installer.alfresco-pdf-renderer.version}</version>
<classifier>osx</classifier> <classifier>osx</classifier>
<type>tgz</type> <type>tgz</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-pdf-renderer</artifactId> <artifactId>alfresco-pdf-renderer</artifactId>
<version>${installer.pdfium.version}</version> <version>${installer.alfresco-pdf-renderer.version}</version>
<classifier>win64</classifier> <classifier>win64</classifier>
<type>tgz</type> <type>tgz</type>
</dependency> </dependency>