Commit Graph
72 Commits
Author SHA1 Message Date
Gethin James 98d250543d As discussed with Andy, removed unused config 2016-06-10 16:28:27 +02:00
Gethin James 1880902a75 Merge branch 'removeJetty' into 'master'
Remove jetty and other libraries that are already bundled in solr zip

See merge request !2
2016-06-10 15:13:13 +01:00
Michael Suzuki ec865c9e6f Merge branch 'removeJetty' of https://gitlab.alfresco.com/search_discovery/solr into removeJetty 2016-06-10 13:34:47 +01:00
Michael Suzuki 83f024e25b Added list of of libs to exclude instead of using scope to filter out the unwanted libs 2016-06-10 13:34:23 +01:00
Michael Suzuki 94b866d2dc rebase merging fix 2016-06-10 13:32:12 +01:00
Michael Suzuki b87681cced Remove unwanted jar such as jetty 2016-06-10 13:31:01 +01:00
Michael Suzuki cf3f6bae35 Remove contents of org solr folder as it is a surplus 2016-06-10 13:31:01 +01:00
Michael Suzuki ac6109afa2 Added list of of libs to exclude instead of using scope to filter out the unwanted libs 2016-06-10 13:31:01 +01:00
Michael Suzuki 5b1a74d111 Amend pom to exclude libs that are not needed such as jetty 2016-06-10 13:31:01 +01:00
Michael Suzuki aa20697cdc Remove unwanted jar such as jetty 2016-06-10 13:31:01 +01:00
Michael Suzuki 70c089f227 Merge branch 'removeJetty' of https://gitlab.alfresco.com/search_discovery/solr into removeJetty 2016-06-10 13:01:43 +01:00
Michael Suzuki dd554d630b Remove contents of org solr folder as it is a surplus 2016-06-10 13:01:32 +01:00
Michael Suzuki 9f851d3485 Added list of of libs to exclude instead of using scope to filter out the unwanted libs 2016-06-10 13:01:32 +01:00
Michael Suzuki 981f32fc19 Amend pom to exclude libs that are not needed such as jetty 2016-06-10 13:01:32 +01:00
Michael Suzuki 27cc6a36d4 Remove unwanted jar such as jetty 2016-06-10 13:01:32 +01:00
Michael Suzuki b578b01fac Remove contents of org solr folder as it is a surplus 2016-06-10 11:28:41 +01:00
Michael Suzuki 32cb67cd69 Added list of of libs to exclude instead of using scope to filter out the unwanted libs 2016-06-10 10:45:21 +01:00
Gethin James aa5d66c04f Using a script from source control to build/run the docker image 2016-06-10 10:55:12 +02:00
Michael Suzuki 21fa9d9727 Amend pom to exclude libs that are not needed such as jetty 2016-06-09 21:56:56 +01:00
Gethin James 6928769405 Added a docker-compose file for easy running. 2016-06-09 17:05:34 +02:00
Michael Suzuki d84385b411 Reverted wait time back to 80000 2016-06-09 15:25:48 +01:00
Michael Suzuki ba34795ef6 Remove unwanted jar such as jetty 2016-06-09 14:51:27 +01:00
Michael Suzuki d892237879 Tidy up duplication and removed System.out.prints 2016-06-09 10:59:01 +01: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
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
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
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