Commit Graph

2 Commits

Author SHA1 Message Date
Alan Davis
1ee2b7c45d Merged 5.2.N (5.2.1) to HEAD (5.2)
126008 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125935 aleahu: MNT-16155 : Change source headers to new version
         - fixed more license headers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127838 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:34:49 +00:00
Alan Davis
ce5a675361 Merged 5.2.N (5.2.1) to HEAD (5.2)
126004 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125892 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         125842 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) (PARTIAL MERGE)
            125700 adavis: Merged V4.2.5 (4.2.5.7) to V4.2-BUG-FIX (4.2.7)
               125698: Merged DEV to V4.2.5 (4.2.5.7)
                  125677 arebegea: MNT-15219 : Excel (.xlsx) containing xmls (shapes/drawings) with multi byte characters may cause OutOfMemory in Tika
                     - Should not have updated version.properties as the original commit needs to be merged forwards.,
               125696: Merged DEV to V4.2.5 (4.2.5.7)
                  125677 arebegea: MNT-15219 : Excel (.xlsx) containing xmls (shapes/drawings) with multi byte characters may cause OutOfMemory in Tika
                     - Modified tika parser and tika core jars to allow some configuration parameters to be sent from Alfresco side using the metadata map parameter
                     - Excluded by default the parsing of drawings/shapes xmls because there was little valuable data that could be extracted from those xmls


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127835 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:34:29 +00:00