Commit Graph

5662 Commits

Author SHA1 Message Date
Alan Davis
5f438107e8 ACE-1640: Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70083: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70071: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70057: Merged V4.1.5 (4.1.5.14) to V4.1-BUG-FIX (4.1.9)
            70048: Revised fix for     MNT-11107  Documents uploaded by another user are not filtered via tags in My Files
            Fix for     MNT-11427  Impossible to start reindex process for bm-0010 and bm-0013 tests: api/solr/aclchangesets return status:502
            - move defining into same TX as shared when shared created.
            - fix tests that assumes there will never be ACL dupes when traversing the tx change log  - incorrect. We aim to minimise this


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70084 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-12 16:01:06 +00:00
Alan Davis
a327acbf09 Fix up pom.xml files to make HEAD-BUG-FIX and HEAD identical except for expected differences.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 17:03:58 +00:00
Mark Rogers
0fc68cf345 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68206: Correct pom.xml files after merge from PLATFORM1 (pt1)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68466 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:33:47 +00:00
Mark Rogers
b9d6f7161e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68191: Merged PLATFORM1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      63213: Fix pom files post merge from HBF


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68455 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:28:12 +00:00
Mark Rogers
a7034b935c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67453: BDE-266 Define the version in the top-level pom for these dependencies, so that we always get the right one:
       log4j, slf4j-api, slf4j-log4j12, alfresco-xmlfactory, jaxen, freemarker, joda-time, jackson-core-asl, jackson-mappel-asl


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68340 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 15:47:53 +00:00
Alan Davis
057909dc81 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65632: ACE-969 Upgrage Jackson from 1.9.9 to 1.9.13


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66261 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 22:06:11 +00:00
Alan Davis
478c8fb647 More pom.xml files that included PLATFORM1 rather than 4.3.0
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@63003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 18:11:46 +00:00
Alan Davis
7920ebd2dc Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62910: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61472: ACE-481 
      Added solr-client to the maven build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62963 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:28:22 +00:00
Alan Davis
fd100a8e09 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62906: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61358: ACE-481 
      Modified depends element on target test-system-build-test removing package-solrclient since deploy-solr already has it as a dependency.
      Removed libraries from solr and solrclient classpaths after tests showed that they were not needed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62959 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:24:50 +00:00
Alan Davis
de47088d50 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62896: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61117: ACE-481 
      Moved solr-client code to new project.  
      Changed build to reflect changes to solr and solr-client projects.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62952 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:18:27 +00:00
Alan Davis
d4126deafb Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62892: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61028: Delete and ignore build and .settings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:14:46 +00:00
Alan Davis
551ca0187b Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62888: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61016: ACE-481 Initial empty solr-client project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62944 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:11:14 +00:00