Commit Graph

507 Commits

Author SHA1 Message Date
Alan Davis
4a3b8f27f8 Merged 5.2.N (5.2.1) to trunk (5.2)
127197 jphuynh: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127192 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127635 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:14:27 +00:00
Alan Davis
f8c3e48467 Merged 5.2.N (5.2.1) to trunk (5.2)
127016 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126679 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         126277 skopf: MNT-16223 - Different AOS versions on Alfresco one and Alfresco one Platform using the same build	
          


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:13:46 +00:00
Alan Davis
19faa7b63a Merged 5.2.N (5.2.1) to trunk (5.2)
126118 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126116 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         126106 slanglois: MNT-16094 Apply alfresco-aos-module to alfresco.war in EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:13:17 +00:00
Alan Davis
27b8ab4f99 Merged 5.2.N (5.2.1) to trunk (5.2)
126117 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126086 aleahu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         126048 jphuynh: MNT-16233: Use AOS 1.1.1. (Incomplete version bump from ACE-5133 done in Platform)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:12:51 +00:00
Alan Davis
342bcf34cb Merged 5.2.N (5.2.1) to trunk (5.2)
125810 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125617 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125598 slanglois: ACE-5253 Bring AOS (ROOT.war and _vti_bin.war) back into the EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:12:09 +00:00
Alan Davis
d0ba492e3f Merged 5.2.N (5.2.1) to trunk (5.2)
125451 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125344 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125267 slanglois: MNT-16094 Remove ROOT.war from the Alfresco One EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:11:22 +00:00
Alan Davis
9157daf317 Merged 5.2.N (5.2.1) to trunk (5.2)
125450 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125343 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125254 amukha: ACE-5130: [SUSE 12.0, Web Logic] - Admin Console - Install Application Assistant - Install Alfresco Failed
            - removed _vti_bin.war from the configuration as it is no longer shipped in the ear.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127629 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:05:27 +00:00
