Commit Graph
142 Commits
Author SHA1 Message Date
Alex Mukha d249a6bec1 Sync master with develop 2017-08-22 11:34:22 +01:00
Alex Mukha 726bc328ab SEARCH-506: Updating to data-model 6.17 2017-08-22 00:25:48 +01:00
Alex Mukha 7ce95c2622 Create LICENSE 2017-08-21 10:58:07 +01:00
Alex Mukha f348fb5461 REPO-2756 Add readme and contributors guide 2017-08-21 10:51:53 +01:00
alfresco-build d77bfff0e8 [maven-release-plugin] prepare for next development iteration 2017-08-01 00:01:56 +01:00
alfresco-build 8840150653 [maven-release-plugin] prepare release alfresco-solrclient-6.1 alfresco-solrclient-6.1 2017-08-01 00:01:50 +01:00
Alex Mukha 470e173b33 Merge pull request #1 from Alfresco/develop
REPO-2724 Add building of tests jar
2017-08-01 00:00:36 +01:00
Alex Mukha c12d6489ef REPO-2724 Add building of tests jar 2017-07-31 23:57:20 +01:00
alfresco-build 32090bc5d9 [maven-release-plugin] prepare for next development iteration 2017-07-26 20:19:48 +01:00
alfresco-build ae66ad6c4a [maven-release-plugin] prepare release alfresco-solrclient-6.0 alfresco-solrclient-6.0 2017-07-26 20:19:42 +01:00
Alex Mukha 4ee23fc9f0 REPO-2724 Add gitignore 2017-07-26 20:15:03 +01:00
Alex Mukha 99ec7ccc8b REPO-2724 Fix pom after split 2017-07-26 20:14:14 +01:00
Alex Mukha b89135dc8a REPO-2724 Apply standard maven folder structure 2017-07-26 20:04:51 +01:00
Michael Suzuki c815ef778c Search-499, improve track logging to include corename part of the output 2017-07-18 15:16:40 +01:00
Ancuta Morarasu 032f27138c REPO-2346: Create develop branch from 5.2.N and change version to 5.3-SNAPSHOT 2017-07-13 15:39:27 +03:00
Alan Davis d58de1fbb0 Merged HEAD (5.2) to 5.2.N (5.2.2) (RECORD ONLY):
130397,130443,132419,132425,132567,132653-132654,132661-132685,132688,132692-132694,132709,
    132711-132712,132714,132723-132726,133002-133012,133249,133358-133411,133432,133563,133595,
    133762,133855,134029,134173-134200,134202-134211,134270,134302,134317,134837,134895-134896,
    134969-134988,134995,135081,135119,135778,136876,136905,137301-137420,137428-137657,137659
    The two branches should now be the same except for the version numbers and any commits on
    5.2.N after r137427

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-16 08:33:50 +00:00
Samuel Langlois 88cc3f8e75 Upgraded to version 5.2.2
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137155 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-05 16:51:23 +00:00
Alan Davis ce00e498a6 Merged 5.2.N (5.2.1) to HEAD (5.2)
131769 ahind: Fix for SEARCH-222    SOLR 6 - Improved indexing for categories
   - return ancestor based path for better support to internationalise categories etc (by UUID matching the public AIP)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132297 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:57:49 +00:00
