diff --git a/pom.xml b/pom.xml
index 36413fd4a..0a709b92c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,15 @@
       <url>https://git.alfresco.com/search_discovery/insightengine.git</url>
       <tag>HEAD</tag>
    </scm>
+   <properties>
+      <solr.base.version>6.6.5</solr.base.version>
+      <solr.version>${solr.base.version}-patched</solr.version>
+      <!-- The location to download the solr zip file from. -->
+      <!-- <solr.zip>https://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.zip</solr.zip> -->
+      <!-- Solr startup scripts do not work with any Java version higher than 9 so the scripts have been patched -->
+      <solr.zip>https://artifacts.alfresco.com/nexus/content/repositories/public/org/apache/solr/solr/solr-${solr.version}/solr-solr-${solr.version}.zip</solr.zip>
+      <solr.directory>${project.build.directory}/solr-${solr.version}</solr.directory>
+   </properties>
    <modules>
       <module>search-services</module>
       <module>insight-engine</module>
diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml
index 277fd5af2..8a3ebe32a 100644
--- a/search-services/alfresco-search/pom.xml
+++ b/search-services/alfresco-search/pom.xml
@@ -249,17 +249,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
 
 			<plugin>
 				<groupId>org.jacoco</groupId>
diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml
index 3f17d8591..d71f9450e 100644
--- a/search-services/alfresco-solrclient-lib/pom.xml
+++ b/search-services/alfresco-solrclient-lib/pom.xml
@@ -45,6 +45,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 293e6d488..c7860871a 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>**/jackson-dataformat-smile-*.jar,**/asm-3.3.1.jar,**/jackson-core-asl-*.jar,**/jackson-mapper-asl-*.jar</excludes>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -151,9 +152,27 @@
                 </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" />
+                                <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>
+                    <!-- Set the default solr home directory to solrhome -->
                     <execution>
                         <phase>prepare-package</phase>
                         <configuration>
diff --git a/search-services/packaging/src/main/resources/README.MD b/search-services/packaging/src/main/resources/README.MD
index a49795840..9e8b95e6d 100644
--- a/search-services/packaging/src/main/resources/README.MD
+++ b/search-services/packaging/src/main/resources/README.MD
@@ -1,6 +1,6 @@
 ## Alfresco Search Services
 
-Alfresco Search Services ${project.version} using Apache Solr ${solr.version}
+Alfresco Search Services ${project.version} using Apache Solr ${solr.base.version}
 
 Find out more about Solr 6 and how to be installed at:
 
diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index 8860b0e06..1c2d24860 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/
@@ -57,6 +56,7 @@ chemistry-opencmis-server-bindings-1.0.0.jar    http://chemistry.apache.org/
 quartz-2.3.1.jar http://quartz-scheduler.org/
 jackson-core-2.10.0.pr1.jar https://github.com/FasterXML/jackson
 jackson-annotations-2.10.0.pr1.jar https://github.com/FasterXML/jackson
+jackson-databind-2.10.0.pr1.jar https://github.com/FasterXML/jackson
 commons-httpclient-3.1-HTTPCLIENT-1265.jar      http://jakarta.apache.org/commons/
 spring-aop-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/
 spring-beans-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/
@@ -142,12 +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
-jackson-mapper-asl-1.9.13.jar
 janino-2.7.6.jar
 java-libpst-0.8.1.jar
 javax.servlet-api-3.1.0.jar
@@ -175,45 +169,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-icu-6.6.5-patched.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-morfologik-6.6.5-patched.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-analyzers-smartcn-6.6.5-patched.jar
+lucene-analyzers-stempel-6.6.5-patched.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
@@ -237,13 +213,11 @@ rome-1.5.1.jar
 simple-xml-2.7.1.jar
 slf4j-api-1.7.7.jar
 slf4j-log4j12-1.7.7.jar
-solr-analysis-extras-6.6.5.jar
-solr-clustering-6.6.5.jar
+solr-analysis-extras-6.6.5-patched.jar
+solr-clustering-6.6.5-patched.jar
 solr-core-6.6.5-patched.jar
-solr-core-6.6.5.jar
-solr-langid-6.6.5.jar
+solr-langid-6.6.5-patched.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
diff --git a/search-services/pom.xml b/search-services/pom.xml
index 956e451bc..561d83277 100644
--- a/search-services/pom.xml
+++ b/search-services/pom.xml
@@ -13,14 +13,6 @@
     <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Solr Search parent</name>
-    <properties>
-        <solr.version>6.6.5</solr.version>
-        <!-- The location to download the solr zip file from. -->
-        <!-- <solr.zip>https://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.zip</solr.zip> -->
-        <!-- Solr startup scripts do not work with any Java version higher than 9 so the scripts have been patched -->
-        <solr.zip>https://artifacts.alfresco.com/nexus/content/repositories/public/org/apache/solr/solr/solr-${solr.version}-patched/solr-solr-${solr.version}-patched.zip</solr.zip>
-        <solr.directory>${project.build.directory}/solr-${solr.version}-patched</solr.directory>
-    </properties>
     <modules>
         <module>alfresco-solrclient-lib</module>
         <module>alfresco-search</module>