Merge branch 'feature/RM-6410_UpdatesTo6.0_GA' into 'master'

RM-6410 Update ACS dependencies with the versions from 6.0 GA release

See merge request records-management/records-management!1059
This commit is contained in:
Rodica Sutu
2018-06-28 14:04:03 +01:00
4 changed files with 8 additions and 9 deletions

View File

@@ -398,7 +398,8 @@
<alfresco.db.username>alfresco</alfresco.db.username>
<alfresco.groupId>org.alfresco</alfresco.groupId>
<alfresco.share.artifactId>share</alfresco.share.artifactId>
<alfresco-spring-webscripts.version>6.17</alfresco-spring-webscripts.version>
<alfresco-spring-webscripts.version>6.19</alfresco-spring-webscripts.version>
<api.explorer.version>6.0.7-ga</api.explorer.version>
<!-- Set this here and override it in the community and enterprise modules. -->
<alfresco.version>0.0</alfresco.version>

View File

@@ -76,8 +76,8 @@
<jackson.version>2.9.5</jackson.version>
<spring.version>5.0.4.RELEASE</spring.version>
<alfresco.version>6.0.5-ea</alfresco.version>
<share.version>6.0.0-rc5</share.version>
<alfresco.version>6.0.7-ga</alfresco.version>
<share.version>6.0.b</share.version>
<!-- The properties app.amp.* need to be set for share to work. -->
<app.filtering.enabled>true</app.filtering.enabled>
</properties>

View File

@@ -27,11 +27,10 @@
<skip.integrationtests>true</skip.integrationtests>
<!-- 6.0 changes -->
<api.explorer.version>6.0.4-ea</api.explorer.version>
<dependency.alfresco-core.version>7.3</dependency.alfresco-core.version>
<dependency.alfresco-repository.version>6.51</dependency.alfresco-repository.version>
<dependency.alfresco-remote-api.version>6.35</dependency.alfresco-remote-api.version>
<alfresco.alfresco-share-services.version>6.0.0-rc5</alfresco.alfresco-share-services.version>
<dependency.alfresco-repository.version>6.55</dependency.alfresco-repository.version>
<dependency.alfresco-remote-api.version>6.38</dependency.alfresco-remote-api.version>
<alfresco.alfresco-share-services.version>6.0.b</alfresco.alfresco-share-services.version>
<image.name>alfresco/ags-repo-community</image.name>
</properties>

View File

@@ -11,7 +11,6 @@
</parent>
<properties>
<alfresco.api.explorer.version>6.0.4-ea</alfresco.api.explorer.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -70,7 +69,7 @@
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>api-explorer</artifactId>
<version>${alfresco.api.explorer.version}</version>
<version>${api.explorer.version}</version>
<type>war</type>
</dependency>
</dependencies>