Commit Graph
4871 Commits
Author SHA1 Message Date
Tom Page 2dacad1a6e Merge branch 'feature/SEARCH-1748_MergeTo20x' into 'release/V2.0.x'
Merge master into release/V2.0.x.

See merge request search_discovery/insightengine!447
2020-04-03 14:06:35 +01:00
Tom Page 4fbda82b49 Merge branch 'feature/MergeMasterIntoV20x' into 'release/V2.0.x'
Feature/merge master into v20x

See merge request search_discovery/insightengine!443
2020-04-02 16:33:28 +01:00
Tom Page 0001244488 Merge master into release/V2.0.x. 2020-04-02 10:17:27 +01:00
Keerat Lalia 35e1c861bf Merge branch 'revert-9e29a984' into 'master'
Revert "Commit that sets the com.googlecode.maven-download-plugin to 1.5.1-alfresco"

See merge request search_discovery/insightengine!424
2020-03-24 12:43:04 +00:00
Keerat Lalia 59405ac2cf Revert "Merge branch..."
This reverts merge request !423
2020-03-24 12:39:24 +00:00
Tom Page e27eebed0a Merge branch 'dependabot/maven/search-services/com.googlecode.maven-download-plugin-download-maven-plugin-1.5.1-alfresco' into 'master'
Bump download-maven-plugin in /search-services

See merge request search_discovery/insightengine!423
2020-03-23 16:23:07 +00:00
Angel Borroy ce22d4a5e2 Merge branch 'feature/SEARCH-2087_YourKitDocker' into 'master'
SEARCH-2087: YourKit Java Profiler server side software has been added to...

See merge request search_discovery/insightengine!419
2020-03-20 18:15:26 +00:00
Angel Borroy 79c0fe6262 SEARCH-2087: YourKit Java Profiler server side software has been added to Search Services and Insight Engine Docker Images by default.
In order to enable this YourKit Agent, additional SOLR_OPTS value is required when running the Docker Image. Also mapping the Docker Image exposed port (10001) is required.
2020-03-20 15:54:21 +01:00
Tom Page 4043edfae9 Merge branch 'fix/SEARCH-2140_DistributedTimeZoneIT' into 'master'
SEARCH-2140 Rewrite DistributedTimeZoneIT so it isn't affected by daylight savings.

