From e34a85187961cfd53759ec0ebe3c8df53d5ff047 Mon Sep 17 00:00:00 2001
From: Meenal Bhave <meenal.bhave@alfresco.com>
Date: Thu, 26 Apr 2018 14:48:44 +0100
Subject: [PATCH] Search-813: Updated ASS Version from 1.1.0 to 1.1.1 and
 Removed Solr4 references from the community packaging project

---
 distribution/pom.xml                       | 18 ------------------
 distribution/src/assembly/distribution.xml | 16 ----------------
 docker-compose/.env                        |  2 +-
 docker-compose/test.env                    |  2 +-
 pom.xml                                    |  9 ---------
 5 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 918100654e..62da8ec14f 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -55,18 +55,6 @@
             <classifier>win64</classifier>
             <type>tgz</type>
         </dependency>
-        <!-- SOLR Distribution -->
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-solr4-distribution</artifactId>
-            <type>zip</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <!-- SHARE Distribution -->
         <dependency>
             <groupId>org.alfresco</groupId>
@@ -108,12 +96,6 @@
                                     <includes>alfresco/keystore/**</includes>
                                 </artifactItem>
 
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-solr4-distribution</artifactId>
-                                    <type>zip</type>
-                                    <outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory>
-                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-content-services-share-distribution</artifactId>
diff --git a/distribution/src/assembly/distribution.xml b/distribution/src/assembly/distribution.xml
index e7958fc8e1..e1d5d3da9a 100644
--- a/distribution/src/assembly/distribution.xml
+++ b/distribution/src/assembly/distribution.xml
@@ -32,22 +32,6 @@
             </includes>
         </fileSet>
 
-        <!-- Solr4 Distribution -->
-        <fileSet>
-            <directory>${project.build.directory}/dependency/solr4</directory>
-            <outputDirectory>solr4</outputDirectory>
-            <excludes>
-                <exclude>solr4.war</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/dependency/solr4</directory>
-            <outputDirectory>web-server/webapps</outputDirectory>
-            <includes>
-                <include>solr4.war</include>
-            </includes>
-        </fileSet>
-
         <!-- Share -->
         <fileSet>
             <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory>
diff --git a/docker-compose/.env b/docker-compose/.env
index 2cd025971c..ef8512a36d 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -1,4 +1,4 @@
 ALFRESCO_TAG=6.0.4-ea
 SHARE_TAG=6.0.a
-SOLR6_TAG=1.1.0
+SOLR6_TAG=1.1.1
 POSTGRES_TAG=10.1
diff --git a/docker-compose/test.env b/docker-compose/test.env
index dd08ee4e82..fc78c606f4 100644
--- a/docker-compose/test.env
+++ b/docker-compose/test.env
@@ -1,4 +1,4 @@
 export ALFRESCO_TAG=latest
 export SHARE_TAG=6.0.a
-export SOLR6_TAG=1.1.0
+export SOLR6_TAG=1.1.1
 export POSTGRES_TAG=10.1
diff --git a/pom.xml b/pom.xml
index b4d5cf9bd7..81fa2cd2c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,9 +88,6 @@
         <!-- Alfresco Office Services Module -->
         <alfresco.aos-module.version>1.2.0-RC2</alfresco.aos-module.version>
 
-        <!-- Deprecated SOLR4 app, still packaged for downward compatibility -->
-        <alfresco.solr4.version>6.7</alfresco.solr4.version>
-
         <installer.version.name>${project.version}</installer.version.name>
         <alfresco.package.name>alfresco-community</alfresco.package.name>
         <alfresco.distribution.name>${alfresco.package.name}-distribution</alfresco.distribution.name>
@@ -419,12 +416,6 @@
                 <version>${alfresco.share.version}</version>
                 <type>war</type>
             </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-solr4-distribution</artifactId>
-                <version>${alfresco.solr4.version}</version>
-                <type>zip</type>
-            </dependency>
             <dependency>
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-wcmqs-distribution</artifactId>