Commit Graph

4344 Commits

Author SHA1 Message Date
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
Alan Davis
8f19aa8703 Incremented version to 5.2.1 and schema to 10050
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@123830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:08:35 +00:00
Alan Davis
9539434f62 Incremented version to 5.2.1 and schema to 10050
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@123830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:08:35 +00:00
Alan Davis
58c88047da Incremented version to 5.2.1 and schema to 10050
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@123830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:08:35 +00:00
Alan Davis
7618132d54 Incremented version to 5.2.1 and schema to 10050
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@123830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:08:35 +00:00
Alan Davis
702869716a Incremented version to 5.2.1 and schema to 10050
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@123830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:08:35 +00:00
Alan Davis
591e5d412e Incremented version to 5.1.2 and schema to 9050
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:02:36 +00:00
Alan Davis
defb26b994 Incremented version to 5.1.2 and schema to 9050
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:02:36 +00:00
Alan Davis
12b18b9c44 Incremented version to 5.1.2 and schema to 9050
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:02:36 +00:00
Alan Davis
34926aeb42 Incremented version to 5.1.2 and schema to 9050
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:02:36 +00:00
Alan Davis
23a5754ff9 Incremented version to 5.1.2 and schema to 9050
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 14:02:36 +00:00
Alan Davis
46f1238589 Merged 5.1.N (5.1.1) to HEAD (5.1)
119820 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      119755 rmunteanu: Merged 5.0.3 (5.0.3) to 5.0.N (5.0.4)
         119710 jphuynh: MNT-15358: Fixed the uninstaller to remove the applied-updates directory.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123604 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:33:39 +00:00
Alan Davis
f91a18904c Merged 5.1.N (5.1.1) to HEAD (5.1)
119524 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      119405 rneamtu: Merged NESS/5.0.N-2015-11-13/ (5.0.3) to 5.0.N (5.0.4)
         119403: MNT-15072 : Solr is unable to find parents from models which have duplicate namespaces
            - Validate models to have different namespaces
            - Added test for case
   123599 correction to above merge


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:26:00 +00:00
Alan Davis
c226690bfa Merged 5.1.N (5.1.1) to HEAD (5.1)
119524 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      119405 rneamtu: Merged NESS/5.0.N-2015-11-13/ (5.0.3) to 5.0.N (5.0.4)
         119403: MNT-15072 : Solr is unable to find parents from models which have duplicate namespaces
            - Validate models to have different namespaces
            - Added test for case
   123599 correction to above merge


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:26:00 +00:00
Alan Davis
7f6d895a04 Merged 5.1.N (5.1.1) to HEAD (5.1)
119524 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      119405 rneamtu: Merged NESS/5.0.N-2015-11-13/ (5.0.3) to 5.0.N (5.0.4)
         119403: MNT-15072 : Solr is unable to find parents from models which have duplicate namespaces
            - Validate models to have different namespaces
            - Added test for case
   123599 correction to above merge


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:26:00 +00:00
Alan Davis
f4afde854e Merged 5.1.N (5.1.1) to HEAD (5.1)
119524 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      119405 rneamtu: Merged NESS/5.0.N-2015-11-13/ (5.0.3) to 5.0.N (5.0.4)
         119403: MNT-15072 : Solr is unable to find parents from models which have duplicate namespaces
            - Validate models to have different namespaces
            - Added test for case
   123599 correction to above merge


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:26:00 +00:00
Alan Davis
e550130878 Merged 5.1.N (5.1.1) to HEAD (5.1)
119524 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      119405 rneamtu: Merged NESS/5.0.N-2015-11-13/ (5.0.3) to 5.0.N (5.0.4)
         119403: MNT-15072 : Solr is unable to find parents from models which have duplicate namespaces
            - Validate models to have different namespaces
            - Added test for case
   123599 correction to above merge


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:26:00 +00:00
Alan Davis
0b4dc62bfd Merged 5.1.N (5.1.1) to HEAD (5.1)
115513 adragoi: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      115353 nsmintanca: Merged NESS/5.0.N-2015-09-09 (5.0.3) to 5.0.N (5.0.3)
         115075: MNT-14307 CMIS landing page URL incorrect in share-config-custom.xml
            - update the file to show the correct URL to find the RepositoryID


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:26:38 +00:00
Alan Davis
061d4856fd Merged 5.1.N (5.1.1) to HEAD (5.1)
114992 rmunteanu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      114940 cturlica: Merged DEV to 5.0.N (5.0.3)
         114938 cturlica: MNT-14367: Unable to connect to CMIS 1.0 and CMIS 1.1 API URL in 5.0.1 only with Kerberos SSO enabled
            - added default fallback for new CMIS URLs and the possibility to disable this fallback if needed (new properties)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:26:29 +00:00
Alan Davis
bf867bbc76 Merged 5.1.N (5.1.1) to HEAD (5.1)
113585 tvalkevych: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      113499 rmunteanu: Merged DEV to 5.0.N (5.0.3)
         113455: MNT-14718: Problem with Passthru, NTLM, SSO and Mobile
            - Added basic SSO fallback to passthru subsystem


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123578 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:25:55 +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
2f1eb97dad Increment version to 5.2-SNAPSHOT
- changed versions of AUTH,JLAN,CORE,SURF_WS
   - merged in fixes around multiple SURF/SURF_WS versions

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 07:16:14 +00:00
Alan Davis
187c4a8000 Increment version to 5.2-SNAPSHOT
- changed versions of AUTH,JLAN,CORE,SURF_WS
   - merged in fixes around multiple SURF/SURF_WS versions

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 07:16:14 +00:00
Alan Davis
fa8b65b4b5 Increment version to 5.2-SNAPSHOT
- changed versions of AUTH,JLAN,CORE,SURF_WS
   - merged in fixes around multiple SURF/SURF_WS versions

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 07:16:14 +00:00
Alan Davis
8935632912 Increment version to 5.2-SNAPSHOT
- changed versions of AUTH,JLAN,CORE,SURF_WS
   - merged in fixes around multiple SURF/SURF_WS versions

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 07:16:14 +00:00
Alan Davis
805e8caa63 Increment version to 5.2-SNAPSHOT
- changed versions of AUTH,JLAN,CORE,SURF_WS
   - merged in fixes around multiple SURF/SURF_WS versions

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 07:16:14 +00:00
Alan Davis
1f282dd665 Merged 5.1.0 (5.1.0.1) to 5.1.N (5.1.1)
123380 slanglois: Fix reference to Surf groupIds: previously released JLan still pulls the old one


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123395 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-09 19:16:58 +00:00
Samuel Langlois
7bd1be2695 Fix reference to Surf groupIds: previously released JLan still pulls the old one
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.0/root@123380 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-09 16:50:59 +00:00
Alan Davis
3e5653700e Merged 5.1.N (5.1.1) to 5.1.0 (5.1.0.2)
123320 adavis: Surf repackaging to separate codebase (was only done on SHARE).
      - references to old groupId org.springframework.extensions.surf
        still needed to be changed to org.alfresco.surf


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.0/root@123321 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-09 11:12:41 +00:00
Alan Davis
99ad418840 Surf repackaging to separate codebase (was only done on SHARE).
- references to old groupId org.springframework.extensions.surf
     still needed to be changed to org.alfresco.surf

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123320 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-09 11:11:47 +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