inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'dependabot/maven/search-services/org.alfresco-alfresco-data-model-8.50'

Browse Source 
# Conflicts:
#   search-services/alfresco-solrclient-lib/pom.xml
This commit is contained in:
Tom Page
2019-09-20 12:07:15 +01:00
parent 0ea9915926 a487a70fa9
commit d860da7df6
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ExplicitRoutingTest.java
+1 -1
View File
@@ -20,7 +20,7 @@ public class ExplicitRoutingTest extends AbstractE2EFunctionalTest {
* Checks indexing still works after sharding model used for explicit routing has been disabled
* @throws Exception
*/
@Test(priority = 1, groups = {TestGroup.NOT_BAMBOO, TestGroup.EXPLICIT_SHARDING })
@Test(priority = 1, groups = {TestGroup.NOT_BAMBOO, TestGroup.EXPLICIT_SHARDING, TestGroup.ACS_62n})
public void testIndexingStillWorkingAfterShardModelIsDeactivated() throws Exception
{
e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchHighLightTest.java
+4 -3
View File
@@ -109,9 +109,10 @@ public class SearchHighLightTest extends AbstractSearchServicesE2ETest
nodes.getEntries().stream()
.map(SearchNodeModel::getModel)
.map(SearchNodeModel::getSearch)
.map(SearchScoreModel::getHighlight).forEach(( hl ->
assertEquals(expectedHighlight, hl.get(0).getSnippets().get(0))
)
.map(SearchScoreModel::getHighlight).forEach(( hl -> {
assertEquals(1, hl.size());
assertEquals(expectedHighlight, hl.get(0).getSnippets().get(0));
})
);
}
search-services/alfresco-solrclient-lib/pom.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<properties>
<dependency.alfresco-data-model.version>8.50</dependency.alfresco-data-model.version>
<dependency.jackson.version>2.10.0.pr2</dependency.jackson.version>
<dependency.jackson.version>2.10.0.pr3</dependency.jackson.version>
</properties>
<dependencies>
search-services/packaging/src/main/resources/licenses/notice.txt
+3 -3
View File
@@ -54,9 +54,9 @@ mybatis-spring-1.2.5.jar http://www.mybatis.org/
chemistry-opencmis-server-support-1.0.0.jar http://chemistry.apache.org/
chemistry-opencmis-server-bindings-1.0.0.jar http://chemistry.apache.org/
quartz-2.3.1.jar http://quartz-scheduler.org/
jackson-core-2.10.0.pr2.jar https://github.com/FasterXML/jackson
jackson-annotations-2.10.0.pr2.jar https://github.com/FasterXML/jackson
jackson-databind-2.10.0.pr2.jar https://github.com/FasterXML/jackson
jackson-core-2.10.0.pr3.jar https://github.com/FasterXML/jackson
jackson-annotations-2.10.0.pr3.jar https://github.com/FasterXML/jackson
jackson-databind-2.10.0.pr3.jar https://github.com/FasterXML/jackson
commons-httpclient-3.1-HTTPCLIENT-1265.jar http://jakarta.apache.org/commons/
spring-aop-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/
spring-beans-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/