Commit Graph

507 Commits

Author SHA1 Message Date
Mark Rogers
306b0f04eb Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 113266,113276,113286,113430,113507,113549,113595,113681,
     113736,113817,113901,114028,114097,114234,114304,114478,
     114479,114480,114481,114748


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:01:15 +00:00
Mark Rogers
ac248b08da Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
113265 adavis: Merged 5.0.N (5.0.3) to WOLF-6 (WOLF.0.0)
      113207 mrogers: Add googledocs AMPS again


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:01:04 +00:00
Mark Rogers
d4d8479bdc Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 112929,113056,113114,113262,113263,113264


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123933 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 11:00:04 +00:00
Mark Rogers
12a480b566 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
112712 mrogers: Merged 5.0.N (5.0.3) to WOLF-6 (WOLF.0.0)
      112710: UTF-272 - Add SOLR4.WAR to update package.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123932 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:59:57 +00:00
Mark Rogers
2ad6b5ff9a Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 112358,112463,112530,112565,112625


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:59:36 +00:00
Mark Rogers
e541865854 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
112277 mrogers: Make this file compile!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123930 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:59:31 +00:00
Mark Rogers
e4bcc6f2ff Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
112275 mrogers: Please work!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123929 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:59:23 +00:00
Mark Rogers
fe3c489edd Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
112266 mrogers: Correcting packaging unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123928 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:59:11 +00:00
Mark Rogers
946023d2cc Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 112223,112265


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123927 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:58:35 +00:00
Mark Rogers
5d2c3fafd5 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
112207 mrogers: Merged 5.0.N (5.0.3) to WOLF-6 (WOLF.0.0)
      112201: UTF-264 - Make update test aware that its no longer a "tar bomb"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123926 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:58:33 +00:00
Mark Rogers
38c774658a Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 112182


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123925 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:58:26 +00:00
Mark Rogers
598734bc71 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
112169 mrogers: attempt to get these tests to work.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123924 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:58:24 +00:00
Mark Rogers
cbc6e359ef Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
112147 mrogers: Merged 5.0.N (5.0.3) to WOLF-6 (WOLF.0.0)
      112133: Fix up TgZ test after moving apply_updates.sh


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:58:16 +00:00
Mark Rogers
9b60df5e74 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
112146 mrogers: Merged 5.0.N (5.0.3) to WOLF-6 (WOLF.0.0)
      112131: Change structure of update package.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:58:08 +00:00
Mark Rogers
303e6560b0 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 111938,112043,112116


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123921 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:57:02 +00:00
Mark Rogers
ff40bce891 Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
111926 adavis: Merged 5.0.N (5.0.3) to WOLF-6 (WOLF.0.0)
      111638: UTF-242: refactored archive unpacking code to use try-with-resources for brevity.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123920 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:55:54 +00:00
Mark Rogers
6f9893799c Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
111925 adavis: Merged 5.0.N (5.0.3) to WOLF-6 (WOLF.0.0)
      111630: UTF-242: Unix specific test for apply_updates.sh


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123919 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:55:45 +00:00
Mark Rogers
164a95bc3b Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
111924 adavis: Merged 5.0.N (5.0.3) to WOLF-6 (WOLF.0.0)
      111613: UTF-242: added maven integration-test support to the update package project.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:55:17 +00:00
Mark Rogers
5915c133bd Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
111922 adavis: Merged 5.0.N (5.0.3) to WOLF-6 (WOLF.0.0)
      111602: UTF-241: Create a new upgrade package in .tgz format.
      Note that the subpackage (the "update contents") within the tgz is still a zip file - the update tool expects to find a zip file that it can use.
      Also note that the zip package format is in fact capable of storing the execute bits and when unpacking it on a *nix machine, I do see the bin/apply_updates.sh file as having the correct 755 file mode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:54:22 +00:00
