5700 Commits

Author SHA1 Message Date
Gethin James
58a6d0acd3 SEARCH-56: Added a ConfigUtil class for locating properties 2016-06-09 10:54:46 +02:00
Gethin James
bdd8c60b84 Fixing the alfresco.version number. 2016-06-09 10:48:26 +02:00
Gethin James
062e7d28fe Restrict the libs jar to: compile, provided, and system dependencies 2016-06-09 10:34:03 +02:00
Gethin James
68bbad375d Fixing the packaging to use a solr-libs.jar 2016-06-09 10:21:59 +02:00
Michael Suzuki
fd8bb0b643 Amend assembly to work with new structure 2016-06-08 21:13:53 +01:00
Michael Suzuki
e30bfe6398 Amend to not use shade as it would return all libs as flat files and instead place all dependency in a lib folder 2016-06-08 20:43:27 +01: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
Michael Suzuki
ca7190a4cd Merge branch 'master' of https://gitlab.alfresco.com/search_discovery/solr 2016-06-08 14:50:23 +01:00
Michael Suzuki
10949630c9 Fix packaging to work with alfresco-solr in jar format 2016-06-08 14:50:09 +01:00
Gethin James
4aeabf0cc8 SEARCH-9: Changed the docker envs because bamboo uses an old docker version 2016-06-08 15:34:05 +02:00
Michael Suzuki
0f69dbaf35 organise imports 2016-06-08 11:21:57 +01:00
Michael Suzuki
dd6889f985 Fix to use locally built alfresco-solr instead of using the artifact released in nexus 2016-06-08 09:48:44 +01:00
Michael Suzuki
980187ff01 Fix to locate jar instead of war file 2016-06-08 07:27:29 +01: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
Michael Suzuki
a0d1933f7c Merge branch 'master' of https://gitlab.alfresco.com/search_discovery/solr 2016-06-07 14:35:30 +01:00
Michael Suzuki
32f42e0f4d Removed unused libs and changed packaging to a jar as the packaging project is now responsible for making it into a war file 2016-06-07 14:35:25 +01:00
Gethin James
f3c93d2dbb Fixing the packaging after the build artifact was renamed 2016-06-07 13:24:10 +02:00
Michael Suzuki
bf2d4c98f3 Updated artifact naming to alfresco-solr instead of specifying a solr version 2016-06-06 15:43:17 +01:00
Michael Suzuki
a029dc845c Removed jetty dependencies and tidy up pom indentation 2016-06-06 15:21:34 +01:00
Gethin James
26939dc561 SEARCH-9: Renamed the packaging project to -distribution 2016-06-06 16:11:47 +02: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
Michael Suzuki
ce87cad096 Removed settings and plugins relating to ssl setup 2016-06-03 17:37:30 +01:00
Joel
5cff50725c SEARCH-5: Comment out test cases that are not playing nicely with the new test framework. Revisit these tests as part of the larger test epic 2016-06-03 10:32:51 -04:00
Michael Suzuki
53dabf759c Amend folder description 2016-06-03 15:11:46 +01:00
Michael Suzuki
a37607d3d4 Tidy up 2016-06-03 15:08:36 +01:00
Michael Suzuki
5c96520bdc Add readme detailing project layout and commands 2016-06-03 15:05:52 +01:00
Michael Suzuki
3d4b4a839c Removed ssl related configuration as not relevant with changes in solr6 2016-06-03 15:03:31 +01:00
Gethin James
b721bc1f6e SEARCH-9: Updated the README 2016-06-03 14:37:40 +02:00
Gethin James
685a4eac8a SEARCH-9: Updated the distribution to get the files from the new jar. 2016-06-03 14:33:30 +02:00
Gethin James
dc18f87f98 SEARCH-9: Renamed shared.properties so its the default in the distribution 2016-06-03 14:32:50 +02:00
Gethin James
0c8f2f6a86 SEARCH-16: Added a parent pom to help with the bamboo build 2016-06-03 13:46:05 +02:00
Michael Suzuki
2e613003e7 Merge branch 'master' of https://gitlab.alfresco.com/search_discovery/solr 2016-06-03 12:11:06 +01:00
Michael Suzuki
fdc6c6090a SEARCH-18: Updated directory structure to maven standards and fixed pom and tests 2016-06-03 12:10:59 +01:00
Gethin James
0367dad2df SEARCH-9: Added a default data directory 2016-06-03 12:06:48 +02:00
Gethin James
d52a36ae96 SEARCH-9: Added a basic docker build 2016-06-03 10:59:26 +02:00
Gethin James
64fe19521a SEARCH-9: using the config-sharing artifiact 2016-06-03 10:59:05 +02:00
Michael Suzuki
98480ac3a9 Tweaked gitignore to not include _DEFAULT_ directory and removed all test generated data 2016-06-02 13:55:42 +01:00
Gregory Melahn
9f20b15354 slight improvement to readme 2016-06-02 07:32:32 -04:00
Joel
44a11956d6 SEARCH-5: Suppress SSL for SolrAuthTest 2016-06-01 15:45:43 -04:00
Joel
7dde0f1fa3 SEARCH-5: Suppress SSL for AlfrescoFTSQParserPlugin 2016-06-01 15:20:17 -04:00
Michael Suzuki
d999070afe Layout amen to README 2016-06-01 16:21:33 +01:00
Michael Suzuki
8d8da2fbcc added lines as per gitlab markdown 2016-06-01 16:20:41 +01:00
Michael Suzuki
b222d951be Updated with instructions to checkout the project 2016-06-01 16:12:06 +01:00
Michael Suzuki
3728d1ce41 Tidy up, changed tabs to spaces 2016-06-01 15:31:06 +01:00
Michael Suzuki
aa78809da4 removed files generated by test 2016-06-01 15:30:24 +01:00
Michael Suzuki
03b39947fc added test-filesContentStore folder to list of ignorable directories by git 2016-06-01 14:53:56 +01:00
Michael Suzuki
19f315da4a set ignore to test data directory 2016-06-01 14:47:56 +01:00