Alan Davis 39763c0e52 Merged 5.2.N (5.2.1) to HEAD (5.2)
131370 adavis: Merged 5.2.N-SERVLET-3.0 (5.2.1) to 5.2.N (5.2.1)
      130708: REPO-843 / REPO-1246: Upgrade to Servlet 3.0 (part I),
      130714: REPO-843 / REPO-1246: Upgrade to Servlet 3.0 (part 1b)
      - fix web.xml (web-app),
      130727: REPO-843 / REPO-1246: Upgrade to Servlet 3.0 (part 1b)
      - update other web.xml's (other than web-client project),
      130844: REPO-843 / REPO-1251: Upgrade to Servlet API 3.0.x (part 2) - update to Spring WebScripts 6.9 (ACE-5584)
      - update to servlet-api 3.0.1,
      130847: REPO-843 / REPO-1251: Upgrade to Servlet API 3.0.x (part 2) - update to Spring WebScripts 6.9 (ACE-5584)
      - follow-on to commit the correct pom.xml (ie. parent rather than overlay),
      130852: REPO-843 / REPO-1251: Upgrade to Servlet API 3.0.x (part 2) - update to Spring WebScripts 6.9 (ACE-5584)
      - follow-on


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:50:08 +00:00
Alan Davis c73f6cc7f1 Merged 5.2.N (5.2.1) to HEAD (5.2)
130920 jbernstein: SEARCH-2: Update SolrAPIQueueClient to support fingerprint tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132208 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:29:58 +00:00
Alan Davis d59dc30b65 Merged 5.2.N (5.2.1) to HEAD (5.2)
130784 amukha: REPO-1006: Move Alfresco 'data-model' to Git
      - removed project files
      - changed the dependencies


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132180 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:26:09 +00:00
Alan Davis 8a34293e84 Merged 5.2.N (5.2.1) to HEAD (5.2)
130755 jbernstein: SEARCH-165: Simulate down repo in test cases


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132175 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:15:53 +00:00
Andrew Hind a5c81061e5 Fix for SEARCH-222 SOLR 6 - Improved indexing for categories
- return ancestor based path for better support to internationalise categories etc (by UUID matching the public AIP)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131769 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-26 08:51:01 +00:00
Alan Davis 342fe3fd70 Merged 5.2.N-SERVLET-3.0 (5.2.1) to 5.2.N (5.2.1)
130708: REPO-843 / REPO-1246: Upgrade to Servlet 3.0 (part I),
   130714: REPO-843 / REPO-1246: Upgrade to Servlet 3.0 (part 1b)
   - fix web.xml (web-app),
   130727: REPO-843 / REPO-1246: Upgrade to Servlet 3.0 (part 1b)
   - update other web.xml's (other than web-client project),
   130844: REPO-843 / REPO-1251: Upgrade to Servlet API 3.0.x (part 2) - update to Spring WebScripts 6.9 (ACE-5584)
   - update to servlet-api 3.0.1,
   130847: REPO-843 / REPO-1251: Upgrade to Servlet API 3.0.x (part 2) - update to Spring WebScripts 6.9 (ACE-5584)
   - follow-on to commit the correct pom.xml (ie. parent rather than overlay),
   130852: REPO-843 / REPO-1251: Upgrade to Servlet API 3.0.x (part 2) - update to Spring WebScripts 6.9 (ACE-5584)
   - follow-on


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131370 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-12 11:33:40 +00:00
Joel Bernstein 8721fd2b2f SEARCH-2: Update SolrAPIQueueClient to support fingerprint tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130920 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-27 00:03:41 +00:00
Alex Mukha 6941ba3c43 REPO-1006: Move Alfresco 'data-model' to Git
- removed project files
   - changed the dependencies


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130784 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-19 13:09:16 +00:00
Joel Bernstein 7a17260e77 SEARCH-165: Simulate down repo in test cases
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130755 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-16 18:48:17 +00:00
Alan Davis d509d5bc5a Merged 5.2.N (5.2.1) to HEAD (5.2)
130285 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130022 gjames: Merged 5.2.N-AHIND (5.2.1) to searchapi (5.2.1)
         129926 ahind: SEARCH-31    SOLR 6 - Shard based on date - SOLR implementation
         - Support returning a date, datetime or string property to use for sharding


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130357 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 22:08:39 +00:00
Alan Davis b8d3593cb5 Merged 5.2.N (5.2.1) to HEAD (5.2)
130284 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130021 gjames: Merged 5.2.N-AHIND (5.2.1) to searchapi (5.2.1)
         129885 ahind: SEARCH-31    SOLR 6 - Shard based on date - SOLR implementation
         - SOLRAPIClient changes to support requesting a property value to use for sharding


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 22:08:29 +00:00
Gethin James e279b06d89 Merged searchapi (5.2.1) to 5.2.N (5.2.1)
130022 gjames: Merged 5.2.N-AHIND (5.2.1) to searchapi (5.2.1)
      129926 ahind: SEARCH-31    SOLR 6 - Shard based on date - SOLR implementation
      - Support returning a date, datetime or string property to use for sharding


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130285 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 15:35:59 +00:00
Gethin James 4e4872cc98 Merged searchapi (5.2.1) to 5.2.N (5.2.1)
130021 gjames: Merged 5.2.N-AHIND (5.2.1) to searchapi (5.2.1)
      129885 ahind: SEARCH-31    SOLR 6 - Shard based on date - SOLR implementation
      - SOLRAPIClient changes to support requesting a property value to use for sharding


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 15:35:51 +00:00
Alan Davis 47ff8bf507 Merged 5.2.N (5.2.1) to HEAD (5.2)
129612 jbernstein: SEARCH-95: Add the SOLRAPIQueueCLient


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130213 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 14:40:30 +00:00
Alan Davis b12d1e0a1f Merged 5.2.N (5.2.1) to HEAD (5.2)
129538 msuzuki: Search-95, added missing methods that were lost in the merge.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130212 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 14:40:21 +00:00
Alan Davis 4feb74244f Merged 5.2.N (5.2.1) to HEAD (5.2)
129519 msuzuki: Search-95, updating solr features from the latest solr development branch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130210 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 14:40:00 +00:00
Steven Glover 7f7224cb11 Merged https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/AMUKHA/5.2.N-MNT-15135 to 5.2.N
MNT-15135 "Alfresco Media Management: Rendition Concurrency Failure on Property update"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-22 14:33:09 +00:00
Joel Bernstein 6629e8b3df SEARCH-95: Add the SOLRAPIQueueCLient
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129612 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-18 02:52:17 +00:00
Michael Suzuki a0ccb5f3b7 Search-95, added missing methods that were lost in the merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129538 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-17 08:41:35 +00:00
Michael Suzuki 3e7a5b47ee Search-95, updating solr features from the latest solr development branch
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129519 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-16 12:35:01 +00:00
Alexandru Epure 842941bcb7 Merged 5.2.N (5.2.1) to HEAD (5.2)
128094 arebegea: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128046 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         128000 gjames: Converted the field to a local variable


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129268 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:17:59 +00:00
Alexandru Epure 364ce2f695 Merged 5.2.N (5.2.1) to HEAD (5.2)
128004 arebegea: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127934 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         127895 gjames: Minor cleanup and removed some imports


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:16:22 +00:00
Alan Davis c2eb4aa15b Change version to 5.2.0-CLOUD44-SNAPSHOT
- pom.xml files changed
   - version.properties is already 5.2.0 so does not need to change until the first HF.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.0-CLOUD44/root@128855 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-21 09:16:45 +00:00
Andrei Rebegea 8676031803 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128046 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      128000 gjames: Converted the field to a local variable


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128094 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-09 15:00:22 +00:00
Andrei Rebegea 7335a8fdee Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
128000 gjames: Converted the field to a local variable


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@128046 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-08 14:59:30 +00:00
Andrei Rebegea 38ac17c133 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127934 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127895 gjames: Minor cleanup and removed some imports


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-07 14:27:55 +00:00
Andrei Rebegea 2aa16c1219 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
127895 gjames: Minor cleanup and removed some imports


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 13:06:22 +00:00
Alan Davis eb21a3c286 Merged 5.2.N (5.2.1) to HEAD (5.2)
125788 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 17:08:06 +00:00
Alan Davis 212964b665 Merged 5.2.N (5.2.1) to HEAD (5.2)
125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:45:04 +00:00
Alan Davis e2aa9c4b6c Merged 5.2.N (5.2.1) to HEAD (5.2)
125781 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:40:56 +00:00
Jean-Pierre Huynh 299554342c BDE-674: Fix conflict tags.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 11:47:35 +00:00
Raluca Munteanu 71e845a829 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00