Bring master up to the same state as develop and [release] 6.2.1-A8

There were minor changes required in addition to the following cherry picks. Most notably changes from 0b0ae21a37 on the 21/04/2020 and the addition of the scripts/travis directory.

[maven-release-plugin][skip ci]prepare release acs-community-packaging-6.2.1-A7

(cherry picked from commit 9a6769cf85)
[maven-release-plugin][skip ci]prepare for next development iteration

(cherry picked from commit 8ccf987875)
Pick up Share 6.2.1 and get ready for 6.2.1-A8

(cherry picked from commit b6ab0471ba)

.gitignore

@@ -36,3 +36,6 @@ alf_data/
 helm/alfresco-content-services-community/charts/*
 helm/alfresco-content-services-community/requirements.lock
 helm/alfresco-content-services-community*.tgz
+
+# Travis deployment folder 
+deploy_dir

.travis.settings.xml

@@ -0,0 +1,49 @@
+<settings>
+    <profiles>
+        <profile>
+            <id>alfresco-internal</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <repositories>
+                <repository>
+                    <id>alfresco-internal</id>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                    <name>Alfresco Internal Repository</name>
+                    <url>https://artifacts.alfresco.com/nexus/content/groups/internal</url>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>alfresco-internal</id>
+                    <name>Alfresco Internal Repository</name>
+                    <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+
+
+    <servers>
+        <server>
+            <id>alfresco-internal</id>
+            <username>${env.MAVEN_USERNAME}</username>
+            <password>${env.MAVEN_PASSWORD}</password>
+        </server>
+        <server>
+            <id>quay.io</id>
+            <username>${env.QUAY_USERNAME}</username>
+            <password>${env.QUAY_PASSWORD}</password>
+        </server>
+        <server>
+            <id>docker.io</id>
+            <username>${env.DOCKERHUB_USERNAME}</username>
+            <password>${env.DOCKERHUB_PASSWORD}</password>
+        </server>
+    </servers>
+</settings>

.travis.yml

@@ -1,5 +1,5 @@
 dist: xenial
-sudo: required
+os: linux
 language: java
 jdk:
   - openjdk11
@@ -10,26 +10,40 @@ services:
 cache:
   directories:
     - $HOME/.m2
-
+# the cache can grow constantly
+before_cache:
+  - rm -rf $HOME/.m2/repository/org/alfresco/acs-community-packaging
 env:
   global:
     - VERSION_EDITION=Community
-
+    # Must be in the format <alfresco-version>-<additional_versioning> ie. 6.3.0-repo-xxxx-x or 6.3.0-Ax
+    - RELEASE_VERSION=6.2.1-A8
+    - DEVELOPMENT_VERSION=6.2.1.1-SNAPSHOT
+    - COMM_RELEASE_VERSION=
 branches:
   only:
     - master
     - develop
 
-matrix:
+stages:
+  - name: test
+    if: commit_message !~ /\[skip tests\]/
+  - release
+  - publish
+
+before_install: "cp .travis.settings.xml $HOME/.m2/settings.xml"
+
+jobs:
   include:
-    - name: "WhiteSource scan"
+    - stage: test
+      name: "WhiteSource scan"
       # only on develop and if it is not a PR
       if: fork = false AND branch = develop AND type != pull_request
       install:
         - travis_retry travis_wait 30 mvn -q install "-Dversion.edition=${VERSION_EDITION}" -f war/pom.xml
       script:
         # Download the latest version of WhiteSource Unified Agent
-        - curl -LJO https://github.com/whitesource/unified-agent-distribution/raw/master/standAlone/wss-unified-agent.jar
+        - curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar
         # Run WhiteSource Unified Agent
         - java -jar wss-unified-agent.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config -d ./war
     - name: "REST API TAS tests part1"
@@ -88,3 +102,43 @@ matrix:
         - ./tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
       script:
         - travis_wait 30 mvn install -q -f tests/tas-integration/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+    - stage: Release
+      name: "Maven release"
+      if: commit_message ~= /\[release\]/ AND fork = false AND branch =~ ^(master|develop)$ AND type != pull_request 
+      install: travis_retry travis_wait 40 mvn clean install -DskipTests=true "-Dversion.edition=${VERSION_EDITION}" -Dmaven.javadoc.skip=true -B -V
+      # Fail the job if there is a docker image tag that matches the RELEASE_VERSION (or project version in the POM if not set)
+      before_script: ./scripts/travis/verify_release_tag.sh 
+      script: travis_wait 40 ./scripts/travis/maven_release.sh ${RELEASE_VERSION} ${DEVELOPMENT_VERSION}
+      # Copy alfresco.war and the distribution zip to deploy_dir
+      before_deploy: 
+         # Move the final artifacts to a single folder (deploy_dir) to be copied to S3
+        - mkdir -p deploy_dir
+        - cp war/target/alfresco.war deploy_dir
+        - cp distribution/target/*-distribution*.zip deploy_dir
+      deploy:
+      - provider: s3
+        access_key_id: ${AWS_STAGING_ACCESS_KEY}
+        secret_access_key: ${AWS_STAGING_SECRET_KEY}
+        bucket: "alfresco-artefacts-staging"
+        region: "eu-west-1"
+        skip_cleanup: true
+        acl: private
+        local_dir: deploy_dir
+        upload_dir: "alfresco-content-services-community/release/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER}"
+        on: 
+          all_branches: true
+          condition: $TRAVIS_BRANCH =~ ^(master|develop)$
+    - stage: "Publish"
+      name: "Copy to S3 Release"
+      if: commit_message ~= /\[publish\]/ AND fork = false AND branch = master AND type != pull_request 
+      # Nothing to build/install as we are just copying from S3 buckets
+      install: skip 
+      script: skip
+      before_deploy: pip install awscli
+      deploy:
+        - provider: script
+          script:  ./scripts/travis/copy_to_release_bucket.sh ${TRAVIS_BUILD_NUMBER} ${TRAVIS_BRANCH}
+          on:
+            branch: master
+            
+      

distribution/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

docker-alfresco/.dockerignore

@@ -1 +0,0 @@
-test

docker-alfresco/Dockerfile

@@ -5,7 +5,7 @@ FROM alfresco/alfresco-base-tomcat:8.5.43-java-11-openjdk-centos-7
 # Set default user information
 ARG GROUPNAME=Alfresco
 ARG GROUPID=1000
-ARG USERNAME=alfresco
+ARG IMAGEUSERNAME=alfresco
 ARG USERID=33000
 
 # Set default environment args
@@ -73,7 +73,7 @@ RUN yum install -y fontconfig-2.13.0-4.3.el7 \
 RUN mkdir -p ${TOMCAT_DIR}/conf/Catalina/localhost && \
     mkdir -p ${TOMCAT_DIR}/alf_data && \
     groupadd -g ${GROUPID} ${GROUPNAME} && \
-    useradd -u ${USERID} -G ${GROUPNAME} ${USERNAME} && \
+    useradd -u ${USERID} -G ${GROUPNAME} ${IMAGEUSERNAME} && \
     chgrp -R ${GROUPNAME} ${TOMCAT_DIR} && \
     chmod g+w ${TOMCAT_DIR}/logs && \
     chmod g+rx ${TOMCAT_DIR}/conf && \
@@ -94,4 +94,4 @@ RUN mkdir -p ${TOMCAT_DIR}/conf/Catalina/localhost && \
 # Changes are also required to the docker-compose/docker-compose.yml file.
 # EXPOSE 8000
 
-USER ${USERNAME}
+USER ${IMAGEUSERNAME}

docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -106,7 +106,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.1.2</version>
                 <executions>
                     <execution>
                         <id>unpack-war-files</id>
@@ -340,6 +340,7 @@
                         <configuration>
                             <images>
                                 <image>
+                                    <alias>quay.io</alias>
                                     <name>${image.name}:${project.version}</name>
                                     <registry>${image.registry}</registry>
                                     <build>
@@ -347,6 +348,7 @@
                                     </build>
                                 </image>
                                 <image>
+                                    <alias>dockerhub</alias>
                                     <name>${image.name}:${project.version}</name>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
@@ -369,6 +371,4 @@
             </build>
         </profile>
     </profiles>
-
-
 </project>

docker-alfresco/test/.env

@@ -1,9 +0,0 @@
-ALFRESCO_TAG=latest
-TRANSFORMERS_TAG=2.1.0
-SHARE_TAG=6.2.0
-SOLR6_TAG=1.4.0
-POSTGRES_TAG=11.4
-ACTIVEMQ_TAG=5.15.8
-REGISTRY=
-LEGACY_TRANSFORM_SERVICE_ENABLED=true
-LOCAL_TRANSFORM_SERVICE_ENABLED=true

docker-alfresco/test/docker-compose.yml

@@ -1,132 +0,0 @@
-version: "3"
-
-# The acs-community-deployment project contains the product version of docker-compose.
-#
-# This version is for testing and development use. For testing and debug we need to have a more open version.
-# For remote debug we need the CATALINA_OPTS and to expose port 8000.
-
-services:
-    alfresco:
-        image: ${REGISTRY}alfresco/alfresco-content-repository-community:${ALFRESCO_TAG}
-        environment:
-            CATALINA_OPTS : "
-                -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n
-                "
-            JAVA_OPTS : "
-                -Ddb.driver=org.postgresql.Driver
-                -Ddb.username=alfresco
-                -Ddb.password=alfresco
-                -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
-                -Dsolr.host=solr6
-                -Dsolr.port=8983
-                -Dsolr.secureComms=none
-                -Dsolr.base.url=/solr
-                -Dindex.subsystem.name=solr6
-                -Dalfresco.restApi.basicAuthScheme=true
-                -Dimap.server.enabled=true
-                -Dftp.enabled=true
-                -Dftp.dataPortFrom=30000
-                -Dftp.dataPortTo=30099
-                -Dshare.host=localhost
-                -Daos.baseUrlOverwrite=http://localhost:8082/alfresco/aos
-                -Dmessaging.broker.url=\"failover:(tcp://activemq:61616)?timeout=3000&jms.useCompression=true\"
-
-                -Dlocal.transform.service.enabled=${LOCAL_TRANSFORM_SERVICE_ENABLED}
-                -DlocalTransform.pdfrenderer.url=http://alfresco-pdf-renderer:8090/
-                -DlocalTransform.imagemagick.url=http://imagemagick:8090/
-                -DlocalTransform.libreoffice.url=http://libreoffice:8090/
-                -DlocalTransform.tika.url=http://tika:8090/
-                -DlocalTransform.misc.url=http://transform-misc:8090/
-
-                -Dlegacy.transform.service.enabled=${LEGACY_TRANSFORM_SERVICE_ENABLED}
-                -Dalfresco-pdf-renderer.url=http://alfresco-pdf-renderer:8090/
-                -Djodconverter.url=http://libreoffice:8090/
-                -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:
-            - 8082:8080
-            - 8000:8000
-            - 143:1143
-            - 21:1221
-            - 30000-30099:30000-30099
-
-    alfresco-pdf-renderer:
-        image: alfresco/alfresco-pdf-renderer:${TRANSFORMERS_TAG}
-        environment:
-            JAVA_OPTS: " -Xms256m -Xmx256m"
-        ports:
-            - 8090:8090
-
-    imagemagick:
-        image: alfresco/alfresco-imagemagick:${TRANSFORMERS_TAG}
-        environment:
-            JAVA_OPTS: " -Xms256m -Xmx256m"
-        ports:
-            - 8091:8090
-
-    libreoffice:
-        image: alfresco/alfresco-libreoffice:${TRANSFORMERS_TAG}
-        environment:
-            JAVA_OPTS: " -Xms256m -Xmx256m"
-        ports:
-            - 8092:8090
-
-    tika:
-        image: alfresco/alfresco-tika:${TRANSFORMERS_TAG}
-        environment:
-            JAVA_OPTS: " -Xms256m -Xmx256m"
-        ports:
-            - 8093:8090
-
-    transform-misc:
-        image: alfresco/alfresco-transform-misc:${TRANSFORMERS_TAG}
-        environment:
-            JAVA_OPTS: " -Xms256m -Xmx256m"
-        ports:
-            - 8094:8090
-
-    share:
-        image: alfresco/alfresco-share:${SHARE_TAG}
-        environment:
-            - REPO_HOST=alfresco
-            - REPO_PORT=8080
-        ports:
-            - 8080:8080
-
-    postgres:
-        image: library/postgres:${POSTGRES_TAG}
-        environment:
-            - POSTGRES_PASSWORD=alfresco
-            - POSTGRES_USER=alfresco
-            - POSTGRES_DB=alfresco
-
-    solr6:
-        image: alfresco/alfresco-search-services:${SOLR6_TAG}
-        environment:
-            #Solr needs to know how to register itself with Alfresco
-            - SOLR_ALFRESCO_HOST=alfresco
-            - SOLR_ALFRESCO_PORT=8080
-            #Alfresco needs to know how to call solr
-            - SOLR_SOLR_HOST=solr6
-            - SOLR_SOLR_PORT=8983
-            #Create the default alfresco and archive cores
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
-            #HTTP by default
-            - ALFRESCO_SECURE_COMMS=none
-        ports:
-            - 8083:8983 #Browser port
-
-    activemq:
-        image: alfresco/alfresco-activemq:${ACTIVEMQ_TAG}
-        ports:
-            - 8161:8161 # Web Console
-            - 5672:5672 # AMQP
-            - 61616:61616 # OpenWire
-            - 61613:61613 # STOMP

pom.xml

@@ -2,15 +2,90 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>acs-community-packaging</artifactId>
     <name>Alfresco Content Services Community Packaging</name>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-super-pom</artifactId>
-        <version>10</version>
+        <version>12</version>
     </parent>
 
+    <scm>
+        <connection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</connection>
+        <developerConnection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</developerConnection>
+        <url>https://github.com/Alfresco/acs-community-packaging</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <distributionManagement>
+        <repository>
+            <id>alfresco-internal</id>
+            <url>https://artifacts.alfresco.com/nexus/content/repositories/releases</url>
+        </repository>
+        <snapshotRepository>
+            <id>alfresco-internal-snapshots</id>
+            <url>https://artifacts.alfresco.com/nexus/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <properties>
+        <!-- Set to "Community Early Access" to add to the version.edition property in version.properties  -->
+        <version.edition>Community</version.edition>
+        <image.tag>latest</image.tag>
+
+        <dependency.alfresco-remote-api.version>7.133.0</dependency.alfresco-remote-api.version>
+        <dependency.alfresco-repository.version>7.183.0</dependency.alfresco-repository.version>
+        <dependency.alfresco-data-model.version>8.50.14</dependency.alfresco-data-model.version>
+        <dependency.alfresco-core.version>7.33</dependency.alfresco-core.version>
+
+        <dependency.alfresco-hb-data-sender.version>1.0.12</dependency.alfresco-hb-data-sender.version>
+
+        <dependency.alfresco-spring-webscripts.version>7.14</dependency.alfresco-spring-webscripts.version>
+        <dependency.alfresco-mmt.version>6.0</dependency.alfresco-mmt.version>
+        <dependency.alfresco-pdf-renderer.version>1.1</dependency.alfresco-pdf-renderer.version>
+        <dependency.alfresco-trashcan-cleaner.version>2.3</dependency.alfresco-trashcan-cleaner.version>
+        <dependency.alfresco-jlan.version>7.1</dependency.alfresco-jlan.version>
+        <dependency.alfresco-server-root.version>6.0.1</dependency.alfresco-server-root.version>
+        <dependency.alfresco-api-explorer.version>6.2.1.1</dependency.alfresco-api-explorer.version>
+        <dependency.alfresco-messaging-repo.version>1.2.15</dependency.alfresco-messaging-repo.version>
+        <dependency.alfresco-log-sanitizer.version>0.2</dependency.alfresco-log-sanitizer.version>
+
+        <dependency.spring.version>5.1.15.RELEASE</dependency.spring.version>
+        <dependency.fabric8.version>4.4.0</dependency.fabric8.version>
+        <dependency.jackson.version>2.10.2</dependency.jackson.version>
+        <dependency.jackson-databind.version>2.10.1</dependency.jackson-databind.version>
+        <dependency.cxf.version>3.3.6</dependency.cxf.version>
+
+        <!-- Alfresco Share version -->
+        <alfresco.share.version>6.2.1</alfresco.share.version>
+        <alfresco.alfresco-share-services.version>6.2.1</alfresco.alfresco-share-services.version>
+
+        <!-- Alfresco GoogleDocs integration version -->
+        <alfresco.googledrive.version>3.2.0</alfresco.googledrive.version>
+
+        <!-- Alfresco Office Services Module -->
+        <alfresco.aos-module.version>1.3.1</alfresco.aos-module.version>
+
+        <installer.version.name>${project.version}</installer.version.name>
+        <alfresco.package.name>alfresco-community</alfresco.package.name>
+        <alfresco.distribution.name>${alfresco.package.name}-distribution</alfresco.distribution.name>
+
+        <dependency.postgresql.version>42.2.12</dependency.postgresql.version>
+
+        <dependency.tas-utility.version>3.0.20</dependency.tas-utility.version>
+        <dependency.rest-assured.version>3.3.0</dependency.rest-assured.version>
+        <dependency.javax.json.version>1.1.4</dependency.javax.json.version>
+        <dependency.tas-restapi.version>1.37</dependency.tas-restapi.version>
+        <dependency.tas-cmis.version>1.13</dependency.tas-cmis.version>
+        <dependency.tas-email.version>1.8</dependency.tas-email.version>
+        <dependency.tas-webdav.version>1.6</dependency.tas-webdav.version>
+        <dependency.tas-ftp.version>1.5</dependency.tas-ftp.version>
+        <dependency.tas-dataprep.version>2.3</dependency.tas-dataprep.version>
+        
+        <maven.build.sourceVersion>11</maven.build.sourceVersion>
+    </properties>
+
     <profiles>
         <profile>
             <id>community</id>
@@ -45,79 +120,6 @@
         </profile>
     </profiles>
 
-    <scm>
-        <connection>scm:git:git@github.com:Alfresco/acs-community-packaging.git</connection>
-        <developerConnection>scm:git:git@github.com:Alfresco/acs-community-packaging.git</developerConnection>
-        <url>https://github.com/Alfresco/acs-community-packaging</url>
-        <tag>HEAD</tag>
-    </scm>
-
-    <distributionManagement>
-        <repository>
-            <id>alfresco-internal</id>
-            <url>https://artifacts.alfresco.com/nexus/content/repositories/releases</url>
-        </repository>
-        <snapshotRepository>
-            <id>alfresco-internal-snapshots</id>
-            <url>https://artifacts.alfresco.com/nexus/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <properties>
-        <!-- Set to "Community Early Access" to add to the version.edition property in version.properties -->
-        <version.edition>Community</version.edition>
-        <image.tag>latest</image.tag>
-
-        <dependency.alfresco-remote-api.version>8.82</dependency.alfresco-remote-api.version>
-        <dependency.alfresco-repository.version>8.83</dependency.alfresco-repository.version>
-        <dependency.alfresco-data-model.version>8.84</dependency.alfresco-data-model.version>
-        <dependency.alfresco-core.version>8.18</dependency.alfresco-core.version>
-
-        <dependency.alfresco-hb-data-sender.version>1.0.12</dependency.alfresco-hb-data-sender.version>
-        <dependency.alfresco-spring-webscripts.version>8.1</dependency.alfresco-spring-webscripts.version>
-        <dependency.alfresco-mmt.version>6.0</dependency.alfresco-mmt.version>
-        <dependency.alfresco-pdf-renderer.version>1.1</dependency.alfresco-pdf-renderer.version>
-        <dependency.alfresco-trashcan-cleaner.version>2.3</dependency.alfresco-trashcan-cleaner.version>
-        <dependency.alfresco-jlan.version>7.1</dependency.alfresco-jlan.version>
-        <dependency.alfresco-server-root.version>6.0.1</dependency.alfresco-server-root.version>
-        <dependency.alfresco-messaging-repo.version>1.2.15</dependency.alfresco-messaging-repo.version>
-        <dependency.alfresco-api-explorer.version>6.3.0</dependency.alfresco-api-explorer.version>
-        <dependency.alfresco-log-sanitizer.version>0.2</dependency.alfresco-log-sanitizer.version>
-
-        <dependency.spring.version>5.2.2.RELEASE</dependency.spring.version>
-        <dependency.fabric8.version>4.3.1</dependency.fabric8.version>
-        <dependency.jackson.version>2.10.2</dependency.jackson.version>
-        <dependency.jackson-databind.version>2.10.1</dependency.jackson-databind.version>
-
-        <dependency.cxf.version>3.3.4</dependency.cxf.version>
-
-        <!-- Alfresco Share version -->
-        <alfresco.share.version>6.2.0</alfresco.share.version>
-        <alfresco.alfresco-share-services.version>6.2.0</alfresco.alfresco-share-services.version>
-
-        <!-- Alfresco GoogleDocs integration version -->
-        <alfresco.googledrive.version>3.2.0-A1</alfresco.googledrive.version>
-
-        <!-- Alfresco Office Services Module -->
-        <alfresco.aos-module.version>1.3.0</alfresco.aos-module.version>
-
-        <installer.version.name>${project.version}</installer.version.name>
-        <alfresco.package.name>alfresco-community</alfresco.package.name>
-        <alfresco.distribution.name>${alfresco.package.name}-distribution</alfresco.distribution.name>
-
-        <dependency.postgresql.version>42.2.9</dependency.postgresql.version>
-
-        <dependency.tas-utility.version>3.0.17</dependency.tas-utility.version>
-        <dependency.rest-assured.version>3.3.0</dependency.rest-assured.version>
-        <dependency.javax.json.version>1.1.4</dependency.javax.json.version>
-        <dependency.tas-restapi.version>1.26</dependency.tas-restapi.version>
-        <dependency.tas-cmis.version>1.12</dependency.tas-cmis.version>
-        <dependency.tas-email.version>1.7</dependency.tas-email.version>
-        <dependency.tas-webdav.version>1.5</dependency.tas-webdav.version>
-        <dependency.tas-ftp.version>1.4</dependency.tas-ftp.version>
-        <dependency.tas-dataprep.version>2.3</dependency.tas-dataprep.version>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -244,7 +246,7 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.4.12</version>
+                <version>4.4.13</version>
             </dependency>
             <dependency>
                 <groupId>joda-time</groupId>
@@ -300,12 +302,12 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.5.10</version>
+                <version>4.5.12</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient-cache</artifactId>
-                <version>4.5.10</version>
+                <version>4.5.12</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.xmlbeans</groupId>
@@ -527,12 +529,12 @@
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>
-                <version>1.64</version>
+                <version>1.65</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcmail-jdk15on</artifactId>
-                <version>1.64</version>
+                <version>1.65</version>
             </dependency>
             <!-- upgrade dependency from TIKA -->
             <dependency>
@@ -544,7 +546,7 @@
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>
-                <version>1.12.1</version>
+                <version>1.13.1</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

public-javadoc/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-	<version>6.3.0-SNAPSHOT</version>
+	<version>6.2.1-SNAPSHOT</version>
 	<relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

scripts/travis/copy_to_release_bucket.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -ev
+
+if [ -z ${COMM_RELEASE_VERSION} ] || [ -z ${RELEASE_VERSION} ];
+then
+  echo "Please provide a COMM_RELEASE_VERSION and RELEASE_VERSION in the format <acs-version>-<additional-info> (6.3.0-EA or 6.3.0-SNAPSHOT)"
+  exit -1
+fi
+
+build_number=$1
+branch_name=$2
+build_stage=release
+SOURCE=s3://alfresco-artefacts-staging/alfresco-content-services-community/$build_stage/$branch_name/$build_number
+DESTINATION=s3://eu.dl.alfresco.com/release/community/$COMM_RELEASE_VERSION-build-$build_number
+
+aws s3 cp --acl private $SOURCE/alfresco.war $DESTINATION/alfresco.war
+aws s3 cp --acl private $SOURCE/alfresco-content-services-community-distribution-$RELEASE_VERSION.zip $DESTINATION/alfresco-content-services-community-distribution-$RELEASE_VERSION.zip

scripts/travis/maven_release.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -e
+
+releaseVersion=$1
+developmentVersion=$2
+scm_path=$(mvn help:evaluate -Dexpression=project.scm.url -q -DforceStdout)
+
+# Use full history for release
+git checkout -B "${TRAVIS_BRANCH}"
+# Add email to link commits to user
+git config user.email "${GIT_EMAIL}"
+
+if [ -z ${releaseVersion} ] || [ -z ${developmentVersion} ]; 
+    then echo "Please provide a Release and Development verison in the format <acs-version>-<additional-info> (6.3.0-EA or 6.3.0-SNAPSHOT)"
+         exit -1
+else   
+    mvn --batch-mode \
+    -PfullBuild,all-tas-tests \
+    -Dusername="${GIT_USERNAME}" \
+    -Dpassword="${GIT_PASSWORD}" \
+    -DreleaseVersion=${releaseVersion} \
+    -DdevelopmentVersion=${developmentVersion} \
+    -Dbuild-number=${TRAVIS_BUILD_NUMBER} \
+    -Dbuild-name="${TRAVIS_BUILD_STAGE_NAME}" \
+    -Dscm-path=${scm_path} \
+    -DscmCommentPrefix="[maven-release-plugin][skip ci]" \
+    -DskipTests \
+    "-Darguments=-DskipTests -Dbuild-number=${TRAVIS_BUILD_NUMBER} '-Dbuild-name=${TRAVIS_BUILD_STAGE_NAME}' -Dscm-path=${scm_path} -PfullBuild,all-tas-tests" \
+    release:clean release:prepare release:perform \
+    -Prelease
+fi

scripts/travis/verify_release_tag.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -e
+
+if [ -v ${RELEASE_VERSION} ]||[ -z ${RELEASE_VERSION} ]; then
+    echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (6.3.0-EA or 6.3.0-SNAPSHOT)"
+    exit -1
+fi
+# get the image name from the pom file
+alfresco_docker_image=$(mvn help:evaluate -f ./docker-alfresco/pom.xml -Dexpression=image.name -q -DforceStdout)
+docker_image_full_name="$alfresco_docker_image:$RELEASE_VERSION"
+
+function docker_image_exists() {
+  local image_full_name="$1"; shift
+    local wait_time="${1:-5}"
+    local search_term='Pulling|is up to date|not found'
+    echo "Looking to see if $image_full_name already exists..."
+    local result="$((timeout --preserve-status "$wait_time" docker 2>&1 pull "$image_full_name" &) | grep -v 'Pulling repository' | egrep -o "$search_term")"
+    test "$result" || { echo "Timed out too soon. Try using a wait_time greater than $wait_time..."; return 1 ;}
+    if echo $result | grep -vq 'not found'; then
+        true
+    else 
+        false
+    fi
+}
+
+if docker_image_exists $docker_image_full_name; then
+    echo "Tag $RELEASE_VERSION already pushed, release process will interrupt."
+    exit -1 
+else
+    echo "The $RELEASE_VERSION tag was not found"
+fi

tests/environment/.env

@@ -1,4 +1,4 @@
-TRANSFORMERS_TAG=2.1.0
+TRANSFORMERS_TAG=2.2.1
-SOLR6_TAG=1.4.0
+SOLR6_TAG=1.4.2
 POSTGRES_TAG=11.4
 ACTIVEMQ_TAG=5.15.8

tests/environment/docker-compose-minimal+transforms.yml

@@ -31,24 +31,18 @@ services:
         -Daos.baseUrlOverwrite=http://localhost:8082/alfresco/aos
         -Dmessaging.broker.url=\"failover:(tcp://activemq:61616)?timeout=3000&jms.useCompression=true\"
 
-        -Dlocal.transform.service.enabled=true
+        -DlocalTransform.core-aio.url=http://transform-core-aio:8090/
-        -DlocalTransform.pdfrenderer.url=http://alfresco-pdf-renderer:8090/
-        -DlocalTransform.imagemagick.url=http://imagemagick:8090/
-        -DlocalTransform.libreoffice.url=http://libreoffice:8090/
-        -DlocalTransform.tika.url=http://tika:8090/
-        -DlocalTransform.misc.url=http://transform-misc:8090/
 
-        -Dlegacy.transform.service.enabled=true
+        -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/
-        -Dalfresco-pdf-renderer.url=http://alfresco-pdf-renderer:8090/
+        -Djodconverter.url=http://transform-core-aio:8090/
-        -Djodconverter.url=http://libreoffice:8090/
+        -Dimg.url=http://transform-core-aio:8090/
-        -Dimg.url=http://imagemagick:8090/
+        -Dtika.url=http://transform-core-aio:8090/
-        -Dtika.url=http://tika:8090/
+        -Dtransform.misc.url=http://transform-core-aio:8090/
-        -Dtransform.misc.url=http://transform-misc:8090/
 
         -Dimap.server.port=1143
         -Dftp.port=1221
         -Dcors.enabled=true
-        -Dcors.allowed.origins=http://localhost:4200
+        -Dcors.allowed.origins=http://localhost:4200,http://localhost:8080
         "
     ports:
       - 8082:8080
@@ -88,57 +82,9 @@ services:
       - 61616:61616 # OpenWire
       - 61613:61613 # STOMP
 
-  alfresco-pdf-renderer:
+  transform-core-aio:
-    image: alfresco/alfresco-pdf-renderer:${TRANSFORMERS_TAG}
+    image: alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
     environment:
-      JAVA_OPTS: " -Xms256m -Xmx256m"
+      JAVA_OPTS: " -Xms256m -Xmx512m"
-      ACTIVEMQ_URL: "nio://activemq:61616"
-      ACTIVEMQ_USER: "admin"
-      ACTIVEMQ_PASSWORD: "admin"
-      FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
     ports:
       - 8090:8090
-
-  imagemagick:
-    image: alfresco/alfresco-imagemagick:${TRANSFORMERS_TAG}
-    environment:
-      JAVA_OPTS: " -Xms256m -Xmx256m"
-      ACTIVEMQ_URL: "nio://activemq:61616"
-      ACTIVEMQ_USER: "admin"
-      ACTIVEMQ_PASSWORD: "admin"
-      FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
-    ports:
-      - 8091:8090
-
-  libreoffice:
-    image: alfresco/alfresco-libreoffice:${TRANSFORMERS_TAG}
-    environment:
-      JAVA_OPTS: " -Xms256m -Xmx256m"
-      ACTIVEMQ_URL: "nio://activemq:61616"
-      ACTIVEMQ_USER: "admin"
-      ACTIVEMQ_PASSWORD: "admin"
-      FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
-    ports:
-      - 8092:8090
-
-  tika:
-    image: alfresco/alfresco-tika:${TRANSFORMERS_TAG}
-    environment:
-      JAVA_OPTS: " -Xms256m -Xmx256m"
-      ACTIVEMQ_URL: "nio://activemq:61616"
-      FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
-      ACTIVEMQ_USER: "admin"
-      ACTIVEMQ_PASSWORD: "admin"
-    ports:
-      - 8093:8090
-
-  transform-misc:
-    image: alfresco/alfresco-transform-misc:${TRANSFORMERS_TAG}
-    environment:
-      JAVA_OPTS: " -Xms256m -Xmx256m"
-      ACTIVEMQ_URL: "nio://activemq:61616"
-      ACTIVEMQ_USER: "admin"
-      ACTIVEMQ_PASSWORD: "admin"
-      FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
-    ports:
-      - 8094:8090

tests/pom.xml

@@ -1,13 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>content-repository-community-tas-tests-parent</artifactId>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

tests/tas-cmis/pom.xml

@@ -4,13 +4,13 @@
     <groupId>org.alfresco.tas</groupId>
     <artifactId>content-repository-community-cmis-test</artifactId>
     <name>content-repository-community-cmis-test</name>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tas-tests-parent</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

tests/tas-email/pom.xml

@@ -4,13 +4,13 @@
     <groupId>org.alfresco.tas</groupId>
     <artifactId>content-repository-community-email-test</artifactId>
     <name>content-repository-community-email-test</name>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tas-tests-parent</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

tests/tas-integration/pom.xml

@@ -4,13 +4,13 @@
     <groupId>org.alfresco.tas</groupId>
     <artifactId>content-repository-community-integration-test</artifactId>
     <name>content-repository-community-integration-test</name>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tas-tests-parent</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -25,7 +25,7 @@
 
     <properties>
         <suiteXmlFile>${project.basedir}/src/test/resources/integration-suite.xml</suiteXmlFile>
-        <dependency.groovy.version>2.5.8</dependency.groovy.version>
+        <dependency.groovy.version>2.5.9</dependency.groovy.version>
         <dependency.javax.mail.version>1.6.2</dependency.javax.mail.version>
     </properties>
 

tests/tas-restapi/pom.xml

@@ -4,13 +4,13 @@
     <groupId>org.alfresco.tas</groupId>
     <artifactId>content-repository-community-restapi-test</artifactId>
     <name>content-repository-community-restapi-test</name>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tas-tests-parent</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesLockTests.java

@@ -199,11 +199,13 @@ public class NodesLockTests extends RestTest
                 .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK");
 
         STEP("6. Verify that the file is locked PERSISTENT only after EPHEMERAL lock has expired");
-        try{Thread.sleep(2500);}finally{}
+        Utility.sleep(500, 5000, () ->
-        RestNodeModel file1Model4 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").getNode();
+        {
-        file1Model4.assertThat().field("isLocked").is(true)
+            RestNodeModel file1Model4 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").getNode();
-                .assertThat().field("properties").contains("lockLifetime=PERSISTENT")
+            file1Model4.assertThat().field("isLocked").is(true)
-                .assertThat().field("properties").contains("lockType=WRITE_LOCK");
+                    .assertThat().field("properties").contains("lockLifetime=PERSISTENT")
+                    .assertThat().field("properties").contains("lockType=WRITE_LOCK");
+        });
     }
 
     @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION })
@@ -313,12 +315,14 @@ public class NodesLockTests extends RestTest
         lockBodyModel2.setLifetime("EPHEMERAL");
         lockBodyModel2.setTimeToExpire(20);
         lockBodyModel2.setType("FULL");
-        try{Thread.sleep(1500);}finally{}
+        Utility.sleep(500, 5000, () ->
-        RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
+        {
-        restClient.assertStatusCodeIs(HttpStatus.OK);
+            RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
-        file1Model3.assertThat().field("isLocked").is(true)
+            restClient.assertStatusCodeIs(HttpStatus.OK);
-                .assertThat().field("properties").contains("lockLifetime=EPHEMERAL")
+            file1Model3.assertThat().field("isLocked").is(true)
-                .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK");
+                    .assertThat().field("properties").contains("lockLifetime=EPHEMERAL")
+                    .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK");
+        });
     }
 
 //  TODO: uncomment this:  @Bug(id = "MNT-17612", status = Status.FIXED, description = "AccessDeniedException in AOS Edit Offline Upload New Version")
@@ -354,12 +358,15 @@ public class NodesLockTests extends RestTest
         lockBodyModel2.setLifetime("PERSISTENT");
         lockBodyModel2.setTimeToExpire(20);
         lockBodyModel2.setType("ALLOW_OWNER_CHANGES");
-        try{Thread.sleep(1500);}finally{}
+        Utility.sleep(500, 5000, () ->
-        RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
+        {
-        restClient.assertStatusCodeIs(HttpStatus.OK);
+            RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
-        file1Model3.assertThat().field("isLocked").is(true)
+            restClient.assertStatusCodeIs(HttpStatus.OK);
-                .assertThat().field("properties").contains("lockLifetime=PERSISTENT")
+            file1Model3.assertThat().field("isLocked").is(true)
-                .assertThat().field("properties").contains("lockType=WRITE_LOCK");
+                    .assertThat().field("properties").contains("lockLifetime=PERSISTENT")
+                    .assertThat().field("properties").contains("lockType=WRITE_LOCK");
+
+        });
     }
 
     @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION })
@@ -393,12 +400,14 @@ public class NodesLockTests extends RestTest
         lockBodyModel2.setLifetime("EPHEMERAL");
         lockBodyModel2.setTimeToExpire(20);
         lockBodyModel2.setType("FULL");
-        try{Thread.sleep(1500);}finally{}
+        Utility.sleep(500, 5000, () ->
-        RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
+        {
-        restClient.assertStatusCodeIs(HttpStatus.OK);
+            RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
-        file1Model3.assertThat().field("isLocked").is(true)
+            restClient.assertStatusCodeIs(HttpStatus.OK);
-                .assertThat().field("properties").contains("lockLifetime=EPHEMERAL")
+            file1Model3.assertThat().field("isLocked").is(true)
-                .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK");
+                    .assertThat().field("properties").contains("lockLifetime=EPHEMERAL")
+                    .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK");
+        });
     }
 
     @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION })
@@ -432,12 +441,14 @@ public class NodesLockTests extends RestTest
         lockBodyModel2.setLifetime("PERSISTENT");
         lockBodyModel2.setTimeToExpire(20);
         lockBodyModel2.setType("ALLOW_OWNER_CHANGES");
-        try{Thread.sleep(1500);}finally{}
+        Utility.sleep(500, 5000, () ->
-        RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
+        {
-        restClient.assertStatusCodeIs(HttpStatus.OK);
+            RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
-        file1Model3.assertThat().field("isLocked").is(true)
+            restClient.assertStatusCodeIs(HttpStatus.OK);
-                .assertThat().field("properties").contains("lockLifetime=PERSISTENT")
+            file1Model3.assertThat().field("isLocked").is(true)
-                .assertThat().field("properties").contains("lockType=WRITE_LOCK");
+                    .assertThat().field("properties").contains("lockLifetime=PERSISTENT")
+                    .assertThat().field("properties").contains("lockType=WRITE_LOCK");
+        });
     }
 
     @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION })
@@ -471,12 +482,14 @@ public class NodesLockTests extends RestTest
         lockBodyModel2.setLifetime("EPHEMERAL");
         lockBodyModel2.setTimeToExpire(20);
         lockBodyModel2.setType("FULL");
-        try{Thread.sleep(1500);}finally{}
+        Utility.sleep(500, 5000, () ->
-        RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
+        {
-        restClient.assertStatusCodeIs(HttpStatus.OK);
+            RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
-        file1Model3.assertThat().field("isLocked").is(true)
+            restClient.assertStatusCodeIs(HttpStatus.OK);
-                .assertThat().field("properties").contains("lockLifetime=EPHEMERAL")
+            file1Model3.assertThat().field("isLocked").is(true)
-                .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK");
+                    .assertThat().field("properties").contains("lockLifetime=EPHEMERAL")
+                    .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK");
+        });
     }
 
     @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION })
@@ -509,12 +522,14 @@ public class NodesLockTests extends RestTest
         lockBodyModel2.setLifetime("PERSISTENT");
         lockBodyModel2.setTimeToExpire(20);
         lockBodyModel2.setType("ALLOW_OWNER_CHANGES");
-        try{Thread.sleep(1500);}finally{}
+        Utility.sleep(500, 5000, () ->
-        RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
+        {
-        restClient.assertStatusCodeIs(HttpStatus.OK);
+            RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
-        file1Model3.assertThat().field("isLocked").is(true)
+            restClient.assertStatusCodeIs(HttpStatus.OK);
-                .assertThat().field("properties").contains("lockLifetime=PERSISTENT")
+            file1Model3.assertThat().field("isLocked").is(true)
-                .assertThat().field("properties").contains("lockType=WRITE_LOCK");
+                    .assertThat().field("properties").contains("lockLifetime=PERSISTENT")
+                    .assertThat().field("properties").contains("lockType=WRITE_LOCK");
+        });
     }
 
     @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION })
@@ -548,12 +563,14 @@ public class NodesLockTests extends RestTest
         lockBodyModel2.setLifetime("EPHEMERAL");
         lockBodyModel2.setTimeToExpire(20);
         lockBodyModel2.setType("FULL");
-        try{Thread.sleep(1500);}finally{}
+        Utility.sleep(500, 5000, () ->
-        RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
+        {
-        restClient.assertStatusCodeIs(HttpStatus.OK);
+            RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
-        file1Model3.assertThat().field("isLocked").is(true)
+            restClient.assertStatusCodeIs(HttpStatus.OK);
-                .assertThat().field("properties").contains("lockLifetime=EPHEMERAL")
+            file1Model3.assertThat().field("isLocked").is(true)
-                .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK");
+                    .assertThat().field("properties").contains("lockLifetime=EPHEMERAL")
+                    .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK");
+        });
     }
 
 //  TODO: uncomment this:    @Bug(id = "MNT-17612", status = Status.FIXED, description = "AccessDeniedException in AOS Edit Offline Upload New Version")
@@ -590,12 +607,14 @@ public class NodesLockTests extends RestTest
         lockBodyModel2.setLifetime("PERSISTENT");
         lockBodyModel2.setTimeToExpire(20);
         lockBodyModel2.setType("ALLOW_OWNER_CHANGES");
-        try{Thread.sleep(1500);}finally{}
+        Utility.sleep(500, 5000, () ->
-        RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
+        {
-        restClient.assertStatusCodeIs(HttpStatus.OK);
+            RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
-        file1Model3.assertThat().field("isLocked").is(true)
+            restClient.assertStatusCodeIs(HttpStatus.OK);
-                .assertThat().field("properties").contains("lockLifetime=PERSISTENT")
+            file1Model3.assertThat().field("isLocked").is(true)
-                .assertThat().field("properties").contains("lockType=WRITE_LOCK");
+                    .assertThat().field("properties").contains("lockLifetime=PERSISTENT")
+                    .assertThat().field("properties").contains("lockType=WRITE_LOCK");
+        });
     }
 
     @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION })

tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/SharedLinksSanityTests.java

@@ -212,8 +212,11 @@ public class SharedLinksSanityTests extends RestTest
         restClient.assertStatusCodeIs(HttpStatus.OK);
     }
 
+    /**
+     * ATS does not support text -> img (doclib)
+     */
     @TestRail(section = { TestGroup.REST_API, TestGroup.SHAREDLINKS }, executionType = ExecutionType.SANITY, description = "Sanity tests for GET /renditions, GET /renditions/{renditionId} and GET /renditions/{renditionId}/content endpoints")
