inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/release/V3.2.0.x' into release/V3.2

Browse Source 
# Conflicts:
#	pom.xml
#	rm-automation/pom.xml
#	rm-automation/rm-automation-community-rest-api/pom.xml
#	rm-automation/rm-automation-enterprise-rest-api/pom.xml
#	rm-automation/rm-automation-ui/pom.xml
#	rm-benchmark/pom.xml
#	rm-community/pom.xml
#	rm-community/rm-community-repo/pom.xml
#	rm-community/rm-community-rest-api-explorer/pom.xml
#	rm-community/rm-community-share/pom.xml
#	rm-enterprise/pom.xml
#	rm-enterprise/rm-enterprise-repo/pom.xml
#	rm-enterprise/rm-enterprise-rest-api-explorer/pom.xml
#	rm-enterprise/rm-enterprise-share/pom.xml
This commit is contained in:
Claudia Agache
2020-08-20 14:32:09 +03:00
parent 2d4a094103 e877061e6f
commit 03eb035d64
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-automation/rm-automation-community-rest-api/pom.xml
View File

@@ -73,7 +73,7 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
</exclusions>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>