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.3' into merge/APPS-65_UpdatesToUseACS621

Browse Source
This commit is contained in:
rodicasutu
2020-04-27 09:41:15 +03:00
parent c081b653b7 424550a03c
commit 577d7c29d2
5 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pom.xml
View File

@@ -531,8 +531,8 @@
<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>7.9</alfresco-spring-webscripts.version> <alfresco-spring-webscripts.version>8.2</alfresco-spring-webscripts.version>
<api.explorer.version>6.2.0</api.explorer.version> <api.explorer.version>6.3.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.min.version>0.0</alfresco.min.version> <alfresco.min.version>0.0</alfresco.min.version>
@@ -558,11 +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.9</jackson.version> <jackson.version>2.10.3</jackson.version>
<jackson-databind.version>2.9.10.1</jackson-databind.version> <jackson-databind.version>2.10.1</jackson-databind.version>
<fabric8.docker.version>0.31.0</fabric8.docker.version> <fabric8.docker.version>0.31.0</fabric8.docker.version>
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>
<postgresql.version>42.2.6</postgresql.version> <postgresql.version>42.2.12</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>
@@ -591,7 +591,9 @@
<image.tag>latest</image.tag> <image.tag>latest</image.tag>
<image.registry>quay.io</image.registry> <image.registry>quay.io</image.registry>
<javax-jaxb.version>2.3.0</javax-jaxb.version> <javax-jaxb.version>2.4.0-b180830.0359</javax-jaxb.version>
<javax-jaxb-impl.version>3.0.0-M1</javax-jaxb-impl.version>
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
<apache-compress.version>1.19</apache-compress.version> <apache-compress.version>1.19</apache-compress.version>
</properties> </properties>
@@ -644,7 +646,7 @@
<dependency> <dependency>
<groupId>com.sun.xml.bind</groupId> <groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId> <artifactId>jaxb-impl</artifactId>
<version>${javax-jaxb.version}</version> <version>${javax-jaxb-impl.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

9
rm-community/pom.xml
View File

@@ -73,11 +73,10 @@
</dependencyManagement> </dependencyManagement>
<properties> <properties>
<spring.version>5.1.8.RELEASE</spring.version> <spring.version>5.2.5.RELEASE</spring.version>
<alfresco.version>6.2.1-RC1</alfresco.version>
<alfresco.version>6.2.0-ga</alfresco.version> <alfresco.min.version>6.2.1</alfresco.min.version>
<alfresco.min.version>6.1</alfresco.min.version> <share.version>6.2.1-RC1</share.version>
<share.version>6.2.0</share.version>
<!-- The properties app.amp.* need to be set for share to work. --> <!-- The properties app.amp.* need to be set for share to work. -->
<app.filtering.enabled>true</app.filtering.enabled> <app.filtering.enabled>true</app.filtering.enabled>
</properties> </properties>

4
rm-community/rm-community-repo/.env
View File

@@ -1,5 +1,5 @@
TRANSFORMERS_TAG=2.1.0 TRANSFORMERS_TAG=2.2.0-A5
SOLR6_TAG=1.4.0 SOLR6_TAG=1.4.2-RC3
POSTGRES_TAG=11.4 POSTGRES_TAG=11.4
ACTIVEMQ_TAG=5.15.8 ACTIVEMQ_TAG=5.15.8
LEGACY_TRANSFORM_SERVICE_ENABLED=true LEGACY_TRANSFORM_SERVICE_ENABLED=true

2
rm-community/rm-community-repo/Dockerfile
View File

@@ -1,5 +1,5 @@
### Apply AGS community repo AMP to ACS image ### Apply AGS community repo AMP to ACS image
FROM alfresco/alfresco-content-repository-community:6.2.0-ga FROM alfresco/alfresco-content-repository-community:6.2.1-RC1
# Alfresco user does not have permissions to modify webapps or configuration. Switch to root. # Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
# The access will be fixed after all operations are done. # The access will be fixed after all operations are done.

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

@@ -24,11 +24,11 @@
<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.2.0-ga changes --> <!-- 6.2.1-RC1 changes -->
<dependency.alfresco-core.version>7.22</dependency.alfresco-core.version> <dependency.alfresco-core.version>7.31</dependency.alfresco-core.version>
<dependency.alfresco-repository.version>7.134.1</dependency.alfresco-repository.version> <dependency.alfresco-repository.version>7.171</dependency.alfresco-repository.version>
<dependency.alfresco-remote-api.version>7.107.1</dependency.alfresco-remote-api.version> <dependency.alfresco-remote-api.version>7.125</dependency.alfresco-remote-api.version>
<alfresco.alfresco-share-services.version>6.2.0</alfresco.alfresco-share-services.version> <alfresco.alfresco-share-services.version>6.2.1-RC1</alfresco.alfresco-share-services.version>
<image.name>alfresco/alfresco-governance-repository-community</image.name> <image.name>alfresco/alfresco-governance-repository-community</image.name>
<maven.javadoc.skip>false</maven.javadoc.skip> <maven.javadoc.skip>false</maven.javadoc.skip>