Commit Graph
1522 Commits
Author SHA1 Message Date
Tom Page 2d240301ac Merge master into SEARCH-1599_ShardSettingsAtStartup. 2019-06-10 13:11:05 +01:00
Angel Borroy f241877c03 Merge branch 'features/SEARCH-1630_BuildingCode' into 'master'
License and landing page.

See merge request search_discovery/insightengine!15
2019-06-10 13:00:25 +01:00
Angel Borroy 48d92b2ab3 Explain why "pom.xml" is available in the root folder. 2019-06-10 13:59:27 +02:00
Angel Borroy 636b803e69 License and landing page. 2019-06-10 10:34:43 +02:00
Elia Porciani fbca9419ae Merge branch 'feature/SEARCH-1643' into 'master'
Feature/search 1643

See merge request search_discovery/insightengine!10
2019-06-05 09:00:42 +01:00
eliaporciani 730b552ff3 Merge branch 'master' of git.alfresco.com:search_discovery/insightengine into feature/SEARCH-1643 2019-06-05 08:18:03 +02:00
bamboo_auth a9bcdc93c2 [maven-release-plugin] prepare for next development iteration 2019-06-04 14:23:44 +00:00
bamboo_auth 1b5120d0ca [maven-release-plugin] prepare release 1.4.0-RC1 2019-06-04 14:23:41 +00:00
Tom Page e3df80aa3f SEARCH-1599 Fix two unit tests. 2019-06-04 12:30:10 +01:00
Tom Page 84d7f97069 Merge branch 'dependabot/maven/jaxen-jaxen-1.2.0' into 'master'
Dependabot/maven/jaxen jaxen 1.2.0

See merge request search_discovery/insightengine!12
2019-06-04 09:25:09 +01:00
Tom Page 2f77826420 Merge branch 'dependabot/maven/com.fasterxml.jackson.core-jackson-core-2.9.9' into 'master'
Dependabot/maven/com.fasterxml.jackson.core jackson core 2.9.9

See merge request search_discovery/insightengine!11
2019-06-04 09:22:36 +01:00
eliaporciani eb64f499f9 Merge branch 'feature/SEARCH-1643' of git.alfresco.com:search_discovery/insightengine into feature/SEARCH-1643 2019-06-04 09:47:25 +02:00
eliaporciani f89af0e6ea [SEARCH-1643]
Code style fixes
2019-06-04 09:47:07 +02:00
agazzarini 23dc876666 [ SEARCH-1643 ] DocRouters ADR 2019-06-04 09:20:35 +02:00
eliaporciani b97d15b678 [SEARCH-1643]
Added alfresco header
2019-06-04 09:14:10 +02:00
eliaporciani bfd2f39a36 [SEARCH-1643]
changed file author
2019-06-04 09:12:28 +02:00
eliaporciani f1b2e17ead [SEARCH-1643]
fixed problem caused by incorrect conflixt resolution in MetadataTracker
2019-06-03 15:25:07 +02:00
agazzarini 73da6c43e0 [ SEARCH-1643 ] DocRouters ADR (draft) 2019-06-02 12:48:59 +02:00
agazzarini e5441401fd [ SEARCH-1643 ] upgrade alfresco-data-model dep version (-> 8.34) in order to include the new sharding methods 2019-06-02 11:18:30 +02:00
eliaporciani d70efc8b93 [SEARCH-1643]
Added unit test for LastRegisteredShardRouter
2019-05-31 10:26:39 +02:00
eliaporciani 1e05e4aee0 [SEARCH-1643]
Added possibility to use explicitRouter with the two fallbacks (LRSI and DBID)
2019-05-30 14:37:08 +02:00
eliaporciani 491e20e00e [SEARCH-1643]
explicitShardId from int to Integer
2019-05-30 14:36:27 +02:00
eliaporciani a5f6fe9da8 Merge branch 'master' of git.alfresco.com:search_discovery/insightengine into feature/SEARCH-1643 2019-05-30 13:44:44 +02:00
Tom Page f29926dae2 Merge master into jaxen-jaxen-1.2.0. 2019-05-29 16:25:29 +01:00
Tom Page 5e36d498b0 Merge master into com.fasterxml.jackson.core-jackson-core-2.9.9. 2019-05-29 16:21:59 +01:00
Tom Page 12414bac82 Merge master into SEARCH-1599_ShardSettingsAtStartup. 2019-05-29 15:47:05 +01:00
Michael Suzuki 7e7275c4f9 Merge branch 'fix/QParserPluginTestFix' into 'master'
Fix QParserPluginTest when run outside the UTC timezone.

