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 branch 'feature/RM-7006_UpdateToACS611' into 'master'

Browse Source 
RM-7006 Update to ACS 6.1.1

Closes RM-7006

See merge request records-management/records-management!1272
This commit is contained in:
Rodica Sutu
2019-10-24 07:02:16 +01:00
parent fe5563b322 ebe1d023a1
commit 86d6ba5ce7
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@@ -531,7 +531,7 @@
<alfresco.db.username>alfresco</alfresco.db.username> <alfresco.db.username>alfresco</alfresco.db.username>
<alfresco.groupId>org.alfresco</alfresco.groupId> <alfresco.groupId>org.alfresco</alfresco.groupId>
<alfresco.share.artifactId>share</alfresco.share.artifactId> <alfresco.share.artifactId>share</alfresco.share.artifactId>
<alfresco-spring-webscripts.version>6.20</alfresco-spring-webscripts.version> <alfresco-spring-webscripts.version>7.8</alfresco-spring-webscripts.version>
<api.explorer.version>6.1.0</api.explorer.version> <api.explorer.version>6.1.0</api.explorer.version>
<!-- Set this here and override it in the community and enterprise modules. --> <!-- Set this here and override it in the community and enterprise modules. -->
<alfresco.version>0.0</alfresco.version> <alfresco.version>0.0</alfresco.version>
@@ -558,10 +558,11 @@
<maven.resources.version>3.1.0</maven.resources.version> <maven.resources.version>3.1.0</maven.resources.version>
<maven.tomcat.port>8080</maven.tomcat.port> <maven.tomcat.port>8080</maven.tomcat.port>
<jackson.version>2.9.8</jackson.version> <jackson.version>2.9.9</jackson.version>
<jackson-databind.version>2.9.9.3</jackson-databind.version>
<fabric8.docker.version>0.25.0</fabric8.docker.version> <fabric8.docker.version>0.25.0</fabric8.docker.version>
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>
<postgresql.version>42.2.5</postgresql.version> <postgresql.version>42.2.6</postgresql.version>
<postgresql.port>5432</postgresql.port> <postgresql.port>5432</postgresql.port>
<mysql.version>5.1.40</mysql.version> <mysql.version>5.1.40</mysql.version>
<mysql.port>3306</mysql.port> <mysql.port>3306</mysql.port>

4
rm-community/pom.xml
View File

@@ -57,7 +57,7 @@
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version> <version>${jackson-databind.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.datatype</groupId> <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -73,7 +73,7 @@
</dependencyManagement> </dependencyManagement>
<properties> <properties>
<spring.version>5.1.1.RELEASE</spring.version> <spring.version>5.1.8.RELEASE</spring.version>
<alfresco.version>6.1.2-ga</alfresco.version> <alfresco.version>6.1.2-ga</alfresco.version>
<share.version>6.1.0</share.version> <share.version>6.1.0</share.version>

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

@@ -24,7 +24,7 @@
<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.0 changes --> <!-- 6.1.2-ga changes -->
<dependency.alfresco-core.version>7.5.1</dependency.alfresco-core.version> <dependency.alfresco-core.version>7.5.1</dependency.alfresco-core.version>
<dependency.alfresco-repository.version>7.33.12</dependency.alfresco-repository.version> <dependency.alfresco-repository.version>7.33.12</dependency.alfresco-repository.version>
<dependency.alfresco-remote-api.version>7.34.1</dependency.alfresco-remote-api.version> <dependency.alfresco-remote-api.version>7.34.1</dependency.alfresco-remote-api.version>