Mark Rogers
90dcd2bc5c Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) :
- 111848,111919,111920,111921


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123916 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 10:51:59 +00:00
Alan Davis
071d18109d Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 123879,123880,123885,123894


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@123895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-14 17:09:06 +00:00
Alan Davis
c86cdb80ad Merged trunk (5.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 123859


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 15:20:03 +00:00
Alan Davis
6695785e2c Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 123857,123858


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123859 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 15:11:29 +00:00
Alan Davis
526a8b334d Merged trunk (5.2) to 5.2.N (5.2.1) (RECORD ONLY) history used to set up 5.2.N
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 15:11:05 +00:00
Alan Davis
544a35b3e2 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 123856


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123857 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 15:09:27 +00:00
Alan Davis
93fb89b8a2 Merged trunk (5.2) to 5.1.N (5.1.2) (RECORD ONLY) history used to set up 5.1.N
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@123856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 15:09:08 +00:00
Alan Davis
d84cb7685b Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 123851,123854


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123855 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 15:02:35 +00:00
Alan Davis
f4d2f6cc1c Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 123850,123853


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123854 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:58:58 +00:00
Alan Davis
6c7fe6e69d Merged 5.1.0 (5.1.0) to 5.1.N (5.1.2) (RECORD ONLY) :
- 123849


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@123853 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:58:16 +00:00
Alan Davis
9a6aa35c87 remove nested merginfo
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123852 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:57:18 +00:00
Alan Davis
d074bd9f01 remove nested merginfo
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:56:36 +00:00
Alan Davis
8f2f21a12c remove nested merginfo
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@123850 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:55:57 +00:00
Alan Davis
206800f43f remove nested merginfo
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.0@123849 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:51:45 +00:00
Alan Davis
cef56ed81e Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) : 123235-123236,123242,123249,123838
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123848 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:50:48 +00:00
Alan Davis
7bdbe2ce6b Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 123839


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:47:06 +00:00
Alan Davis
4f73093ffb Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 123254


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123846 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:45:34 +00:00
Alan Davis
bb1fc8eaea Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 123250,123251,123253


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123845 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:43:43 +00:00
Alan Davis
c7d061ed8c Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 123195


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123844 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:43:10 +00:00
Alan Davis
2b832a6257 Merged 5.2.N (5.2.1) to trunk (5.2)
123005 slanglois: Specify installer.version.name when calling Ant to build installers (so we can override it on the command line)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123843 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:41:50 +00:00
Alan Davis
f6aa4971e7 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 123541


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:24:31 +00:00
Alan Davis
2f95a62a65 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
123520 slanglois: Fix version of parent pom in project running share-po


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123838 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:24:27 +00:00
Andrei Rebegea
e3515a7800 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 122069,122097,122098,122099,122100,122101,122111,122141,
     122148,122219,122235,122279,122280,122281,122284,122291,
     122306,122309,122347,122348,122412,122430,122431,122449,
     122474,122493,122494,122495,122497,122498,122499,122504,
     122512,122563,122570,122574,122575,122615,122622,122623,
     122624,122667,122668,122803,122851,122857,122908,122909,
     122910,122911,122912,122960,122961,122980,122981,122991,
     123012,123013,123044,123098,123100,123182,123187,123208,
     123342,123343,123344,123345,123346,123347,123348,123349,
     123350,123351,123352,123353,123354,123355,123356,123357,
     123358,123363,123386,123401,123406,123411,123413,123476,
     123477,123478,123483,123484,123486,123487,123488,123489,
     123490,123504,123511,123535,123537


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@123541 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 15:29:36 +00:00
Samuel Langlois
9d8ece6518 Update dependencies for 5.2 - fix sub-poms
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123522 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 11:22:36 +00:00
Samuel Langlois
03ea2a977a Fix version of parent pom in project running share-po
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@123520 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 10:58:29 +00:00
Alan Davis
06630a8d8a Update dependencies for 5.2
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@123416 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 10:23:18 +00:00
Alan Davis
a200580acb Use 5.2.1-SNAPSHOT of PLAT and SHARE
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 15:23:50 +00:00
Alan Davis
bb7650ed97 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 123252


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 15:21:33 +00:00
Alan Davis
2ff5b05d4c Use 5.1.2-SNAPSHOT of PLAT and SHARE
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@123252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 15:21:02 +00:00
Alan Davis
523a99fd70 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 123248


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 15:15:21 +00:00
Alan Davis
6197c436d6 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 123244


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@123250 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-08 15:15:16 +00:00