Commit Graph
3883 Commits
Author SHA1 Message Date
Angel Borroy f7cf98073a Support for ACS 6.1 and latest
Support for different Sharding Methods
2019-07-30 16:02:26 +02:00
Angel Borroy e467608636 Simplifying Hash initialization 2019-07-30 14:26:46 +02:00
Angel Borroy 56d9bd56d9 Fix properties mapping to get JUnit Test working 2019-07-30 10:43:55 +02:00
Angel Borroy b1ce486c77 Fix properties mapping to get JUnit Test working 2019-07-30 09:57:33 +02:00
Angel Borroy c94ecbce5e Providing additional configuration parameters to ShardState 2019-07-29 13:03:54 +02:00
Tom Page 2e36156138 Revert "Merge branch 'feature/SEARCH-1738_ShardingParams' into 'master'"
This reverts commit 0b375ed23afd377dd36c6a20bf74d384b2f35f91, reversing
changes made to 558925e169cbaa93b3d44ae89e3c49dbb12ab830.
2019-07-26 16:25:27 +01:00
Tom Page 43b1639ce6 Revert "Restore conflicts from merge."
This reverts commit 946f7133714f21a45a632cd5b7e8a61262720684.
2019-07-26 16:25:09 +01:00
Angel Borroy d60bed859a Restore conflicts from merge. 2019-07-25 16:12:31 +02:00
Angel Borroy e9071a1b49 Merge branch 'feature/SEARCH-1738_ShardingParams' into 'master'
Feature/search 1738 sharding params

See merge request search_discovery/insightengine!109
2019-07-25 15:03:33 +01:00
Angel Borroy d1d63d3387 Merge branch 'master' into 'feature/SEARCH-1738_ShardingParams'
# Conflicts:
#   search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/DBIDRangeRouter.java
#   search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/DateMonthRouter.java
#   search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/DocRouter.java
#   search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/DocRouterFactory.java
#   search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/PropertyRouter.java
2019-07-25 15:03:01 +01:00
Angel Borroy d71838ea9c Changes from review. 2019-07-25 15:25:40 +02:00
Angel Borroy 0c8ca96f3e Move properties logic to DocRouters 2019-07-25 10:39:44 +02:00
Andrea Gazzarini 79f81b7acf Merge branch 'fix/SEARCH-1744_adm_version_upgrade' into 'master'
Fix/search 1744 adm version upgrade

See merge request search_discovery/insightengine!108
2019-07-24 17:14:51 +01:00
agazzarini a3853ffb77 old dom4j lib excluded 2019-07-24 16:31:36 +02:00
agazzarini 113ce7c7ce old dom4j lib excluded 2019-07-24 16:06:45 +02:00
agazzarini 850261d180 Merge branches 'fix/SEARCH-1744_adm_version_upgrade' and 'master' of https://git.alfresco.com/search_discovery/insightengine into fix/SEARCH-1744_adm_version_upgrade 2019-07-24 15:58:50 +02:00
michaelsuzukisagi 3510003aeb Merge branch 'master' of git.alfresco.com:search_discovery/insightengine 2019-07-24 14:35:13 +01:00
michaelsuzukisagi 54e9aebc6a SEARCH-1719, amend as per toms feedback and upload V2 design of AsyncContentTracker 2019-07-24 14:34:51 +01:00
agazzarini 9c4e628db3 Merge branches 'fix/SEARCH-1744_adm_version_upgrade' and 'master' of https://git.alfresco.com/search_discovery/insightengine into fix/SEARCH-1744_adm_version_upgrade
# Conflicts:
#	search-services/alfresco-solrclient-lib/pom.xml
2019-07-24 15:11:28 +02:00
Elia Porciani 5af9d50b18 Merge branch 'fix/SEARCH-1755' into 'master'
Fix/search 1755

See merge request search_discovery/insightengine!103
2019-07-24 13:57:00 +01:00
Angel Borroy 1a711f42e6 Add additional Sharding parameters depending on the Sharding Method 2019-07-24 14:17:15 +02:00
Tom Page f701c84645 Merge branch 'dependabot/maven/search-services/org.alfresco-alfresco-data-model-8.44' into 'master'
Dependabot/maven/search services/org.alfresco alfresco data model 8.44

See merge request search_discovery/insightengine!105
2019-07-24 12:11:51 +01:00
Tom Page 3c8d83f95a Include license for dom4j. 2019-07-24 10:57:21 +01:00
agazzarini 409334d1a5 [SEARCH-1744] Alfresco Data Model dependency upgrade (Shard Method case insensitive match) 2019-07-24 11:13:48 +02:00
Andrea Gazzarini 964492d0c3 Merge branch 'fix/SEARCH_1744_shard_method_case' into 'master'
[SEARCH-1744] DocRouter improvements, refactoring + 95% unit test coverage

