changes to address code review comments

rm-community/rm-community-repo/Dockerfile

@@ -18,11 +18,10 @@ RUN mkdir /usr/local/tomcat/webapps/gs-api-explorer && cd /usr/local/tomcat/weba
     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 Alfresco /usr/local/tomcat/webapps && \
+RUN chgrp -R Alfresco /usr/local/tomcat && \
     find /usr/local/tomcat/webapps -type d -exec chmod 0750 {} \; && \
     find /usr/local/tomcat/webapps -type f -exec chmod 0640 {} \; && \
-    chmod -R g+r /usr/local/tomcat/webapps && \
-    chgrp -R Alfresco /usr/local/tomcat
+    chmod -R g+r /usr/local/tomcat/webapps
 
 # Switching back to alfresco user after having added amps files to run the container as non-root
 USER alfresco

rm-community/rm-community-repo/docker-compose.yml

@@ -22,7 +22,9 @@ services:
                 -Dindex.subsystem.name=solr6
                 -Dalfresco.restApi.basicAuthScheme=true
                 -Dimap.server.enabled=true
+                -Dimap.server.port=1143
                 -Dftp.enabled=true
+                -Dftp.port=1221
                 -Dftp.dataPortFrom=30000
                 -Dftp.dataPortTo=30099
                 -Dshare.host=localhost
@@ -42,17 +44,12 @@ services:
                 -Dimg.url=http://imagemagick:8090/
                 -Dtika.url=http://tika:8090/
                 -Dtransform.misc.url=http://transform-misc:8090/
-
-                -Dimap.server.port=1143
-                -Dftp.port=1221
-                -Dcors.enabled=true
-                -Dcors.allowed.origins=http://localhost:4200
                 "
         ports:
             - 8080:8080
             - 8000:8000
-            - 143:1143
-            - "21:21"
+            - 1143:1143
+            - "21:1221"
             - "30000-30099:30000-30099"
 
     alfresco-pdf-renderer:

rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/DeclareAsRecordVersionTest.java

@@ -36,7 +36,6 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionService;
 import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionServiceImpl;
 import org.alfresco.repo.version.VersionModel;
-import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.version.Version;
 import org.alfresco.service.cmr.version.VersionType;