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

Make e2e test a submodule of the main project.

Browse Source 
This cannot be done on some older branches as the java versions are
different, but on master everything is Java 11.

Also fix target version to be Java 11, so that IDEs pick the right
version of Java when running tests.
This commit is contained in:
Tom Page
2019-09-16 09:09:12 +01:00
parent 96ea0b028e
commit d7daf09904
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-test/pom.xml
+6 -20
View File
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-super-pom</artifactId>
<version>10</version>
<artifactId>alfresco-search-and-insight-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>search-analytics-e2e-test</groupId>
<artifactId>search-analytics-e2e-test</artifactId>
@@ -14,30 +14,16 @@
<tas.rest.api.version>6.0.1.2</tas.rest.api.version>
<tas.cmis.api.version>6.0.0.4</tas.cmis.api.version>
<tas.utility.version>3.0.11</tas.utility.version>
<!-- GS V3.1-0 is not compatible with IE, but GS automation Artifacts V3.1-0 have been suggested to be used for GS-IE automation tests
<!-- GS V3.1-0 is not compatible with IE, but GS automation Artifacts V3.1-0 have been suggested to be used for GS-IE automation tests
This version needs to be later updated with IE compatible GS version based on Alfresco 6.1.x -->
<rm.version>3.1.0</rm.version>
<suiteXmlFile>src/test/resources/SearchSuite.xml</suiteXmlFile>
<test.exclude></test.exclude>
<test.include></test.include>
<java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<jackson.databind.version>2.7.7</jackson.databind.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<release>${java.version}</release>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -65,8 +51,8 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.alfresco.tas</groupId>
<dependency>
<groupId>org.alfresco.tas</groupId>
<artifactId>cmis-test</artifactId>
<version>${tas.cmis.api.version}</version>
<scope>test</scope>
@@ -117,7 +103,7 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.10</version>
pom.xml
+3 -1
View File
@@ -24,7 +24,7 @@
<connection>scm:git:https://git.alfresco.com/search_discovery/insightengine.git</connection>
<developerConnection>scm:git:https://git.alfresco.com/search_discovery/insightengine.git</developerConnection>
<url>https://git.alfresco.com/search_discovery/insightengine.git</url>
<tag>1.1.0</tag>
<tag>HEAD</tag>
</scm>
<properties>
<java.version>11</java.version>
@@ -39,6 +39,7 @@
<modules>
<module>search-services</module>
<module>insight-engine</module>
<module>e2e-test</module>
</modules>
<build>
<plugins>
@@ -48,6 +49,7 @@
<version>3.8.1</version>
<configuration>
<release>${java.version}</release>
<target>${java.version}</target>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
</configuration>