See merge request search_discovery/insightengine!3
2019-05-28 12:18:58 +01:00
Tom Page 20acf08d4f Fix QParserPluginTest when run outside the UTC timezone. 2019-05-28 12:06:56 +01:00
eliaporciani 97997b6ad9 [SEARCH-1643] Added setCoreName where required 2019-05-24 15:48:38 +02:00
Tom Page 20e3c3bf2d SEARCH-1626 Consolidate .gitignore files. 2019-05-24 14:36:14 +01:00
Tom Page 8e5416e0ca SEARCH-1626 Ensure maven version can be extracted by Bamboo.
See this issue for more details:
https://bitbucket.org/dehringer/bamboo-maven-pom-extractor-plugin/issues/18/groupid-not-populated-if-using-parent-pom
2019-05-24 14:35:18 +01:00
eliaporciani 11618a8896 Merge branch 'master' of git.alfresco.com:search_discovery/insightengine into feature/SEARCH-1643 2019-05-24 12:45:04 +02:00
Tom Page 6932d72452 Merge release/alfresco-insight-engine/master into master. 2019-05-23 13:29:13 +01:00
eliaporciani f78b0ecfd7 Added coreName in nodeParameters Added coreName in propertyBag (shardState) 2019-05-23 11:35:17 +01:00
eliaporciani 3ccaca0e3a Temporany use new ExplicitElasticRouter when explicit_id is used as shard method 2019-05-23 11:35:17 +01:00
eliaporciani ebf10b6c59 Added Explicit elastic router 2019-05-23 11:35:17 +01:00
eliaporciani 4d16999a77 Added elasticLastShardRouter 2019-05-23 11:35:17 +01:00
eliaporciani 53072dcaf5 Added explicitShardId field to Node 2019-05-23 11:35:17 +01:00
Tom Page 24fe05974a SEARCH-1625 Unify distribution and SCM management.
(cherry picked from commit b0e99b77b7f553133e0117a2549cef573045b2bb)
2019-05-23 06:33:47 +01:00
Tom Page 03dcc0a9e8 SEARCH-1625 Unify distribution and SCM management. 2019-05-23 06:32:02 +01:00
Tom Page 02fe15d1a9 SEARCH-1625 Fix version in root pom file. 2019-05-22 18:03:30 +01:00
Tom Page ca66ed0af7 Set master version to 1.4.0-SNAPSHOT. 2019-05-22 08:30:41 +01:00
Tom Page 2456d0c63d Merge release/alfresco-insight-engine/master with release/alfresco-search-services/master to make a unified master. 2019-05-22 08:30:36 +01:00
Tom Page 39f3f5fbcb Merge history of SearchServices 1.4.0-IE1.2-1 and InsightEngine master.
Also updating SearchServices version to 1.4.0-IE1.2.0-SNAPSHOT.
2019-05-22 08:30:34 +01:00
Sridharraj Vellingiri 75a319757f Merge pull request #170 from Alfresco/feature/SEARCH-1655_changing_base_docker_image
SEARCH-1655 Changing_base_docker_image
2019-05-21 09:54:32 +01:00
Tom Page 8c40d70117 Update notices.txt and refactor Jackson version into property. 2019-05-20 15:30:38 +01:00
Tom Page fbd351a3d8 Remove options that don't make sense when starting a solr node. 2019-05-20 15:01:47 +01:00
sridharvellingiri bb95cc5861 SEARCH-1546 SEARCH-1655 Changing_base_docker_image 2019-05-20 14:18:57 +01:00
Tom Page f3a832a977 SEARCH-1599 Refactor to use a static map for the store refs. 2019-05-20 13:01:29 +01:00
Angel Borroy 64b63328cc Merge pull request #169 from Alfresco/revert-165-feature/SEARCH-1620_DockerSSL
Revert "Bamboo uses internal releases to quay.io, so images should be pulled …"
2019-05-20 13:34:17 +02:00