-    @Test(groups = { TestGroup.REST_API, TestGroup.SHAREDLINKS, TestGroup.SANITY, TestGroup.RENDITIONS })
+    @Test(groups = { TestGroup.REST_API, TestGroup.SHAREDLINKS, TestGroup.SANITY, TestGroup.RENDITIONS, TestGroup.NOT_SUPPORTED_BY_ATS })
     public void testGetSharedLinkRendition() throws Exception
     {
         sharedLink7 = restClient.authenticateUser(testUser1).withCoreAPI().usingSharedLinks().createSharedLink(file7);

tests/tas-restapi/src/test/java/org/alfresco/rest/tags/UpdateTagTests.java

@@ -142,10 +142,12 @@ public class UpdateTagTests extends TagsDataPrep
     {
         String invalidTagBody = "|.\"/<>*";
         RestTagModel tag = restClient.authenticateUser(adminUserModel).withCoreAPI().usingResource(document).addTag(RandomData.getRandomName("tag"));
-        Utility.waitToLoopTime(20);
+        Utility.sleep(500, 20000, () ->
-        restClient.withCoreAPI().usingTag(tag).update(invalidTagBody);
+        {
-        restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST)
+            restClient.withCoreAPI().usingTag(tag).update(invalidTagBody);
-                .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_TAG, invalidTagBody));
+            restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST)
+                    .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_TAG, invalidTagBody));
+        });
     }
 
     @Bug(id="ACE-5629")
