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 'feature/SEARCH-1989_SolrSearchByPropertyTests'

Browse Source 
# Conflicts:
#   e2e-test/pom.xml
This commit is contained in:
Tom Page
2019-12-03 08:23:07 +00:00
parent 0bf031ffe4 590f7d317c
commit 5e49fd2abb
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-test/pom.xml
+3 -3
View File
@@ -11,9 +11,9 @@
<name>Search Analytics E2E Tests</name>
<description>Test Project to test Search Service and Analytics Features on a complete setup of Alfresco, Share</description>
<properties>
<tas.rest.api.version>1.15</tas.rest.api.version>
<tas.cmis.api.version>1.9</tas.cmis.api.version>
<tas.utility.version>3.0.14</tas.utility.version>
<tas.rest.api.version>1.17</tas.rest.api.version>
<tas.cmis.api.version>1.10</tas.cmis.api.version>
<tas.utility.version>3.0.15</tas.utility.version>
<rm.version>3.2.0</rm.version>
<suiteXmlFile>src/test/resources/SearchSuite.xml</suiteXmlFile>
<test.exclude></test.exclude>
search-services/alfresco-search/pom.xml
+1 -1
View File
@@ -158,7 +158,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<scope>test</scope>
</dependency>
search-services/alfresco-solrclient-lib/pom.xml
+1 -1
View File
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<scope>test</scope>
</dependency>
<dependency>