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' into merge-3.3/Merge_3.2

Browse Source 
# Conflicts:
#	rm-community/rm-community-repo/pom.xml
This commit is contained in:
Claudia Agache
2020-08-20 16:59:02 +03:00
parent 0a573971fd 03eb035d64
commit 5ef13b81c4
2 changed files with 2 additions and 2 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> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>

2
rm-community/rm-community-repo/pom.xml
View File

@@ -684,4 +684,4 @@
</build> </build>
</profile> </profile>
</profiles> </profiles>
</project> </project>