Merge branch 'master' into 'dependabot/maven/search-services/org.alfresco-alfresco-data-model-8.75'

# Conflicts:
#   search-services/alfresco-solrclient-lib/pom.xml
This commit is contained in:
Tom Page
2020-01-07 09:36:55 +00:00
2 changed files with 4 additions and 4 deletions
@@ -23,7 +23,7 @@
<properties>
<dependency.alfresco-data-model.version>8.75</dependency.alfresco-data-model.version>
<dependency.jackson.version>2.10.1</dependency.jackson.version>
<dependency.jackson.version>2.10.2</dependency.jackson.version>
</properties>
<dependencies>
@@ -54,9 +54,9 @@ 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/
jackson-core-2.10.1.jar https://github.com/FasterXML/jackson
jackson-annotations-2.10.1.jar https://github.com/FasterXML/jackson
jackson-databind-2.10.1.jar https://github.com/FasterXML/jackson
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/