Commit Graph

4344 Commits

Author SHA1 Message Date
Mark Rogers
3671b5a33b Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123496 mrogers: alfresco-share-services.amp needs to be called exactly that not with a 5.1.1-SNAPSHOT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124072 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 13:00:53 +00:00
Mark Rogers
0d96ad055d Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123492 mrogers: Package the correct README for the all in one installer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124071 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 13:00:39 +00:00
Mark Rogers
b96f95aa7b Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 123337,123472


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:58:46 +00:00
Mark Rogers
03ae31140d Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123314 mrogers: File tree comparison needs to ignore comment lines.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124069 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:58:43 +00:00
Mark Rogers
c143becf99 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 123310


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124068 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:58:34 +00:00
Mark Rogers
e7433556d7 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 123308


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124067 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:58:20 +00:00
Mark Rogers
53d55d802c Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 123307


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124066 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:58:14 +00:00
Mark Rogers
ea72a3b584 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123305 mrogers: Change update assistant to use renamed alfresco-one-platform-distributionzip


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124065 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:58:04 +00:00
Mark Rogers
daa012a6d3 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 123304


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124064 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:57:42 +00:00
Mark Rogers
ac5d966e4a Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 123289


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124062 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:57:34 +00:00
Mark Rogers
e85ea4c8a0 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 123288


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124061 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:57:25 +00:00
Mark Rogers
6aa97b2a04 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 123286


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124060 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:57:18 +00:00
Mark Rogers
32c2826f64 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 123285


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124059 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:57:11 +00:00
Mark Rogers
b50bedc94f Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 123284


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124058 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:56:45 +00:00
Mark Rogers
405e22ed44 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123278 mrogers: Merged trunk (2015.0) to WOLF-6 (WOLF.0.0)
      118074 jphuynh: ACE-4600: Upgraded to InstallBuilder 15.10.1 (Custom)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124050 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:29:45 +00:00
Mark Rogers
382164f8c4 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123277 mrogers: Merged trunk (2015.0) to WOLF-6 (WOLF.0.0)
      117929 jphuynh: ACE-4675: Upgraded common package to fix CVE-2015-8126


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:29:19 +00:00
Mark Rogers
1481962405 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123276 mrogers: Merged trunk (2015.0) to WOLF-6 (WOLF.0.0)
      117634 jphuynh: Merged BDE-443 (5.1.0) to trunk (2015.0)
         114665 jphuynh: Updated:
         - installer.common.version=5.1-20151016 
         - installer.postgresql.version=9.4.4-20151016 
         - installer.libreoffice.version=4.4.5-20151016


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124048 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:29:03 +00:00
Mark Rogers
9213329112 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123267 mrogers: Merged trunk (2015.0) to WOLF-6 (WOLF.0.0)
      115174 jphuynh: ACE-4494: Updated Java to 1.8.0_65 to fix the following vulnerabilities:
      - CVE-2015-4868
      - CVE-2015-4803
      - CVE-2015-4893
      - CVE-2015-4911
      - CVE-2015-4872


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124047 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:28:09 +00:00
Mark Rogers
e1d6b5be6d Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123270 mrogers: Merged trunk (2015.0) to WOLF-6 (WOLF.0.0)
      116128 jphuynh: ACE-4561: Release Agility: Updates to the installer
      - Distribution zip name remains the same as before.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124045 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:19:15 +00:00
Mark Rogers
c1aa828405 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123269 mrogers: Merged trunk (2015.0) to WOLF-6 (WOLF.0.0)
      116121 jphuynh: ACE-4561: Release Agility: Updates to the installer
      - Alfresco One Enterprise


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124044 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:19:01 +00:00
Mark Rogers
6a69eb8b6d Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123268 mrogers: Merged trunk (2015.0) to WOLF-6 (WOLF.0.0)
      115782 jphuynh: ACE-4547: Clean up and updated consistency of the README files.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124043 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:18:35 +00:00
Mark Rogers
dfae9c07f9 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123265 mrogers: Merged trunk (2015.0) to WOLF-6 (WOLF.0.0)
      115168 jphuynh: ACE-4508: Reinstated the forgotten alfresco-spp.amp


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:15:03 +00:00
Mark Rogers
d6e239666e Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123264 mrogers: Merged trunk (2015.0) to WOLF-6 (WOLF.0.0)
      113813 jphuynh: ACE-4276: Upgraded Installbuilder to 15.9.0


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124041 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:14:38 +00:00
Mark Rogers
4a9f09b58e Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123263 mrogers: Merged trunk (2015.0) to WOLF-6 (WOLF.0.0)
      113466 jphuynh: ACE-4335: Added missing enterprise classifier for GoogleDocs integration artifacts.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124040 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:13:15 +00:00
