From 18ea7464912705dfa9cb8b478c1c918b56cf69a8 Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Tue, 26 Nov 2019 08:50:32 +0200
Subject: [PATCH] update community dependencies to ones from ACS 6.2.0.ea

---
 pom.xml                                   |  4 ++--
 rm-community/pom.xml                      |  4 ++--
 rm-community/rm-community-repo/Dockerfile | 23 +++++++++++++++++++++--
 rm-community/rm-community-repo/pom.xml    | 10 +++++-----
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index b98b2ad3af..7bc176b4d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -531,7 +531,7 @@
       <alfresco.db.username>alfresco</alfresco.db.username>
       <alfresco.groupId>org.alfresco</alfresco.groupId>
       <alfresco.share.artifactId>share</alfresco.share.artifactId>
-      <alfresco-spring-webscripts.version>7.8</alfresco-spring-webscripts.version>
+      <alfresco-spring-webscripts.version>7.9</alfresco-spring-webscripts.version>
       <api.explorer.version>6.1.0</api.explorer.version>
       <!-- Set this here and override it in the community and enterprise modules. -->
       <alfresco.version>0.0</alfresco.version>
@@ -559,7 +559,7 @@
       <maven.tomcat.port>8080</maven.tomcat.port>
 
       <jackson.version>2.9.9</jackson.version>
-      <jackson-databind.version>2.9.9.3</jackson-databind.version>
+      <jackson-databind.version>2.9.10</jackson-databind.version>
       <fabric8.docker.version>0.31.0</fabric8.docker.version>
       <mockito.version>1.10.19</mockito.version>
       <postgresql.version>42.2.6</postgresql.version>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index 305784b1cf..029a3b9d72 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -75,8 +75,8 @@
    <properties>
       <spring.version>5.1.8.RELEASE</spring.version>
 
-      <alfresco.version>6.1.2-ga</alfresco.version>
-      <share.version>6.1.0</share.version>
+      <alfresco.version>6.2.0-ea</alfresco.version>
+      <share.version>6.2.0-RC4</share.version>
       <!-- The properties app.amp.* need to be set for share to work. -->
       <app.filtering.enabled>true</app.filtering.enabled>
    </properties>
diff --git a/rm-community/rm-community-repo/Dockerfile b/rm-community/rm-community-repo/Dockerfile
index 37cb97c1bc..6f5ffe3d85 100644
--- a/rm-community/rm-community-repo/Dockerfile
+++ b/rm-community/rm-community-repo/Dockerfile
@@ -1,4 +1,13 @@
-FROM alfresco/alfresco-content-repository-community:6.1.2-ga
+FROM alfresco/alfresco-content-repository-community:6.2.0-ea
+
+# Default user and group are used to setup permissions for Tomcat process, see parent Dockerfile: Alfresco/acs-community-packaging/docker-alfresco/Dockerfile
+ARG GROUPNAME=Alfresco
+ARG USERNAME=alfresco
+ARG TOMCAT_DIR=/usr/local/tomcat
+
+# Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
+# The access will be fixed after all operations are done.
+USER root
 
 COPY target/alfresco-governance-services-community-repo-*.amp /usr/local/tomcat/amps/
 
@@ -10,4 +19,14 @@ COPY target/gs-api-explorer-*.war /usr/local/tomcat/webapps/
 
 ### Unpack gs-api-explorer.war
 RUN mkdir /usr/local/tomcat/webapps/gs-api-explorer && cd /usr/local/tomcat/webapps/gs-api-explorer && \
-    jar -xvf /usr/local/tomcat/webapps/gs-api-explorer-*.war && rm -f /usr/local/tomcat/webapps/gs-api-explorer-*.war
\ No newline at end of file
+    jar -xvf /usr/local/tomcat/webapps/gs-api-explorer-*.war && rm -f /usr/local/tomcat/webapps/gs-api-explorer-*.war
+
+# All files in the tomcat folder must be owned by root user and Alfresco group as mentioned in the parent Dockerfile
+RUN chgrp -R ${GROUPNAME} ${TOMCAT_DIR}/webapps && \
+    find ${TOMCAT_DIR}/webapps -type d -exec chmod 0750 {} \; && \
+    find ${TOMCAT_DIR}/webapps -type f -exec chmod 0640 {} \; && \
+    chmod -R g+r ${TOMCAT_DIR}/webapps && \
+    chgrp -R ${GROUPNAME} ${TOMCAT_DIR}
+
+# Switching back to alfresco user after having added amps files to run the container as non-root
+USER alfresco
\ No newline at end of file
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 5968476b59..a3df80f420 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -24,11 +24,11 @@
       <alfresco.repo.artifactId>alfresco-platform</alfresco.repo.artifactId>
       <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
       <ags.artifactId>alfresco-governance-services-community-repo</ags.artifactId>
-      <!-- 6.1.2-ga changes -->
-      <dependency.alfresco-core.version>7.5.1</dependency.alfresco-core.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>
-      <alfresco.alfresco-share-services.version>6.1.0</alfresco.alfresco-share-services.version>
+      <!-- 6.2.0-ea changes -->
+      <dependency.alfresco-core.version>7.22</dependency.alfresco-core.version>
+      <dependency.alfresco-repository.version>7.131</dependency.alfresco-repository.version>
+      <dependency.alfresco-remote-api.version>7.101</dependency.alfresco-remote-api.version>
+      <alfresco.alfresco-share-services.version>6.2.0-RC4</alfresco.alfresco-share-services.version>
       <image.name>alfresco/alfresco-governance-repository-community</image.name>
 
       <maven.javadoc.skip>false</maven.javadoc.skip>