Commit Graph

507 Commits

Author SHA1 Message Date
Alexandra Leahu
b969ec8152 Merged trunk (5.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 125996


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126133 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-05 13:03:01 +00:00
Alexandra Leahu
a55c7eac74 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 126091


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-05 12:57:34 +00:00
Alan Davis
5ba3e27672 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/branches/5.2.N@126118 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-05 11:54:50 +00:00
Alan Davis
3e81f606a3 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/branches/5.2.N@126117 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-05 11:54:32 +00:00
Alan Davis
a3b8522524 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/branches/5.1.N@126116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-05 11:53:05 +00:00
Alexandra Leahu
ecf3e0dd1f 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/branches/5.1.N@126086 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-04 12:50:18 +00:00
Alexandra Leahu
3fca426254 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 126024


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126068 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-04 12:40:23 +00:00
Matt Ward
580f932885 Added maven profile "update-assistant-tests".
The update assistant related unit and integration tests are now only run when explicitly activated, e.g:

    mvn clean integration-test -Pupdate-assistant-tests

or

    mvn clean test -Pupdate-assistant-tests
    
In addition the long running unpacking of the update package has been moved into a pre-integration-test phase which is where it should belong, so that it isn't run during unit testing.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@126059 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-04 10:59:05 +00:00
Matt Ward
c0e7c77265 Correct the base.installer.version to make vague sense for an upcoming 5.2.0 release.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@126054 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-03 10:42:34 +00:00
Alexandra Leahu
2bed4c3106 Merged trunk (5.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 125950,125963,125964,125965,125966,125967,125968,125969,
     125971,125972,125974,125975,125976,125977,125979,125983,
     125984,125986,125988


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-29 13:12:17 +00:00
Alexandra Leahu
c4c706ea68 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 125955,125956


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126024 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-29 12:51:25 +00:00
Alexandra Leahu
4e10f3857e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 125936


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@126016 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-29 11:42:33 +00:00
Matt Ward
a4208e35de Correcting parent pom version for enterprise-update-test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125996 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 15:10:32 +00:00
Matt Ward
4dbc9ebc44 Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 125811,125873,125924,125945


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:52:42 +00:00
Matt Ward
dafa0d627f Merged 5.2.N (5.2.1) to trunk (5.2)
125809 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125616 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125581 mrogers: Build fix - correction to r125544


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:51:32 +00:00
Matt Ward
49fb07a7ee Merged 5.2.N (5.2.1) to trunk (5.2)
125808 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125615 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125546 mrogers: Integration test javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125984 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:50:06 +00:00
Matt Ward
781e99516f Merged 5.2.N (5.2.1) to trunk (5.2)
125807 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125614 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125544 mrogers: Integration test javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:47:28 +00:00
Matt Ward
0366315fbb Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 125806


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125979 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:46:52 +00:00
Matt Ward
3cedeca840 Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 125243,125332,125394


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125977 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:46:12 +00:00
Matt Ward
27c00d3640 Merged 5.2.N (5.2.1) to trunk (5.2)
125216 mrogers: correcting regex


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125976 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:46:00 +00:00
Matt Ward
2bb4b29713 Merged 5.2.N (5.2.1) to trunk (5.2)
125195 mrogers: Temp fix - remove test of postgres lib


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125975 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:44:34 +00:00
Matt Ward
91a8e80dec Merged 5.2.N (5.2.1) to trunk (5.2)
125179 mrogers: Added new test for SNAPSHOT and nightly builds


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125974 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:44:17 +00:00
Matt Ward
48fd7b26f8 Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 125091,125155


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125972 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:43:37 +00:00
Matt Ward
bb4efa266e Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 124771


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125971 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:42:51 +00:00
Matt Ward
1f3b3be8e2 Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 124311,124417,124452,124482


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125969 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:42:17 +00:00
Matt Ward
62287a6f25 Merged 5.2.N (5.2.1) to trunk (5.2)
124287 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124276 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         124235 mrogers: Temp fix to work around MNT-15874 - test to ignore alfresco-global.properties for now.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125968 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:42:04 +00:00
Matt Ward
ca96159d5c Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 124233,124286


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125967 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:40:57 +00:00
Matt Ward
15819a6f39 Merged 5.2.N (5.2.1) to trunk (5.2)
124203 adavis: UTF-398: Update tool
      - try https://nightlybuilds.alfresco.com/Enterprise-5.2/LATEST-BASE-INSTALLER in pom.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:40:46 +00:00
Matt Ward
79a2fe996b Merged 5.2.N (5.2.1) to trunk (5.2)
124170 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124165 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         - correct pom.xml version


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125965 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:39:59 +00:00
Matt Ward
9ac7f9191f Merged 5.2.N (5.2.1) to trunk (5.2)
124169 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124152 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         124140: Added a new maven profile for "update-test",
         124136: hard code a value for base.installer.version,


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125964 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:39:09 +00:00
Matt Ward
fad95f309e Merged 5.2.N (5.2.1) to trunk (5.2)
124168 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124150 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         124081: Reverting incorrect merges from mass WOLF-6 merge,
         124078: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            123532 mrogers: Now that the end to end test passes, use a junit assert to break the build if it fails.,
         124077: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            123527 mrogers: Correct path for share-config-custom.xml,
         124076: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            123525 mrogers: Add the solr4 archive schema.xml to the update package.,
         124075: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            123519 mrogers: Ignore share-config-custom.xml,
         124074: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            123498 mrogers: Another README that needs converting to dos,
         124073: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            123497 mrogers: convert the readme to windows line format.,
         124072: 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,
         124071: 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.,
         124070: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 123337,123472,
         124069: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            123314 mrogers: File tree comparison needs to ignore comment lines.,
         124068: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 123310,
         124067: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 123308,
         124066: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 123307,
         124065: 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,
         124064: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 123304,
         124062: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 123289,
         124061: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 123288,
         124060: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 123286,
         124059: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 123285,
         124058: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 123284,
         124050: 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),
         124049: 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,
         124048: 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,
         124047: 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,
         124045: 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.,
         124044: 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,
         124043: 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.,
         124042: 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,
         124041: 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,
         124040: 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.,
         124039: 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.,
         124038: 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,
         124037: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            123256 mrogers: rollback 123243,
         124036: 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,
         124035: 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.,
         124034: 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,
         124033: 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,
         124032: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            123230 mrogers: Rollback previous changes.,
         124031: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            123184 mrogers: More work on pom files,
         124030: 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,
         124029: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 123159,
         124028: 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,
         124027: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 123096,
         124026: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            123084 mrogers: Add more ignorePaths,
         124025: 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.,
         124024: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            123059 mrogers: UTF-378 - Try toRealPath on file comparison utility.,
         124023: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 123042,
         124022: 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.,
         124021: 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.,
         124020: 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,
         124019: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122922 mward: UTF-378: added some diff ignore patterns.,
         124018: 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,
         124017: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 122880,
         124016: 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.,
         124015: 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.,
         124014: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122846 mrogers: BDE-539 - Remove kludge.,
         124013: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122824 jphuynh: BDE-539: Use latest 5.1-SNAPSHOT build as base version for now. (Latest as in previous successful build excluding the current one.),
         124012: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122800 mrogers: kludge tests to get something to run.,
         124011: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122797 mrogers: Corrected test to run on windows.,
         124010: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122785 mward: UTF-378: fixed path pattern matching on Windows.,
         124009: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122774 jphuynh: BDE-539: alfrescosharepoint is not a selectable component.,
         124008: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122767 jphuynh: BDE-539: this.installer.args!,
         124007: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122766 jphuynh: BDE-539: AOS Module Only exist on 5.1. Added changes in installer.args to reflect that.,
         124006: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122764 mward: UTF-378: added missing test data,
         124005: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122763 mward: UTF-378: improve result set formatting.,
         124004: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122756 jphuynh: BDE-539: Fixed typo.,
         124003: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122755 mward: UTF-378: Fix unit tests,
         124002: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122753 jphuynh: BDE-539: Changed wget to ant get.,
         124001: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122752 mward: UTF-378: Delete temp files when no longer needed,
         124000: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122751 mward: UTF-384: wired in comparison tool and HTML formatter to the build.,
         123999: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122745 mward: UTF-383: added support for deep differencing in amp files.,
         123998: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122731 mward: UTF-383: added support for ignoring differences in files where it is just the absolute tree root.,
         123997: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122730 jphuynh: BDE-539: Fixed path and added base version extension check.,
         123995: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122721 jphuynh: BDE-539: Amended the installer download part.,
         123994: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122698 mward: UTF-378: bring back all the default java behaviour by removing the pom packaging specification.,
         123993: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122694 mward: UTF-378: moved the big end-to-end to happen during integration testing.,
         123992: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122681 mward: Added some sensible svn ignore patterns.,
         123991: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122680 mward: UTF-383: moved diff tool from update-tool to full-installer code base.
            Had erroneously added the code to the wrong project.,
         123990: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122672 mward: Changed language level to 1.7 so that IDEs may pick up the correct configuration.,
         123989: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 122662,
         123988: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122643 mrogers: UTF-371 - Add AOS to the update package.,
         123987: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 122613,122620,
         123986: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122231 mrogers: UTF-382 - Added the skeleton of the End to End update test.,
         123985: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122191 mrogers: Try again,
         123984: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122189 mrogers: For now we have a hard coded url and its just changed.,
         123983: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122186 mrogers: UTF-380 Now should update both source and target instances of alfresco.   (They are both the same but that should allow us to progress with building the rest of build.),
         123982: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122179 mrogers: UTF-380 Try again.,
         123981: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122172 mrogers: UTF-380 Temp build fix,
         123980: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122162 mrogers: UTF-380 - Add install steps,
         123979: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122157 mrogers: UTF-380 - Work in progress.,
         123977: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122137 mrogers: Fix merge error.,
         123976: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 122095,122124,
         123975: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            122086 mrogers: UTF-379 - add new test project.,
         123974: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 121992,122038,
         123973: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121858 nsmintanca: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
               121838 mward: UTF-370: fixed and added back apply_updates.sh executable bit tests.,
         123972: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 121857,
         123971: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121760 nsmintanca: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
               121725 mrogers: UTF-370 - Disable permissions unit test.,
         123970: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 121759,
         123969: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121758 nsmintanca: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
               121690 mrogers: UTF-370 - Replace TgZFormatIntegrationTest with ZipFormatIntegrationTest,
         123968: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 121683,
         123967: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121669 mrogers: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
               121667 mrogers: UTF-370 - Get rid of the .tgz archive,
         123966: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121668 mrogers: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
               121665 mrogers: Remove un-used update assembly,
         123965: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 121638,
         123964: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121560 mrogers: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
               121460 mrogers: UTF-375 - added awe.war and also simplified update build to use the wqs distribution package,
         123963: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 121490,
         123962: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121487 abalmus: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
               121456 mrogers: UTF-373 - Add _vti_bin.war to 5.0 update package,
         123961: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 121407,121449,121486,
         123960: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121406 rmunteanu: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
               121352 mrogers: Correcting upgrade assistant script,
         123959: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 121308,121405,
         123958: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121307 amorarasu: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
               121251 mrogers: UTF-365 - Adding Update Script to the 5.0 update package,
         123957: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 121306,
         123956: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121294 mward: UTF-348: include filtered package.properties in package.,
         123955: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 121239,
         123954: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121209 mward: UTF-348: Tie the update tool version to the encompasing package,
         123953: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 121126,121131,121138,
         123952: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121089 mrogers: UTF-368 - Add the share specific README to the update package,
         123951: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121083 mrogers: Remove some maven warnings from updateTool.xml assembly,
         123950: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121081 mrogers: UTF-366 - add new test for update package that now contains bin/mmt.jar & rework for 5.1,
         123949: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 121055,
         123948: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121054 amorarasu: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
               121039 mrogers: UTF-366 - Adding MMT.jar to update package,
         123947: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            121053 amorarasu: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
               121032 mrogers: UTF-367 - The update tool needs to update the $ALF_HOME/README file in the root of $ALF_HOME,
         123946: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 120741,120754,120829,120900,120948,120974,121052,
         123945: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            120733 aleahu:       Reverse merged WOLF-6 (WOLF.0.0)
                     120727 aleahu: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
                        120639 mrogers: UTF-464 - update package should contain share-enterprise not share [community] on 5.0,
         123944: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 120728,
         123943: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            120727 aleahu:       120727 aleahu: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
                     120639 mrogers: UTF-464 - update package should contain share-enterprise not share [community] on 5.0,
         123942: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 120532,120599,120702,120703,120710,
         123941: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            120497 mrogers: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
               120491 mrogers: UTF-359 - Add WQS artifacts to upgrade package.,
         123940: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            120494 mrogers: Adding ignore for .settings,
         123939: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 115409,115501,115512,115541,115756,115819,115835,115957,
              115964,115986,116209,116408,116540,116549,116648,117382,
              117504,117524,117594,117705,117946,117947,117964,118107,
              118180,118197,118329,118434,118530,118647,118727,118901,
              118921,118945,119296,119533,119585,119607,119703,119827,
              119855,120070,120115,120164,120265,120300,120348,120376,
              120419,
         123938: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            115360 mrogers: UTF-310 - added share service amp to update package.,
         123937: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 114842,115008,115300,
         123936: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            114818 mrogers: Merged 5.0.N (5.0.3) to WOLF-6 (WOLF.0.0)
               114806: UTF-302 - adding README.txt to update package.,
         123935: 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,
         123934: 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,
         123933: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 112929,113056,113114,113262,113263,113264,
         123932: 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.,
         123931: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 112358,112463,112530,112565,112625,
         123930: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            112277 mrogers: Make this file compile!,
         123929: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            112275 mrogers: Please work!,
         123928: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            112266 mrogers: Correcting packaging unit test,
         123927: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 112223,112265,
         123926: 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",
         123925: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 112182,
         123924: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)
            112169 mrogers: attempt to get these tests to work.,
         123923: 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,
         123922: 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.,
         123921: Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) (RECORD ONLY) : 
            - 111938,112043,112116,
         123920: 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.,
         123919: 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,
         123918: 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.,
         123917: 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/trunk@125963 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 10:37:37 +00:00