@@ -156,10 +158,12 @@ public class UpdateTagTests extends TagsDataPrep
     {
         String invalidTagBody = ".\"/<>*";
         RestTagModel tag = restClient.authenticateUser(adminUserModel).withCoreAPI().usingResource(document).addTag(RandomData.getRandomName("tag"));
-        Utility.waitToLoopTime(20);
+            Utility.sleep(500, 20000, () ->
-        restClient.withCoreAPI().usingTag(tag).update(invalidTagBody);
+            {
-        restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST)
+            restClient.withCoreAPI().usingTag(tag).update(invalidTagBody);
-                .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_TAG, invalidTagBody));
+            restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST)
+                    .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_TAG, invalidTagBody));
+        });
     }
 
     @TestRail(section = { TestGroup.REST_API, TestGroup.TAGS }, executionType = ExecutionType.REGRESSION,

tests/tas-webdav/pom.xml

@@ -4,13 +4,13 @@
     <groupId>org.alfresco.tas</groupId>
     <artifactId>content-repository-community-webdav-test</artifactId>
     <name>content-repository-community-webdav-test</name>
-    <version>6.3.0-SNAPSHOT</version>
+    <version>6.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tas-tests-parent</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

war/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -110,7 +110,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.2.4</version>
+            <version>3.3.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -178,7 +178,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -265,6 +265,20 @@
         </plugins>
         <pluginManagement>
             <plugins>
+                <!-- Specify the source version to get around a "feature" in JDK 11.0.2 currently used by travis-->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.2.0</version>
+                    <configuration>
+                        <source>${maven.build.sourceVersion}</source>
+                    </configuration>
+                </plugin>
+                <!-- Ensure consistent maven-release-plugin version-->
+                <plugin>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5.3</version>
+                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>license-maven-plugin</artifactId>

war/src/main/resources/log4j.properties

@@ -225,6 +225,7 @@ log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info
 
 log4j.logger.org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImpl=off
 log4j.logger.org.alfresco.repo.domain.schema.script.ScriptExecutorImpl=info
+log4j.logger.org.alfresco.repo.domain.schema.script.DeleteNotExistsExecutor=off
 
 log4j.logger.org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl=info