See merge request search_discovery/insightengine!415
2020-03-20 13:27:58 +00:00
Angel Borroy 90b9aacd0c Update README.md 2020-03-20 10:24:34 +00:00
dependabot-preview[bot] 3f21b47b29 Bump download-maven-plugin in /search-services
Bumps [download-maven-plugin](https://github.com/maven-download-plugin/maven-download-plugin) from 1.5.0 to 1.5.1-alfresco.
- [Release notes](https://github.com/maven-download-plugin/maven-download-plugin/releases)
- [Commits](https://github.com/maven-download-plugin/maven-download-plugin/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-19 22:14:02 +00:00
Angel Borroy 62fb937b09 Merge branch 'feature/SEARCH-2029_CompressGenerator' into 'master'
SEARCH-2029: Apply content compression options to Enterprise Docker Compose template

See merge request search_discovery/insightengine!416
2020-03-19 09:34:54 +00:00
Angel Borroy bdf8063caa SEARCH-2029: Add compress option to solr6secondary 2020-03-19 10:34:07 +01:00
Angel Borroy 50734519b5 SEARCH-2029: Apply content compression options to Enterprise Docker Compose template 2020-03-18 11:56:46 +01:00
Keerat Lalia 0b3ed9b132 Merge branch 'fix/SEARCH-2116_FixForTheFailingTests' into 'master'
Fix/search 2116 fix for the failing tests

See merge request search_discovery/insightengine!411
2020-03-17 12:25:16 +00:00
Andrea Gazzarini 4ae01befdf Merge branch 'feature/SEARCH-2090' into 'release/V2.0.x'
SolrContentStore removal + fields deduplication

See merge request search_discovery/insightengine!413
2020-03-10 14:53:35 +00:00
agazzarini a5fadf92ff [ SEARCH-2090 ] Delete node only if that exists (SEARCH-2096) 2020-03-10 13:56:44 +01:00
agazzarini 09326641f2 [ SEARCH-2090 ] SolrQueueAPIClient fix 2020-03-10 12:53:36 +01:00
agazzarini 7bbe648979 [ SEARCH-2090 ] SolrQueueAPIClient refactoring + SolrInformationServer fix 2020-03-10 10:46:24 +01:00
agazzarini c3e670480b [ SEARCH-2090 ] Cross-locale behaviour ripristined 2020-03-10 08:54:22 +01:00
agazzarini f0f011c874 [ SEARCH-2090 ] Synonyms.txt file re-added 2020-03-10 07:50:04 +01:00
agazzarini b174e8ac0c [ SEARCH-2090 ] Wait on rangeCheck test 2020-03-09 18:09:15 +01:00
agazzarini bcbcbedff0 Merge branches 'feature/SEARCH-2090' and 'release/V2.0.x' of https://git.alfresco.com/search_discovery/insightengine into feature/SEARCH-2090
 Conflicts:
	search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/schema.xml
	search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterIT.java
2020-03-09 16:59:10 +01:00
agazzarini 89ddda9374 Merge branches 'feature/SEARCH-2090' and 'master' of https://git.alfresco.com/search_discovery/insightengine into feature/SEARCH-2090
 Conflicts:
	e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchSpellCheckTest.java
	insight-engine/alfresco-insight-engine/src/main/java/org/alfresco/solr/sql/SolrSchema.java
	search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoCoreAdminHandler.java
	search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
	search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java
2020-03-09 15:42:29 +01:00
Meenal Bhave d576095c31 Merge branch 'fix/Search-2108' into 'master'
Search-2108: Tests added for Alfresco scpecific fields, on sharded mode with 1...

See merge request search_discovery/insightengine!412
2020-03-09 13:43:52 +00:00
mbhave d846a8749a Merge branch 'master' of https://git.alfresco.com/search_discovery/insightengine into fix/Search-2108 2020-03-09 13:43:18 +00:00
Angel Borroy 02a0993ac3 Merge branch 'feature/SEARCH-2097_ACLTrackerLog' into 'master'
SEARCH-2097: Adding verbose log (INFO, DEBUG and TRACE levels) for AclTracker.

See merge request search_discovery/insightengine!399
2020-03-09 11:34:27 +00:00
Angel Borroy 7e91e77eae SEARCH-2097: Consolidating log messages 2020-03-09 11:39:59 +01:00
Keerat ab1bce32f0 SEARCH-2116 adding the ACS_62n Test group to the failing tests 2020-03-09 09:05:52 +00:00
Keerat cbc5cb12c6 SEARCH-2116 adding the ACS_62n Test group to the failing tests 2020-03-09 09:04:54 +00:00
Meenal Bhave 6e3bf14f05 Merge branch 'fix/Search-2116' into 'master'
Search-2116: Added some tests for testing pagination for search and sql queries

See merge request search_discovery/insightengine!410
2020-03-06 14:56:47 +00:00
mbhave f4f00bf932 Search-2116: Removed redundant test and simplified a test 2020-03-06 14:54:38 +00:00
Keerat Lalia 9d5c5344da Merge branch 'fix/SEARCH-2078_SpellCheckFixes' into 'master'
Fix/search 2078 spell check fixes

See merge request search_discovery/insightengine!409
2020-03-06 14:29:24 +00:00
Keerat 5d9c90ea7e SEARCH-2078 fix for the spellcheck with the new queries 2020-03-06 12:52:55 +00:00
Keerat d5eefa5d94 SEARCH-2078 fix for the spellcheck ACL test in a sharded mode 2020-03-06 12:44:55 +00:00
Keerat 1630852006 Merge branch 'master' of https://git.alfresco.com/search_discovery/insightengine into fix/SEARCH-2078_SpellCheckFixes 2020-03-06 12:33:40 +00:00
Keerat 548c579451 SEARCH-2078 fix for the spellcheck ACL test in a sharded mode 2020-03-05 21:40:30 +00:00
Keerat 907041b8df SEARCH-2078 fix for the spellcheck parameter test in a sharded mode 2020-03-05 19:17:31 +00:00
Keerat 9616698acb SEARCH-2078 fix for the spellcheck ACL test in a sharded mode 2020-03-05 19:09:03 +00:00
mbhave 77e1ef2fb1 Search-2116: Added some tests for testing pagination for search and sql queries 2020-03-05 18:37:59 +00:00
Meenal Bhave 0dd915228e Merge branch 'fix/SEARCH-2078_FailingTestsInShardedMode' into 'master'
SEARCH-2078 adding solr call to get response for failing test

See merge request search_discovery/insightengine!404
2020-03-05 09:51:42 +00:00
mbhave db8d2bf3c4 Merge branch 'master' of https://git.alfresco.com/search_discovery/insightengine into fix/SEARCH-2078_FailingTestsInShardedMode 2020-03-05 09:50:45 +00:00
Tom Page 169072cf3b Merge branch 'dependabot/maven/search-services/org.alfresco-alfresco-data-model-8.88' into 'master'
Dependabot/maven/search services/org.alfresco alfresco data model 8.88

See merge request search_discovery/insightengine!408
2020-03-04 15:51:35 +00:00
Tom Page f4592b79a7 Merge branch 'master' into 'dependabot/maven/search-services/org.alfresco-alfresco-data-model-8.88'
# Conflicts:
#   search-services/alfresco-solrclient-lib/pom.xml
2020-03-04 15:51:18 +00:00
Andrea Gazzarini 5e2eb7e059 Merge branch 'fix/SEARCH-2108' into 'master'
Fix/search 2108

See merge request search_discovery/insightengine!406
2020-03-04 15:16:42 +00:00
agazzarini 73efb64cfb [ SEARCH-2108 ] Fix, Integration Test and Javadoc 2020-03-04 13:29:13 +01:00
mbhave 20f4713626 Merge branch 'master' of https://git.alfresco.com/search_discovery/insightengine into fix/SEARCH-2078_FailingTestsInShardedMode 2020-03-04 12:06:47 +00:00
mbhave abc8eef3a6 Search-2078: Added new version of TAS Rest API required for fixing the solr-search api port configuration issue 2020-03-04 11:54:39 +00:00
mbhave d92697c71b Search-2078: Added some logging for the failing tests to capture solr response 2020-03-04 11:52:48 +00:00
Tom Page 8b75709e15 Merge branch 'dependabot/maven/search-services/dependency.jackson.version-2.10.3' into 'master'
Dependabot/maven/search services/dependency.jackson.version 2.10.3

See merge request search_discovery/insightengine!405
2020-03-04 09:46:59 +00:00