From f84ef08b6e5b3ed15dbca27a202ee1127d48f33c Mon Sep 17 00:00:00 2001 From: Jean-Pierre Huynh Date: Mon, 16 Nov 2015 14:05:07 +0000 Subject: [PATCH] Merged JPHUYNH/BDE-443 (5.1.0) to HEAD (5.1) 117183 adavis: BDE-443 Check whether we can buy licenses for the GPL components we ship - Remove Pdf2Swf specific transformer config from transformers.properties and spring context.xml - Remove references to Pdf2Swf and swftools from License notes, pom files, admin ui, admin ui English property values (translations still exist) and some obvious unit tests. - Note: SWFTransformationOptions has been left as it is used in tests. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../resources/bitrock/alfresco-linux-x64-20140918-versions.txt | 1 - .../resources/bitrock/alfresco-osx-x64-20140918-versions.txt | 1 - .../resources/bitrock/alfresco-windows-20140918-versions.txt | 1 - .../resources/bitrock/alfresco-windows-x64-20140918-versions.txt | 1 - 4 files changed, 4 deletions(-) diff --git a/src/main/resources/bitrock/alfresco-linux-x64-20140918-versions.txt b/src/main/resources/bitrock/alfresco-linux-x64-20140918-versions.txt index 6d80259083..aba801be52 100644 --- a/src/main/resources/bitrock/alfresco-linux-x64-20140918-versions.txt +++ b/src/main/resources/bitrock/alfresco-linux-x64-20140918-versions.txt @@ -14,7 +14,6 @@ freetype 2.3.4 libwmf 0.2.8.4 ghostscript 8.64 imagemagick 6.8.6-6 -swftools 0.9.1 libstdcplusplus 0 ncurses 5.6 readline 5.2 diff --git a/src/main/resources/bitrock/alfresco-osx-x64-20140918-versions.txt b/src/main/resources/bitrock/alfresco-osx-x64-20140918-versions.txt index ab2022c526..6eaf19520f 100644 --- a/src/main/resources/bitrock/alfresco-osx-x64-20140918-versions.txt +++ b/src/main/resources/bitrock/alfresco-osx-x64-20140918-versions.txt @@ -11,7 +11,6 @@ freetype 2.3.4 libwmf 0.2.8.4 ghostscript 8.64 imagemagick 6.8.6-6 -swftools 0.9.1 libstdcplusplus 0 ncurses 5.6 readline 5.2 diff --git a/src/main/resources/bitrock/alfresco-windows-20140918-versions.txt b/src/main/resources/bitrock/alfresco-windows-20140918-versions.txt index 189b3dfcb5..b6ae5ca944 100644 --- a/src/main/resources/bitrock/alfresco-windows-20140918-versions.txt +++ b/src/main/resources/bitrock/alfresco-windows-20140918-versions.txt @@ -2,7 +2,6 @@ alfresco Stack - 20140918 libreoffice 4.2.5 imagemagick 6.8.6-6-Q8 ghostscript-windows 8.64 -swftools 0.9.1 xpdf-japanese 1 openssl 1.0.1i postgresql 9.3.5-1 diff --git a/src/main/resources/bitrock/alfresco-windows-x64-20140918-versions.txt b/src/main/resources/bitrock/alfresco-windows-x64-20140918-versions.txt index 189b3dfcb5..b6ae5ca944 100644 --- a/src/main/resources/bitrock/alfresco-windows-x64-20140918-versions.txt +++ b/src/main/resources/bitrock/alfresco-windows-x64-20140918-versions.txt @@ -2,7 +2,6 @@ alfresco Stack - 20140918 libreoffice 4.2.5 imagemagick 6.8.6-6-Q8 ghostscript-windows 8.64 -swftools 0.9.1 xpdf-japanese 1 openssl 1.0.1i postgresql 9.3.5-1