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> <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>

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

@@ -24,10 +24,10 @@
<alfresco.repo.artifactId>alfresco-platform</alfresco.repo.artifactId> <alfresco.repo.artifactId>alfresco-platform</alfresco.repo.artifactId>
<alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version> <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
<ags.artifactId>alfresco-governance-services-community-repo</ags.artifactId> <ags.artifactId>alfresco-governance-services-community-repo</ags.artifactId>
<!-- 6.1.1 changes --> <!-- 6.1.2-ga changes -->
<dependency.alfresco-core.version>7.4</dependency.alfresco-core.version> <dependency.alfresco-core.version>7.5.1</dependency.alfresco-core.version>
<dependency.alfresco-repository.version>7.22</dependency.alfresco-repository.version> <dependency.alfresco-repository.version>7.33.12</dependency.alfresco-repository.version>
<dependency.alfresco-remote-api.version>7.7</dependency.alfresco-remote-api.version> <dependency.alfresco-remote-api.version>7.34.1</dependency.alfresco-remote-api.version>
<alfresco.alfresco-share-services.version>6.1.0</alfresco.alfresco-share-services.version> <alfresco.alfresco-share-services.version>6.1.0</alfresco.alfresco-share-services.version>
<image.name>alfresco/alfresco-governance-repository-community</image.name> <image.name>alfresco/alfresco-governance-repository-community</image.name>
@@ -684,4 +684,4 @@
</build> </build>
</profile> </profile>
</profiles> </profiles>
</project> </project>