See merge request search_discovery/insightengine!104
2019-07-24 09:34:21 +01:00
agazzarini 9074670797 [SEARCH-1744] Review comments addressed 2019-07-24 10:31:21 +02:00
agazzarini 1785c8a238 [SEARCH-1744] Fix bamboo failures 2019-07-23 17:18:27 +02:00
eliaporciani 9c8c8471b4 [SEARCH-1755]
Changed check when maxScore is 0 in scaleScores
2019-07-23 16:54:12 +02:00
agazzarini c38b7e3df7 [SEARCH-1744] DocRouter improvements, refactoring + 95% unit test coverage 2019-07-23 16:18:14 +02:00
michaelsuzukisagi db793a183b Refined the original design 2019-07-23 14:39:21 +01:00
michaelsuzukisagi e9bad79c7b Amend to sequence and added more colours 2019-07-23 10:49:03 +01:00
michaelsuzukisagi 5a214e553c SEARCH-000, updating async content tracker sequence diagram 2019-07-23 10:27:19 +01:00
dependabot-preview[bot] c1becfd02b Bump alfresco-data-model from 8.43 to 8.44 in /search-services
Bumps [alfresco-data-model](https://github.com/Alfresco/alfresco-data-model) from 8.43 to 8.44.
- [Release notes](https://github.com/Alfresco/alfresco-data-model/releases)
- [Commits](https://github.com/Alfresco/alfresco-data-model/compare/8.43...8.44)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-23 09:24:50 +00:00
eliaporciani 5f30192cc3 [SEARCH-1755]
fix typo
added comment
2019-07-23 11:20:35 +02:00
Tom Page fbc13782ae SEARCH-1748 Fix merge of notice.txt. 2019-07-23 10:14:29 +01:00
Angel Borroy 709d5d7ed4 Merge branch 'fix/SEARCH-1426_DistributionZIP' into 'master'
Removing old "jar" goal for "attach-sources" task, as the new goal for Maven 3.4+ is "jar-no-fork"

See merge request search_discovery/insightengine!102
2019-07-23 09:57:00 +01:00
Tom Page 71cf4fba23 Merge branch 'fix/SEARCH-1748_RemoveDuplicateJars' into 'master'
SEARCH-1748 Remove duplicate jars from deployment.

See merge request search_discovery/insightengine!88
2019-07-23 09:29:39 +01:00
eliaporciani f5dd053856 [SEARCH-1755]
Changed assert to assertEqual in scaleTest
2019-07-23 09:53:16 +02:00
Angel Borroy 7efe28f6f7 Removing old "jar" goal for "attach-sources" task, as the new goal for Maven 3.4+ is "jar-no-fork" 2019-07-23 09:37:54 +02:00
eliaporciani a57c80f3bf [SEARCH-1755]
fix rescored computation
2019-07-23 09:37:40 +02:00
eliaporciani b33bef38d8 [SEARCH-1755]
Handled case when maxScore is 0 setting scores to 1
2019-07-23 00:23:39 +02:00
Tom Page 797a932ce2 SEARCH-1748 Ensure we get libs from patched Solr. 2019-07-22 16:15:10 +01:00
Tom Page 492c5a6fa3 SEARCH-1748 Revert part of change for ASM, as it's not needed. 2019-07-22 15:56:03 +01:00
Tom Page d7aebcdc5d SEARCH-1748 Remove older versions of other jackson libs and asm. 2019-07-22 14:55:46 +01:00
Tom Page 036c9c9141 Merge branch 'dependabot/maven/search-services/dependency.jackson.version-2.10.0.pr1' into 'master'
Dependabot/maven/search services/dependency.jackson.version 2.10.0.pr1

See merge request search_discovery/insightengine!101
2019-07-22 10:20:28 +01:00
Tom Page 26949db019 Update jackson version in license notice. 2019-07-22 08:46:21 +01:00
dependabot-preview[bot] 7a4c4d67bb Bump dependency.jackson.version in /search-services
Bumps `dependency.jackson.version` from 2.9.9 to 2.10.0.pr1.

Updates `jackson-core` from 2.9.9 to 2.10.0.pr1
- [Release notes](https://github.com/FasterXML/jackson-core/releases)
- [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.9.9...jackson-core-2.10.0.pr1)

Updates `jackson-annotations` from 2.9.9 to 2.10.0.pr1
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-22 00:17:07 +00:00
bamboo_auth b9eb97db8b [maven-release-plugin] prepare for next development iteration 2019-07-21 17:05:28 +00:00
bamboo_auth eb9207d12d [maven-release-plugin] prepare release 1.4.0-nexus 2019-07-21 17:05:24 +00:00
bamboo_auth 10d52cdb80 [maven-release-plugin] prepare for next development iteration 2019-07-20 08:07:28 +00:00