Merge history of SearchServices 1.4.0-IE1.2-1 and InsightEngine master.

Also updating SearchServices version to 1.4.0-IE1.2.0-SNAPSHOT.
This commit is contained in:
Tom Page
2019-05-22 08:30:32 +01:00
parent 4f9d4d216c
commit 39f3f5fbcb
5 changed files with 24 additions and 7 deletions

17
pom.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-super-pom</artifactId>
<version>10</version>
</parent>
<artifactId>alfresco-search-and-insight-parent</artifactId>
<version>1.4.0-IE1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Alfresco Search And Insight Parent</name>
<modules>
<module>search-services</module>
<module>insight-engine</module>
</modules>
</project>

View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-search-parent</artifactId> <artifactId>alfresco-search-parent</artifactId>
<version>1.4.0-IE1.2-1</version> <version>1.4.0-IE1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@@ -15,7 +15,7 @@
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-solrclient-lib</artifactId> <artifactId>alfresco-solrclient-lib</artifactId>
<version>1.4.0-IE1.2-1</version> <version>1.4.0-IE1.2.0-SNAPSHOT</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>

View File

@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-search-parent</artifactId> <artifactId>alfresco-search-parent</artifactId>
<version>1.4.0-IE1.2-1</version> <version>1.4.0-IE1.2.0-SNAPSHOT</version>
</parent> </parent>
<distributionManagement> <distributionManagement>

View File

@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-search-parent</artifactId> <artifactId>alfresco-search-parent</artifactId>
<version>1.4.0-IE1.2-1</version> <version>1.4.0-IE1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<dependencies> <dependencies>

View File

@@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-super-pom</artifactId> <artifactId>alfresco-search-and-insight-parent</artifactId>
<version>10</version> <version>1.4.0-IE1.2.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>alfresco-search-parent</artifactId> <artifactId>alfresco-search-parent</artifactId>
<version>1.4.0-IE1.2-1</version> <version>1.4.0-IE1.2.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Alfresco Solr Search parent</name> <name>Alfresco Solr Search parent</name>
<properties> <properties>