From d7aebcdc5da635d74017a6d3b1fe2a4e6dfb24d8 Mon Sep 17 00:00:00 2001
From: Tom Page <thomas.page@alfresco.com>
Date: Mon, 22 Jul 2019 14:49:48 +0100
Subject: [PATCH] SEARCH-1748 Remove older versions of other jackson libs and
 asm.

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

diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml
index 3c0baf4ec..c9676ef96 100644
--- a/search-services/alfresco-solrclient-lib/pom.xml
+++ b/search-services/alfresco-solrclient-lib/pom.xml
@@ -51,6 +51,12 @@
             <version>${dependency.jackson.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${dependency.jackson.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index 2eb72875a..cd5e0dac9 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -124,7 +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>
+                                    <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,**/jackson-dataformat-smile-*.jar,**/asm-3.3.1.jar,**/jackson-core-asl-*.jar,**/jackson-mapper-asl-*.jar</excludes>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -165,6 +165,10 @@
                             <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" />
+                                <delete file="${project.build.directory}/solr-6.6.5-patched/server/solr-webapp/webapp/WEB-INF/lib/jackson-databind-2.5.4.jar" />
+                                <delete file="${project.build.directory}/solr-6.6.5-patched/server/solr-webapp/webapp/WEB-INF/lib/jackson-dataformat-smile-2.5.4.jar" />
+                                <delete file="${project.build.directory}/solr-6.6.5-patched/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-asl-1.9.13.jar" />
+                                <delete file="${project.build.directory}/solr-6.6.5-patched/server/solr-webapp/webapp/WEB-INF/lib/jackson-mapper-asl-1.9.13.jar" />
                             </target>
                         </configuration>
                     </execution>
diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index 0285c4b80..20d35c8a0 100644
--- a/search-services/packaging/src/main/resources/licenses/notice.txt
+++ b/search-services/packaging/src/main/resources/licenses/notice.txt
@@ -16,7 +16,6 @@ wsdl4j-1.6.3.jar        http://sourceforge.net/projects/wsdl4j
 
 
 === BSD 3 ===
-asm-3.3.1.jar   http://code.google.com/p/subethasmtp/
 antlr-runtime-3.5.2.jar http://www.antlr.org/
 ST4-4.0.8.jar   https://www.stringtemplate.org/license.html
 antlr-3.5.2.jar http://www.antlr.org/
@@ -142,10 +141,7 @@ httpmime-4.4.1.jar
 icu4j-56.1.jar
 isoparser-1.1.18.jar
 jackcess-2.1.8.jar
-jackson-core-asl-1.9.13.jar
-jackson-databind-2.5.4.jar
-jackson-dataformat-smile-2.5.4.jar
-jackson-mapper-asl-1.9.13.jar
+jackson-databind-2.9.9.jar
 janino-2.7.6.jar
 java-libpst-0.8.1.jar
 javax.servlet-api-3.1.0.jar