[maven-release-plugin][skip ci]prepare release acs-community-packaging-6.3.0-repo-4735-3-1

Update .travis.yml
Fixed lack of mvn credentials [skip ci]
2025-09-10 14:12:09 +00:00 · 2020-03-06 15:34:15 +00:00 · 2020-03-06 15:04:18 +00:00 · 2020-03-06 14:44:05 +00:00 · 2020-03-06 14:26:45 +00:00 · 2020-03-06 14:23:37 +00:00
22 changed files with 478 additions and 57 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,7 @@ alf_data/

 helm/alfresco-content-services-community/charts/*
 helm/alfresco-content-services-community/requirements.lock
-helm/alfresco-content-services-community*.tgz
+helm/alfresco-content-services-community*.tgz
+
+# Travis deployment folder 
+deploy_dir
--- a/.travis.settings.xml
+++ b/.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>
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,9 @@ 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
@@ -19,11 +21,22 @@ branches:
  only:
    - master
    - develop
+    - feature/REPO-4735_Add-release-stages-2
+
+stages:
+  - name: test
+    if: commit_message !~ /\[skipTests\]/
+  - name: engineering release
+  - name: company release
+
+
+before_install: "cp .travis.settings.xml $HOME/.m2/settings.xml"

 matrix:
  include:
-    - name: "WhiteSource scan"
-      # only on develop and if it is not a PR
+    - stage: test
+      name: "WhiteSource scan"
+      # only on master 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
@@ -88,3 +101,44 @@ 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: Engineering Release
+      name: "Maven release"
+      if: commit_message ~= /\[trigger-release\]/ AND fork = false AND branch =~ ^(master|develop|feature/REPO-4735_Add-release-stages-2)$ 
+      # 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_install: 
+        - "cp .travis.settings.xml $HOME/.m2/settings.xml"
+        - bash ./scripts/travis/verifyReleaseTag.sh 
+      install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V 
+      script: bash ./scripts/travis/mavenRelease.sh ${RELEASE_VERSION} ${DEVELOPMENT_VERSION}
+      # if the release stage fails rollback
+      after_failure: 
+        - mvn release:rollback -DscmCommentPrefix="[maven-release-plugin][skip ci] "
+      # Copy alfresco.war and the distribution zip to deploy_dir
+      before_deploy: bash ./scripts/travis/prepareEngineeringRelease.sh
+      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|feature/REPO-4735_Add-release-stages-2)$
+    - stage: "Company Release"
+      name: "Copy to S3 Release"
+      if: commit_message ~= /\[trigger-company-release\]/ AND fork = false AND branch = feature/REPO-4735_Add-release-stages-2 
+      # Nothing to build/install as we are just copying from S3 buckets
+      install: skip 
+      script: skip
+      before_deploy: pip install awscli
+      delpoy:
+        - provider: script
+          script:  ./scripts/travis/companyReleaseDeployment.sh ${TRAVIS_BUILD_NUMBER} ${TRAVIS_BRANCH}
+          on:
+            branch: feature/REPO-4735_Add-release-stages-2
+            
+      
--- a/distribution/pom.xml
+++ b/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.3.0-repo-4735-3-1</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/distribution/src/main/resources/licenses/notice.txt
+++ b/distribution/src/main/resources/licenses/notice.txt
@@ -37,8 +37,7 @@ commons-fileupload  http://jakarta.apache.org/commons/
 commons-httpclient  http://jakarta.apache.org/commons/ 
 commons-io  http://jakarta.apache.org/commons/ 
 commons-jxpath  http://jakarta.apache.org/commons/ 
-commons-lang    http://jakarta.apache.org/commons/ 
-commons-lang3   http://jakarta.apache.org/commons/ 
+commons-lang3   http://jakarta.apache.org/commons/
 commons-logging http://jakarta.apache.org/commons/ 
 commons-net http://jakarta.apache.org/commons/
 commons-pool    http://jakarta.apache.org/commons/ 
--- a/docker-alfresco/Dockerfile
+++ b/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}
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -7,12 +7,12 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.3.0-repo-4735-3-1</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <properties>
-        <image.name>alfresco/alfresco-content-repository-community</image.name>
+        <image.name>alfresco/alfresco-content-repository-community-test-release</image.name>
        <image.registry>quay.io</image.registry>
    </properties>

@@ -216,12 +216,12 @@

            <plugin>
                <groupId>io.fabric8</groupId>
-                <artifactId>fabric8-maven-plugin</artifactId>
-                <version>${dependency.fabric8.version}</version>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>${dependency.docker-maven.version}</version>
                <configuration>
                    <images>
                        <image>
-                            <name>${image.name}</name>
+                            <name>${image.name}:${project.version}</name>
                            <build>
                                <dockerFileDir>${project.basedir}/</dockerFileDir>
                            </build>
@@ -239,8 +239,8 @@
                <plugins>
                    <plugin>
                        <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
-                        <version>${dependency.fabric8.version}</version>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>${dependency.docker-maven.version}</version>
                        <executions>
                            <execution>
                                <id>build-image</id>
@@ -261,8 +261,8 @@
                <plugins>
                    <plugin>
                        <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
-                        <version>${dependency.fabric8.version}</version>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>${dependency.docker-maven.version}</version>
                        <configuration>
                            <images>
                                <image>
@@ -295,8 +295,8 @@
                <plugins>
                    <plugin>
                        <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
-                        <version>${dependency.fabric8.version}</version>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>${dependency.docker-maven.version}</version>
                        <configuration>
                            <images>
                                <image>
@@ -335,11 +335,12 @@
                <plugins>
                    <plugin>
                        <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
-                        <version>${dependency.fabric8.version}</version>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>${dependency.docker-maven.version}</version>
                        <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>
+</project>
--- a/docker-alfresco/test/.env
+++ b/docker-alfresco/test/.env
@@ -1,7 +1,7 @@
 ALFRESCO_TAG=latest
 TRANSFORMERS_TAG=2.1.1
 SHARE_TAG=6.2.0
-SOLR6_TAG=1.4.0
+SOLR6_TAG=1.4.1
 POSTGRES_TAG=11.4
 ACTIVEMQ_TAG=5.15.8
 REGISTRY=
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
    <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.3.0-repo-4735-3-1</version>
    <packaging>pom</packaging>

    <parent>
@@ -12,6 +12,18 @@
    </parent>

    <profiles>
+        <profile>
+            <id>fullBuild</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>war</module>
+                <module>distribution</module>
+                <module>public-javadoc</module>
+                <module>docker-alfresco</module>
+            </modules>
+        </profile>
        <profile>
            <id>community</id>
            <modules>
@@ -25,18 +37,6 @@
                <module>docker-alfresco</module>
            </modules>
        </profile>
-        <profile>
-            <id>fullBuild</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>war</module>
-                <module>distribution</module>
-                <module>public-javadoc</module>
-                <module>docker-alfresco</module>
-            </modules>
-        </profile>
        <profile>
            <id>all-tas-tests</id>
            <modules>
@@ -46,10 +46,10 @@
    </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>
+        <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>
+        <tag>acs-community-packaging-6.3.0-repo-4735-3-1</tag>
    </scm>

    <distributionManagement>
@@ -86,6 +86,7 @@

        <dependency.spring.version>5.2.4.RELEASE</dependency.spring.version>
        <dependency.fabric8.version>4.4.0</dependency.fabric8.version>
+        <dependency.docker-maven.version>0.33.0</dependency.docker-maven.version>
        <dependency.jackson.version>2.10.2</dependency.jackson.version>
        <dependency.jackson-databind.version>2.10.1</dependency.jackson-databind.version>

@@ -116,6 +117,8 @@
        <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>

    <dependencyManagement>
@@ -282,11 +285,6 @@
                <artifactId>commons-digester</artifactId>
                <version>2.1</version>
            </dependency>
-            <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.6</version>
-            </dependency>
            <dependency>
                <groupId>commons-fileupload</groupId>
                <artifactId>commons-fileupload</artifactId>
@@ -548,4 +546,15 @@
            </dependency>
        </dependencies>
    </dependencyManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <source>11</source>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
--- a/public-javadoc/pom.xml
+++ b/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.3.0-repo-4735-3-1</version>
 	<relativePath>../pom.xml</relativePath>
    </parent>
    <packaging>pom</packaging>
--- a/scripts/playground.sh
+++ b/scripts/playground.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+#TO BE DELETED BEFORE MERGIN PR
+commitMessage='[skipTests] message [trigger-release] [trigger-company-release] [devRelease=6.3.0-SNAPSHOT] [release=6.3.0-repo-4735-3-1][comRelease=202003] adding some nonsense to test the message -8y-18hrnfjif1][]1[]1r[1][f3][]3g[g]g[[]3[]g[4][]4]g4][3]455[5][6]34[]g[]g[42[r1r31443=1=3=411=3]'
+testbuildcommitmessage='[skipTests][trigger-release] [trigger-company-release] [devRelease=6.3.0-SNAPSHOT] [release=6.3.0-repo-4735-3-1][comRelease=202003-test-release]'
+# This echos each string of the commit message that is encased in square brackets
+# Example commit message: "Commit message [message 1][message 2]" will echo "message 1" "message 2"
+collectVariableTriggers() {
+    local regex='\[\K[^\]]*=[^\]]*(?=\])'
+    local s=$1 
+    echo $s | grep -Po $regex
+}
+
+# Get the variable from a string
+extractVariable() {
+    local regex="=\K.*"
+    local s=$1
+    echo $s | grep -Po $regex
+}
+
+# Get the variable name from the string
+extractVariableName() {
+    local s=$1 regex='.*(?==)'
+    echo $s | grep -Po $regex
+}
+
+# Lets create an array containing section of the commit message in the format [*=*] ie [devRelease=repo-4735] will be added as devRelease=repo-4735
+mapfile -t commitsVariables < <( echo $commitMessage | grep -Po '\[\K[^\]]*=[^\]]*(?=\])' )
+for i in ${commitsVariables[@]}
+do
+    variable=$(echo $i | grep -Po '=\K.*' )
+    variableName=$(echo $i | grep -Po '.*(?==)')
+    case  $variableName  in
+            "devRelease")      
+                devRelease="$variable"
+                ;;
+            "release")
+                release="$variable"
+                ;;            
+            "comRelease")
+                comRelease="$variable"     
+                ;;
+            *)              
+    esac
+done
+
+echo "devRelease is equal to $devRelease"
+echo "release is equal to $release"
+echo "comRelease is equal to $comRelease"
+
+echo "Let's assign some variables directly from the commit message"
+releaseVersion=$(echo $commitMessage | grep -Po '\[release[^\]]*=\K[^\]]*(?=\])')
+developmentVersion=$(echo $commitMessage | grep -Po '\[devRelease[^\]]*=\K[^\]]*(?=\])')
+echo $releaseVersion
+echo $developmentVersion
+
+echo "Let's assign some variables directly from the commit message but this time with variable names!"
+releaseVersionVariableName="release"
+devVersionVariableName="devRelease"
+echo $releaseVersionVariableName
+echo $devVersionVariableName
+
+regex1="\[${releaseVersionVariableName}[^\]]*=\K[^\]]*(?=\])"
+
+echo $regex1
+releaseVersion=$(echo $commitMessage | grep -Po $regex1)
+echo $releaseVersion
+
+echo $commitMessage | grep -Po "\[{$devVersionVariableName}[^\]]*=\K[^\]]*(?=\])"
+
+. ./travis/common_function.sh
+extractVariable "release" "$commitMessage"
--- a/scripts/travis/V2/common_functions.sh
+++ b/scripts/travis/V2/common_functions.sh
@@ -0,0 +1,11 @@
+# Will echo value of the provided variablePrefix from the commit message Example useage and output:
+# $ extractVariable "release" "[skipTests][release=6.3.0]" 
+# $ 6.3.0
+extractVariable()
+{
+    local variablePrefix=$1 commitMessage=$2
+    regex="\[$variablePrefix[^\]]*=\K[^\]]*(?=\])" 
+    echo $commitMessage | grep -Po $regex
+}
+
+echo "common_function.sh loaded"
--- a/scripts/travis/V2/companyReleaseDeployment.sh
+++ b/scripts/travis/V2/companyReleaseDeployment.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+. ./scripts/travis/common_functions.sh
+
+releaseVersion=$(extractVariable "release" "$TRAVIS_COMMIT_MESSAGE")
+comReleaseVersion==$(extractVariable "comRelease" "$TRAVIS_COMMIT_MESSAGE")
+if [ -z ${comReleaseVersion} ] || [ -z ${releaseVersion} ];
+then
+  echo "Please provide a communityReleaseVersion and releaseVersion via commit message in the format [comRelease=<acs-version>-<additional-info>] and [release=<acs-version>-<additional-info>] (eg. [release=6.3.0-EA][comRelease=202001])"
+  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/$comReleaseVersion-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-$releaseVersion.zip $DESTINATION/alfresco-content-services-community-distribution-$releaseVersion.zip
--- a/scripts/travis/V2/mavenRelease.sh
+++ b/scripts/travis/V2/mavenRelease.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+. ./scripts/travis/common_functions.sh
+
+releaseVersion=$(extractVariable "release" "$TRAVIS_COMMIT_MESSAGE")
+developmentVersion=$(extractVariable "devRelease" "$TRAVIS_COMMIT_MESSAGE")
+
+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 via commit message in the format [release=<acs-version>-<additional-info>] and [devRelease=<acs-version>-<additional-info>]  (eg. [release=6.3.0-EA][devRelease=6.3.0-SNAPSHOT])"
+  exit -1
+         exit -1
+    # TODO: Set up continuous release. As of REPO-4735 the following is not required if release stage is manual
+    # mvn --batch-mode \
+    # -Dusername="${GIT_USERNAME}" \
+    # -Dpassword="${GIT_PASSWORD}" \
+    # -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} " \
+    # -Prelease \
+    # release:prepare release:perform
+else   
+    mvn --batch-mode \
+    -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} " \
+    release:clean release:prepare release:perform \
+    -Prelease
+fi
--- a/scripts/travis/V2/prepareEngineeringRelease.sh
+++ b/scripts/travis/V2/prepareEngineeringRelease.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+. ./scripts/travis/common_functions.sh
+
+releaseVersion=$(extractVariable "release" "$TRAVIS_COMMIT_MESSAGE")
+
+if [ -z ${releaseVersion} ];
+then
+  echo "Please provide a releaseVersion via commit message in the format [release=<acs-version>-<additional-info>] (eg. [release=6.3.0-EA])"
+  exit -1
+fi
+
+DEPLOYMENT_DIR=deploy_dir
+
+mkdir $DEPLOYMENT_DIR -p
+cp war/target/alfresco.war ${DEPLOYMENT_DIR}
+cp distribution/target/alfresco-content-services-community-distribution-$releaseVersion.zip ${DEPLOYMENT_DIR}
--- a/scripts/travis/V2/verifyReleaseTag.sh
+++ b/scripts/travis/V2/verifyReleaseTag.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+. ./scripts/travis/common_functions.sh
+
+releaseVersion=$(extractVariable "release" "$TRAVIS_COMMIT_MESSAGE")
+
+if [ -v ${releaseVersion} ]||[ -z ${releaseVersion} ]; then
+    # if we don't have a user added release version, get the verison from the pom
+    # TODO: Set up continuous release. As of REPO-4735 the following is not required if release stage is manual
+    # pom_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+    # if echo $pom_version | grep -q  ".*-SNAPSHOT"; then
+    #     releaseVersion=${pom_version%-*}  # remove everything after the last '-'
+    # else
+    #     releaseVersion=$pom_version
+    # fi
+    echo "Please provide a releaseVersion via commit message in the format [release=<acs-version>-<additional-info>] (eg. [release=6.3.0-EA])"
+    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:$releaseVersion"
+
+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 $releaseVersion already pushed, release process will interrupt."
+    exit -1 
+else
+    echo "The $releaseVersion tag was not found"
+fi
--- a/scripts/travis/companyReleaseDeployment.sh
+++ b/scripts/travis/companyReleaseDeployment.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
--- a/scripts/travis/mavenRelease.sh
+++ b/scripts/travis/mavenRelease.sh
@@ -0,0 +1,42 @@
+#!/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
+    # TODO: Set up continuous release. As of REPO-4735 the following is not required if release stage is manual
+    # mvn --batch-mode \
+    # -Dusername="${GIT_USERNAME}" \
+    # -Dpassword="${GIT_PASSWORD}" \
+    # -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} " \
+    # -Prelease \
+    # release:prepare release:perform
+else   
+    mvn --batch-mode \
+    -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} " \
+    release:clean release:prepare release:perform \
+    -Prelease
+fi
--- a/scripts/travis/prepareEngineeringRelease.sh
+++ b/scripts/travis/prepareEngineeringRelease.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -e
+
+if [ -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
+
+DEPLOYMENT_DIR=deploy_dir
+
+mkdir $DEPLOYMENT_DIR -p
+cp war/target/alfresco.war ${DEPLOYMENT_DIR}
+cp distribution/target/alfresco-content-services-community-distribution-$RELEASE_VERSION.zip ${DEPLOYMENT_DIR}
--- a/scripts/travis/verifyReleaseTag.sh
+++ b/scripts/travis/verifyReleaseTag.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+set -e
+
+if [ -v ${RELEASE_VERSION} ]||[ -z ${RELEASE_VERSION} ]; then
+    # if we don't have a user added release version, get the verison from the pom
+    # TODO: Set up continuous release. As of REPO-4735 the following is not required if release stage is manual
+    # pom_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+    # if echo $pom_version | grep -q  ".*-SNAPSHOT"; then
+    #     RELEASE_VERSION=${pom_version%-*}  # remove everything after the last '-'
+    # else
+    #     RELEASE_VERSION=$pom_version
+    # fi
+    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
--- a/tests/environment/.env
+++ b/tests/environment/.env
@@ -1,4 +1,4 @@
 TRANSFORMERS_TAG=2.1.1
-SOLR6_TAG=1.4.0
+SOLR6_TAG=1.4.1
 POSTGRES_TAG=11.4
 ACTIVEMQ_TAG=5.15.8
--- a/war/pom.xml
+++ b/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.3.0-repo-4735-3-1</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -95,12 +95,6 @@
            <classifier>tests</classifier>
            <scope>test</scope>
        </dependency>
-        <!-- required by GDocs-->
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-test</artifactId>