Mark Rogers
e5ea038331 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123262 mrogers: Merged trunk (2015.0) to WOLF-6 (WOLF.0.0)
      113363 jphuynh: ACE-4312: Fixed missing web-extension folder in the EAR Distribution
      + Removed unnecessary modules/platform folder.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124039 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:13:01 +00:00
Mark Rogers
525365dd0d Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123261 mrogers: Merged trunk (2015.0) to WOLF-6 (WOLF.0.0)
      113329 jphuynh: ACE-4314: Added a release profile to enforce the installer naming convention


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124038 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:12:22 +00:00
Mark Rogers
67c9641b7c Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123256 mrogers: rollback 123243


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124037 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:12:00 +00:00
Mark Rogers
b50def799b Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123243 mrogers: Merged trunk (2015.0) to WOLF-6 (WOLF.0.0)
      122874 slanglois: ACE-5135 ACE-5131 Pre-apply share-services AMP in alfresco.war packaged in EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124036 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:11:48 +00:00
Mark Rogers
bcde49e0e5 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123239 mrogers: Build against Platform 5.1.1-SNAPSHOT since that contains our MMT fixes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124035 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:10:26 +00:00
Mark Rogers
dd4bb97984 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123233 mrogers: Run the test against alfresco-one-update-package not alfresco-enterprise-update-package


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:09:58 +00:00
Mark Rogers
6044ec98f7 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123231 mrogers: Rename the alfresco-enterprise-update-package to the alfresco-one-update-package


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:09:49 +00:00
Mark Rogers
e50ef1c01f Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123230 mrogers: Rollback previous changes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124032 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:09:23 +00:00
Mark Rogers
a608785d40 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123184 mrogers: More work on pom files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124031 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:04:02 +00:00
Mark Rogers
906bf94144 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123183 mrogers: Update pom files to a) reflect the fact that the "enterprise" artifact name has been changed to "one", b) update to what is on 5.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:01:57 +00:00
Mark Rogers
18aa18c391 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 123159


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124029 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:01:28 +00:00
Mark Rogers
aa94cd99e9 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123121 mrogers: when comparing the two trees, ignore the sol1 war file in alf_data


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124028 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:01:26 +00:00
Mark Rogers
5eb4079339 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 123096


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124027 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:01:19 +00:00
Mark Rogers
bcd54a9313 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123084 mrogers: Add more ignorePaths


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124026 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:01:17 +00:00
Mark Rogers
c9b1a93e62 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123080 mrogers: Fix for file names within ZipFormatter ... had // in the path.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124025 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 12:01:11 +00:00
Mark Rogers
cc1a0a660f Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123059 mrogers: UTF-378 - Try toRealPath on file comparison utility.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124024 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:57:54 +00:00
Mark Rogers
f764b0a7aa Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 123042


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124023 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:57:23 +00:00
Mark Rogers
9811e8e842 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123029 mrogers: UTF-378 - A few additions to the ignore patterns + change for zip format to use absolute paths.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124022 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:57:20 +00:00
Mark Rogers
6e8a4018a8 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
123015 mrogers: UTF-378 - Now produce the zip file of the update test differences.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124021 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:57:10 +00:00
Mark Rogers
c93bdd696f Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122949 mrogers: UTF-378 - Added some code to ignore module.install date within module.properties


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:57:03 +00:00
Mark Rogers
df3acfd11a Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122922 mward: UTF-378: added some diff ignore patterns.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124019 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:56:56 +00:00
Mark Rogers
616e03b1d5 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122881 mrogers: Update googledocs to 3.0.3 to keep in line with release


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124018 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:56:46 +00:00
Mark Rogers
029bc75d4b Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 122880


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:55:57 +00:00
Mark Rogers
5a22fd095c Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122860 mward: UTF-378: improved test to ensure multiple occurrences of replacement text are all replaced.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124016 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:55:55 +00:00
Mark Rogers
09520372e4 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122856 mward: UTF-384: swapped the 'fresh' and 'updated' in the comparison method call so that the report appears with them in the correct columns.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:55:33 +00:00
Mark Rogers
4b35b09bed Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
122846 mrogers: BDE-539 - Remove kludge.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124014 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:55:26 +00:00