Commit Graph

5474 Commits

Author SHA1 Message Date
Mark Rogers
45aff692fb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76927: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      67096: Merged BRANCHES/DEV/aowian/plat1_solr4 to BRANCHES/DEV/PLATFORM1
      BRANCHES/DEV/PLATFORM1:
         65032: ACE-916: Carve out tracking from SOLR 1.4
              - Initial checkin. Does not compile
         65034: ACE-916: Carve out tracking from SOLR 1.4
              - Another checkin. Does not compile
         65036: ACE-916: Carve out tracking from SOLR 1.4
              - Another checkin. Does not compile
              - Added InformationServer interface
         65393: ACE-916: Carve out tracking from SOLR 1.4
              - Another checkin. Does not compile
         65963: ACE-916: Carve out tracking from SOLR 1.4
              - Changed references of toDocument method to LegacySolrInformationServer
         65988: ACE-916: Carve out tracking from SOLR 1.4
              - Created individual classes and got CoreTracker and LegacySolrInformationServer to compile
         66090: ACE-916: Carve out tracking from SOLR 1.4
              - Getting closer to no red
         66091: ACE-916: Carve out tracking from SOLR 1.4
              - Getting closer to no red
         66092: ACE-916: Carve out tracking from SOLR 1.4
              - Getting closer to no red
         66847: ACE-916: Carve out tracking from SOLR 1.4
              - Updated eclipse .project files to include SONAR nature
              - Updated solr4 pom to use different port
              - Added adapter for solr data object in SOLR Client, therefore introducing dependency on legacy jars while keeping the main client code version agnostic
              - TODO: Finish making Tracker API work in client project, and explore moving trackers into client project
         66863: ACE-916: Carve out tracking from SOLR 1.4
              - Moved Tracker, TrackerStats, etc into Client project, and abstracted some data objects.
              - TODO: Deal with AlfrescoSolrDataModel
         66926: ACE-916: Carve out tracking from SOLR 1.4
              - Removed some classes that had already been moved
              - TODO: Deal with AlfrescoSolrDataModel
         66957: ACE-916: Carve out tracking from SOLR 1.4
              - Moved adapters into legacy solr project and removed client project's dependency on legacy jars.
              - TODO: Deal with AlfrescoSolrDataModel
         66959: ACE-916: Carve out tracking from SOLR 1.4
              - Moved AlfrescoSolrDataModel to InformationServer and exposed needed APIs
              - Finally, the red is gone, and the code compiles.
         67027: ACE-916: Carve out tracking from SOLR 1.4
              - Removed unused import
         67028: ACE-916: Carve out tracking from SOLR 1.4
              - Merged PLATFORM1 to aowian/plat1_solr4
         67029: ACE-916: Carve out tracking from SOLR 1.4
              - Merged PLATFORM1 to aowian/plat1_solr4
         67076: ACE-916: Carve out tracking from SOLR 1.4
              - Reverse merged from aowian/plat1_solr4 to aowian/plat1_solr4 at -67028
         67090: ACE-916: Carve out tracking from SOLR 1.4
              - Merged PLATFORM1 at 67076 to aowian/plat1_solr4
         67093: ACE-916: Carve out tracking from SOLR 1.4
              - Merged PLATFORM1 at 67085 to aowian/plat1_solr4


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 10:50:14 +00:00
Mark Rogers
9a053bf9b9 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76632: Merged EOL2 to HEAD-BUG-FIX (5.0/Cloud)
      76533: ACE-2219 - EOL external Surf - remove Surf mobile project
      76536: ACE-2219 - Surf external - cleanup of obsolete Eclipse projects, developer local maven projects now mandatory as ANT no longer builds Surf. SVN ignore patterns for Eclipse projects.
      76540: ACE-2219 - Surf external - more cleanup of obsolete Eclipse projects, more SVN ignore patterns.
      76541: ACE-2219 - Surf external - more cleanup of obsolete Eclipse projects, more SVN ignore patterns - 2.
      76542: ACE-2219 - Surf external - restore privatemodules classpath


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77668 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 16:11:27 +00:00
Mark Rogers
f21883d3c7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76356: Remove 'Experimental' warning in pom files. This is not an experiment any more...


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77598 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:01:17 +00:00
Samuel Langlois
467a052a1c [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-27 10:01:38 +00:00
Samuel Langlois
2d1c05d4d1 [maven-release-plugin] prepare release V5.0.a
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75118 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
V5.0.a
2014-06-27 10:01:27 +00:00
Samuel Langlois
d8b4932bc8 [maven-release-plugin] rollback the release of V5.0.a
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75115 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-27 09:54:17 +00:00
Samuel Langlois
26be4cfdf9 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74994 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-26 15:02:23 +00:00
Samuel Langlois
dcc7739f12 [maven-release-plugin] prepare release V5.0.a
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74992 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-26 15:02:14 +00:00
Samuel Langlois
6c9c88fe3b [maven-release-plugin] rollback the release of V5.0.a
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-26 14:50:05 +00:00
Samuel Langlois
0585f2ad0c [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74979 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-26 14:40:44 +00:00
Samuel Langlois
eaf029f79b [maven-release-plugin] prepare release V5.0.a
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74977 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-26 14:40:35 +00:00
Samuel Langlois
3c8af19d17 Upgrade version to 5.0.a-SNAPSHOT in POM files
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74924 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 17:02:11 +00:00
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