From b2bf05643e2d651212912b6fb83956f3ef7b8015 Mon Sep 17 00:00:00 2001
From: Tom Page <thomas.page@alfresco.com>
Date: Mon, 15 Jul 2019 15:00:59 +0100
Subject: [PATCH] SEARCH-1748 Remove duplicate jars from deployment.

---
 .../alfresco-solrclient-lib/pom.xml           |  6 +++++
 search-services/packaging/pom.xml             | 17 +++++++++++++-
 .../src/main/resources/licenses/notice.txt    | 22 -------------------
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml
index f3975e2f8..3c0baf4ec 100644
--- a/search-services/alfresco-solrclient-lib/pom.xml
+++ b/search-services/alfresco-solrclient-lib/pom.xml
@@ -31,6 +31,12 @@
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-data-model</artifactId>
             <version>${dependency.alfresco-data-model.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>asm-parent</artifactId>
+                    <groupId>asm</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         
         <dependency>
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index d8ddf0ae7..2eb72875a 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -124,6 +124,7 @@
                                     <version>${project.version}</version>
                                     <classifier>libs</classifier>
                                     <outputDirectory>${project.build.directory}/solr-libs</outputDirectory>
+                                    <excludes>**/lucene-analyzers-common-*.jar,**/lucene-analyzers-kuromoji-*.jar,**/lucene-analyzers-phonetic-*.jar,**/lucene-backward-codecs-*.jar,**/lucene-classification-*.jar,**/lucene-codecs-*.jar,**/lucene-core-*.jar,**/lucene-expressions-*.jar,**/lucene-grouping-*.jar,**/lucene-highlighter-*jar,**/lucene-join-*.jar,**/lucene-memory-*.jar,**/lucene-misc-*.jar,**/lucene-queries-*.jar,**/lucene-queryparser-*.jar,**/lucene-sandbox-*.jar,**/lucene-spatial-extras-*.jar,**/lucene-suggest-*.jar,**/solr-core-*.jar,**/solr-solrj-*.jar</excludes>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -151,9 +152,23 @@
                 </executions>
             </plugin>
             <plugin>
-                <!-- Set the default solr home directory to solrhome -->
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
+                    <!-- Delete older versions of jars that have been overridden by us. -->
+                    <execution>
+                        <id>delete-duplicate-jars</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <delete file="${project.build.directory}/solr-6.6.5-patched/server/solr-webapp/webapp/WEB-INF/lib/jackson-annotations-2.5.4.jar" />
+                                <delete file="${project.build.directory}/solr-6.6.5-patched/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-2.5.4.jar" />
+                            </target>
+                        </configuration>
+                    </execution>
+                    <!-- Set the default solr home directory to solrhome -->
                     <execution>
                         <phase>prepare-package</phase>
                         <configuration>
diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index d4c641c1e..0285c4b80 100644
--- a/search-services/packaging/src/main/resources/licenses/notice.txt
+++ b/search-services/packaging/src/main/resources/licenses/notice.txt
@@ -142,8 +142,6 @@ httpmime-4.4.1.jar
 icu4j-56.1.jar
 isoparser-1.1.18.jar
 jackcess-2.1.8.jar
-jackson-annotations-2.5.4.jar
-jackson-core-2.5.4.jar
 jackson-core-asl-1.9.13.jar
 jackson-databind-2.5.4.jar
 jackson-dataformat-smile-2.5.4.jar
@@ -175,45 +173,27 @@ juniversalchardet-1.0.3.jar
 langdetect-1.1-20120112.jar
 log4j-1.2.17.jar
 lucene-analyzers-common-6.6.5-patched.jar
-lucene-analyzers-common-6.6.5.jar
 lucene-analyzers-icu-6.6.5.jar
 lucene-analyzers-kuromoji-6.6.5-patched.jar
-lucene-analyzers-kuromoji-6.6.5.jar
 lucene-analyzers-morfologik-6.6.5.jar
 lucene-analyzers-phonetic-6.6.5-patched.jar
-lucene-analyzers-phonetic-6.6.5.jar
 lucene-analyzers-smartcn-6.6.5.jar
 lucene-analyzers-stempel-6.6.5.jar
 lucene-backward-codecs-6.6.5-patched.jar
-lucene-backward-codecs-6.6.5.jar
 lucene-classification-6.6.5-patched.jar
-lucene-classification-6.6.5.jar
 lucene-codecs-6.6.5-patched.jar
-lucene-codecs-6.6.5.jar
 lucene-core-6.6.5-patched.jar
-lucene-core-6.6.5.jar
 lucene-expressions-6.6.5-patched.jar
-lucene-expressions-6.6.5.jar
 lucene-grouping-6.6.5-patched.jar
-lucene-grouping-6.6.5.jar
 lucene-highlighter-6.6.5-patched.jar
-lucene-highlighter-6.6.5.jar
 lucene-join-6.6.5-patched.jar
-lucene-join-6.6.5.jar
 lucene-memory-6.6.5-patched.jar
-lucene-memory-6.6.5.jar
 lucene-misc-6.6.5-patched.jar
-lucene-misc-6.6.5.jar
 lucene-queries-6.6.5-patched.jar
-lucene-queries-6.6.5.jar
 lucene-queryparser-6.6.5-patched.jar
-lucene-queryparser-6.6.5.jar
 lucene-sandbox-6.6.5-patched.jar
-lucene-sandbox-6.6.5.jar
 lucene-spatial-extras-6.6.5-patched.jar
-lucene-spatial-extras-6.6.5.jar
 lucene-suggest-6.6.5-patched.jar
-lucene-suggest-6.6.5.jar
 metadata-extractor-2.9.1.jar
 metrics-core-3.2.2.jar
 metrics-ganglia-3.2.2.jar
@@ -240,10 +220,8 @@ slf4j-log4j12-1.7.7.jar
 solr-analysis-extras-6.6.5.jar
 solr-clustering-6.6.5.jar
 solr-core-6.6.5-patched.jar
-solr-core-6.6.5.jar
 solr-langid-6.6.5.jar
 solr-solrj-6.6.5-patched.jar
-solr-solrj-6.6.5.jar
 spatial4j-0.6.jar
 start.jar
 stax2-api-3.1.4.jar