diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml
index 1bffd3a2b..2e37b62de 100644
--- a/search-services/alfresco-search/pom.xml
+++ b/search-services/alfresco-search/pom.xml
@@ -96,6 +96,11 @@
             <version>2.3.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.9</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-core</artifactId>
@@ -146,6 +151,11 @@
             <artifactId>cxf-rt-wsdl</artifactId>
             <version>${cxf.version}</version>
         </dependency>
+        <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+            <version>1.1.4c</version>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>
diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml
index bfd246059..11bd9ea0c 100644
--- a/search-services/alfresco-solrclient-lib/pom.xml
+++ b/search-services/alfresco-solrclient-lib/pom.xml
@@ -22,7 +22,7 @@
     </distributionManagement>
 
     <properties>
-        <dependency.alfresco-data-model.version>8.75</dependency.alfresco-data-model.version>
+        <dependency.alfresco-data-model.version>8.87</dependency.alfresco-data-model.version>
         <dependency.jackson.version>2.10.2</dependency.jackson.version>
     </properties>
 
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index 6292f10b6..b9b378c4b 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -111,7 +111,8 @@
                                     <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,**/dom4j-1.6.1.jar,**/annotations-1.0.0.jar,**/woodstox-core-asl-4.4.1.jar</excludes>
+                                    <excludes>**/jackson-dataformat-smile-*.jar,**/asm-3.3.1.jar,**/jackson-core-asl-*.jar,**/jackson-mapper-asl-*.jar,**/dom4j-1.6.1.jar,
+                                        **/annotations-1.0.0.jar,**/spring-context-support-*.jar,**/spring-web-*.jar,**/woodstox-core-asl-4.4.1.jar</excludes>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index 3ff7a566b..5e61057de 100644
--- a/search-services/packaging/src/main/resources/licenses/notice.txt
+++ b/search-services/packaging/src/main/resources/licenses/notice.txt
@@ -35,7 +35,6 @@ xml-resolver-1.2.jar    https://github.com/FasterXML/jackson
 neethi-3.1.1.jar http://ws.apache.org/commons/neethi/
 commons-logging-1.2.jar http://jakarta.apache.org/commons/
 commons-lang3-3.9.jar http://jakarta.apache.org/commons/
-mybatis-3.3.0.jar       http://www.mybatis.org/
 chemistry-opencmis-commons-impl-1.1.0.jar      http://chemistry.apache.org/
 chemistry-opencmis-commons-api-1.1.0.jar       http://chemistry.apache.org/
 xmlschema-core-2.2.3.jar http://ws.apache.org/commons/XmlSchema/
@@ -50,7 +49,6 @@ cxf-rt-transports-http-3.2.5.jar https://cxf.apache.org/
 cxf-rt-ws-addr-3.2.5.jar https://cxf.apache.org/
 cxf-rt-ws-policy-3.2.5.jar https://cxf.apache.org/
 cxf-rt-wsdl-3.2.5.jar https://cxf.apache.org/
-mybatis-spring-1.2.5.jar        http://www.mybatis.org/
 chemistry-opencmis-server-support-1.0.0.jar     http://chemistry.apache.org/
 chemistry-opencmis-server-bindings-1.0.0.jar    http://chemistry.apache.org/
 quartz-2.3.2.jar http://quartz-scheduler.org/
@@ -58,16 +56,14 @@ jackson-core-2.10.2.jar https://github.com/FasterXML/jackson
 jackson-annotations-2.10.2.jar https://github.com/FasterXML/jackson
 jackson-databind-2.10.2.jar https://github.com/FasterXML/jackson
 commons-httpclient-3.1-HTTPCLIENT-1265.jar      http://jakarta.apache.org/commons/
-spring-aop-5.2.2.RELEASE.jar http://projects.spring.io/spring-framework/
-spring-beans-5.2.2.RELEASE.jar http://projects.spring.io/spring-framework/
-spring-context-5.2.2.RELEASE.jar http://projects.spring.io/spring-framework/
-spring-context-support-5.2.2.RELEASE.jar http://projects.spring.io/spring-framework/
-spring-core-5.2.2.RELEASE.jar http://projects.spring.io/spring-framework/
-spring-expression-5.2.2.RELEASE.jar http://projects.spring.io/spring-framework/
-spring-jdbc-5.2.2.RELEASE.jar http://projects.spring.io/spring-framework/
-spring-orm-5.2.2.RELEASE.jar http://projects.spring.io/spring-framework/
-spring-tx-5.2.2.RELEASE.jar http://projects.spring.io/spring-framework/
-spring-web-5.2.2.RELEASE.jar   http://projects.spring.io/spring-framework/
+spring-aop-5.2.3.RELEASE.jar http://projects.spring.io/spring-framework/
+spring-beans-5.2.3.RELEASE.jar http://projects.spring.io/spring-framework/
+spring-context-5.2.3.RELEASE.jar http://projects.spring.io/spring-framework/
+spring-core-5.2.3.RELEASE.jar http://projects.spring.io/spring-framework/
+spring-expression-5.2.3.RELEASE.jar http://projects.spring.io/spring-framework/
+spring-jdbc-5.2.3.RELEASE.jar http://projects.spring.io/spring-framework/
+spring-orm-5.2.3.RELEASE.jar http://projects.spring.io/spring-framework/
+spring-tx-5.2.3.RELEASE.jar http://projects.spring.io/spring-framework/
 xercesImpl-2.12.0-alfresco-patched-20191004.jar http://xerces.apache.org/xerces2-j
 guessencoding-1.4.jar   http://docs.codehaus.org/display/GUESSENC/
 xml-apis-1.4.01.jar     https://github.com/FasterXML/jackson