Matt Ward
3ac3055238 Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 122018,123862,124167


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 09:49:32 +00:00
Alexandra Leahu
27fbcfdcb2 Merged trunk (5.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 125934


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 09:38:36 +00:00
Alexandra Leahu
18db95bed6 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 125910,125911,125922


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125936 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 09:31:23 +00:00
Matt Ward
468a776178 Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :
- 124769


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@125934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 09:24:08 +00:00
Alexandra Leahu
43501f3b0b Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 125888


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125924 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-28 09:02:00 +00:00
Andreea Dragoi
7b0be36d1c Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 125840,125841,125842,125843


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125888 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-27 12:48:00 +00:00
Andreea Dragoi
be24094ddc Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 125831


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125873 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-27 12:34:45 +00:00
Raluca Munteanu
62ac4bbe72 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 125670,125718


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125831 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 15:29:39 +00:00
Raluca Munteanu
b8a1ce8dad Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 125619,125657


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125811 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 14:53:47 +00:00
Raluca Munteanu
e4dad4a624 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/branches/5.2.N@125810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 14:53:34 +00:00
Raluca Munteanu
21906b7651 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125616 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125581 mrogers: Build fix - correction to r125544


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 14:51:58 +00:00
Raluca Munteanu
49caa2b792 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125615 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125546 mrogers: Integration test javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 14:51:09 +00:00
Raluca Munteanu
cc8cba4a78 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125614 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125544 mrogers: Integration test javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 14:50:48 +00:00
Raluca Munteanu
c964ae6d32 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) (RECORD ONLY) :
- 125526


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@125806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 14:48:01 +00:00
Raluca Munteanu
fe543d4bb6 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 125628,125641


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-21 14:37:41 +00:00
Raluca Munteanu
2afc69a10b Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (RECORD ONLY) :
- 125533,125577


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 12:38:39 +00:00
Raluca Munteanu
2d49886699 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/branches/5.1.N@125617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 12:28:48 +00:00
Raluca Munteanu
cfdb9ce0d3 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125581 mrogers: Build fix - correction to r125544


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125616 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 12:26:20 +00:00
Raluca Munteanu
7d8d6122fc Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125546 mrogers: Integration test javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@125615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 12:25:07 +00:00