Alan Davis
4083350641 Merged 5.2.N (5.2.1) to trunk (5.2)
124773 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124768 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         124408 jphuynh: ACE-5135: Fixed alfresco-full-installation version


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127628 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:05:07 +00:00
Alan Davis
66c2fbf73e Merged 5.2.N (5.2.1) to trunk (5.2)
124772 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124767 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         124406 jphuynh: ACE-5135: Pre-apply share-services AMP in alfresco.war packaged in EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 13:03:59 +00:00
Alan Davis
3e0bce08ab Merged 5.2.N (5.2.1) to trunk (5.2)
124770 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124598 slanglois: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         124596 slanglois: ACE-5135 Add aspecjrt jar to myfaces1_1-websphere-shared-lib


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127626 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 12:58:58 +00:00
Alan Davis
c5445b1f15 Merged 5.2.N (5.2.2) to trunk (5.2) (RECORD ONLY)
- Commits from trunk: 126267
   - record only commits from 5.1.N:
     126666,127017,127070,127127,127164,127196,127211,
     127255,127291,127364,127401,127515

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 14:55:50 +00:00
Alan Davis
fd402e08cf Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127467


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 14:46:07 +00:00
Alexandra Leahu
3319b6469f Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127458


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-01 13:29:36 +00:00
Raluca Munteanu
a94b7c3f02 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127375


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127401 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-25 14:42:00 +00:00
Raluca Munteanu
e63e2e6a09 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127305,127306,127355


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-24 14:50:43 +00:00
Raluca Munteanu
4aa15a7a30 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127296


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-24 14:38:04 +00:00
Cristian Turlica
3cc104e553 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127277,127278


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127296 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-20 13:24:24 +00:00
Cristian Turlica
c84d6ca771 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127260


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-20 13:18:34 +00:00
Andrei Rebegea
529bd49464 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127225,127234,127236


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-19 14:57:21 +00:00
Andrei Rebegea
650dafe018 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127216


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-19 14:54:58 +00:00
Andrei Rebegea
aa5260d711 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127179,127187


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 14:29:03 +00:00
Andrei Rebegea
231967da7c Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127171


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127211 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 14:25:48 +00:00
Jean-Pierre Huynh
749f0f61df Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127192 jphuynh: BDE-674: Pull Manager from Nexus instead of BINARIES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 11:39:02 +00:00
Jean-Pierre Huynh
1f30ab0b13 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 125527


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 11:37:10 +00:00
Jean-Pierre Huynh
45c68e396b BDE-674: Pull Manager from Nexus instead of BINARIES.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 11:29:09 +00:00
Cristian Turlica
0de711de96 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127142,127158


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127171 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-17 14:19:00 +00:00
Cristian Turlica
32799a4e57 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127132


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127164 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-17 14:15:10 +00:00
Cristian Turlica
40624d7fe9 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127085,127102


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127132 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-16 14:52:52 +00:00
Cristian Turlica
e9000f0612 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127077


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-16 14:47:38 +00:00
Ramona Neamtu
d3b51d6a4e Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 127046,127063


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127077 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-13 13:34:29 +00:00
Ramona Neamtu
1f265a4c9d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 127026


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-13 13:28:10 +00:00
Ancuta Morarasu
a2de2b3975 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 126687


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@127026 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-12 08:49:38 +00:00
Ancuta Morarasu
887d69ddb7 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 126680


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-12 08:45:28 +00:00
Ancuta Morarasu
8087d4e458 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
126679 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      126277 skopf: MNT-16223 - Different AOS versions on Alfresco one and Alfresco one Platform using the same build	
       


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@127016 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-12 08:45:23 +00:00
Ramona Neamtu
3c660b40a2 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 126309,126339


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126680 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 09:04:22 +00:00
Ramona Neamtu
a1d1df8aa7 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
126277 skopf: MNT-16223 - Different AOS versions on Alfresco one and Alfresco one Platform using the same build	
    


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126679 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 09:03:34 +00:00
Ramona Neamtu
ec0217b25f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 126258


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 08:32:38 +00:00
Andreea Dragoi
056737fa98 Merged trunk (5.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 126230,126234,126235


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-06 13:36:09 +00:00
Andreea Dragoi
1c201e3d9a Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 126142,126143


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126258 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-06 13:26:22 +00:00
Alan Davis
07fb0f10c6 Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 126133,126134,126135,126233


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@126235 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-06 10:32:27 +00:00
Alan Davis
071887105f Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 126016,126033,126068


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@126234 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-06 10:32:17 +00:00
Alan Davis
7692cf7812 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 126125,126228,126231,126232


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-06 10:31:42 +00:00
Alan Davis
a0663cd1d1 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) (RECORD ONLY) :
- 126214


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126232 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-06 10:31:26 +00:00
Alan Davis
8affae7925 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) (RECORD ONLY) :
- 126185


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126231 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-06 10:31:23 +00:00
Alan Davis
b5dc191022 Merged 5.2.N (5.2.1) to trunk (5.2)
126229 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      126219 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (PARTIAL MERGE)
         126218 adavis: Merged 5.0.3 (5.0.3.5) to 5.0.N (5.0.4)
            126215 adavis: Removal of the Update Assistant


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@126230 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-06 10:30:06 +00:00
Alan Davis
618f2f1b3c Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
126219 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (PARTIAL MERGE)
      126218 adavis: Merged 5.0.3 (5.0.3.5) to 5.0.N (5.0.4)
         126215 adavis: Removal of the Update Assistant


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126229 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-06 10:28:37 +00:00
Alan Davis
7497e828c8 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) (RECORD ONLY) :
- 126227


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126228 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-06 10:24:41 +00:00
Alan Davis
e91a64d76e Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (PARTIAL MERGE)
126218 adavis: Merged 5.0.3 (5.0.3.5) to 5.0.N (5.0.4)
      126215 adavis: Removal of the Update Assistant


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126219 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-06 10:17:23 +00:00
Alexandra Leahu
6f48597a11 Merged trunk (5.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 126059


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126135 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-05 13:03:24 +00:00
Alexandra Leahu
ccc7465450 Merged trunk (5.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 126054


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