[maven-release-plugin][skip ci] prepare release acs-community-packaging-repo-4735-10

Manually set dockerfile directory for the fabric8 plugin
[maven-release-plugin][skip ci] prepare for next development iteration
2025-09-10 14:12:09 +00:00 · 2020-02-26 12:22:47 +00:00 · 2020-02-26 12:19:14 +00:00 · 2020-02-26 11:14:53 +00:00 · 2020-02-26 11:14:47 +00:00 · 2020-02-26 11:12:11 +00:00
21 changed files with 331 additions and 48 deletions
--- a/.travis.settings.xml
+++ b/.travis.settings.xml
@@ -0,0 +1,44 @@
+<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>alfresco-public</id>
+            <username>${env.MAVEN_USERNAME}</username>
+            <password>${env.MAVEN_PASSWORD}</password>
+        </server>
+    </servers>
+</settings>
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 dist: xenial
-sudo: required
+os: linux
 language: java
 jdk:
  - openjdk11
@@ -19,10 +19,18 @@ branches:
  only:
    - master
    - develop
+    - feature/REPO-4735_Add-release-stages

-matrix:
+stages:
+  - name: test
+    if: branch !=feature/REPO-4735_Add-release-stages
+  - engineering release
+  - company release
+
+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:
@@ -88,3 +96,81 @@ 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"
+      # only on develop or master branch
+      if: fork = false AND branch = feature/REPO-4735_Add-release-stages AND commit_message !~ /\[no-release\]/
+      # Leaving blank will auto increment the 
+      env: 
+        - release_version=repo-4735-8
+        - development_version=6.3.0-alpha-6-SNAPSHOT
+        - COMM_RELEASE_VERSION=
+      # 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: 
+        - ./scripts/travis/verifyReleaseTag.sh 
+        - "cp .travis.settings.xml $HOME/.m2/settings.xml"
+      install: skip  
+      script:
+        # Use full history for release
+        - git checkout -B "${TRAVIS_BRANCH}"
+        # Add email to link commits to user
+        - git config user.email "${GIT_EMAIL}"
+        # Add login to quay.io
+        - docker login quay.io -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}
+        # run build release script
+        #- ./scripts/travis/buildRelease.sh ${release_version} ${development_version}
+        - travis_wait 30 mvn -B -DskipTests -Darguments="-DskipTests" -PtravisRelease -X -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DdevelopmentVersion=6.3.0-alpha-6-SNAPSHOT -DreleaseVersion=repo-4735-10 release:clean release:prepare release:perform
+        #- travis_wait 30 mvn -B -DskipTests -Darguments="-DskipTests" -PtravisRelease -X -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DdevelopmentVersion=6.3.0-alpha-6-SNAPSHOT -DreleaseVersion=repo-4735-10 release:prepare
+        #- travis_wait 30 mvn -B -DskipTests -Darguments="-DskipTests" -PtravisRelease -X -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DdevelopmentVersion=6.3.0-alpha-6-SNAPSHOT -DreleaseVersion=repo-4735-10 release:perform
+      # TODO: SOLUTION 1
+      # Below is a potential solution for deployment of resources
+      # deploy:
+      # - provider: s3
+      #   access_key_id: ${AWS_ACCESS_KEY_ID}
+      #   secret_access_key: ${AWS_SECRET_ACCESS_KEY}
+      #   bucket: "alfresco-artefacts-staging/alfresco-content-services-community/release/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER}/"
+      #   skip_cleanup: true
+      #   acl: private
+      #   glob: war/target/alfresco.war
+      #   on: 
+      #     all_branches:true
+      #     condition: $TRAVIS_BRANCH =~ ^(master|develop)$
+      # - provider: s3
+      #   access_key_id: ${AWS_ACCESS_KEY_ID}
+      #   secret_access_key: ${AWS_SECRET_ACCESS_KEY}
+      #   bucket: "alfresco-artefacts-staging/alfresco-content-services-community/release/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER}/"
+      #   skip_cleanup: true
+      #   acl: private
+      #   glob: distribution/target/*-distribution*.zip
+      #    on: 
+      #     all_branches:true
+      #     condition: $TRAVIS_BRANCH =~ ^(master|develop)$
+      # TODO: SOLUTION 2
+      # Uses AWS CLI in script
+      before_deploy: pip install awscli
+      deploy:
+        - provider: script
+          script: echo "This should only run on master and develop" #./scripts/travis/engineeringReleaseDeployment.sh ${TRAVIS_BUILD_NUMBER} ${TRAVIS_BRANCH}
+          on:
+            all_branches: true
+            condition: $TRAVIS_BRANCH =~ ^(master|develop)$
+        - provider: script
+          script: echo "This should only fun on master" #./scripts/travis/companyReleaseDeployment.sh ${TRAVIS_BUILD_NUMBER} ${TRAVIS_BRANCH}
+          on:
+            branch: master
+    #   # This stage could use a script to deploy to S3, as in bamboo, or the above stage can include a deploy section.
+    # - name: Push to S3 # TODO currently placeholder stage
+    #   install: skip 
+    #   script:
+    #     - travis_wait 30 echo "This is the Push to S3 stage" 
+    # - stage: "Company Release"
+    #   # only on master branch
+    #   if: fork = false AND branch = feature/REPO-4735_Add-release-stages AND commit_message !~ /\[no-release\]/
+    #   name: "Copy to S3 Release"
+    #   install: skip # Nothing to build/install as we are just copying from S3 buckets
+    #   # TODO
+      # delpoy:
+      #   - provider: script
+      #     script: ./scripts/travis/companyReleaseDeployment.sh ${TRAVIS_BUILD_NUMBER} ${TRAVIS_BRANCH}
+      #     on:
+      #       branch: master
--- 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>repo-4735-10</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,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>repo-4735-10</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -223,7 +223,7 @@
                        <image>
                            <name>${image.name}</name>
                            <build>
-                                <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                <contextDir>${project.basedir}/</contextDir>
                            </build>
                        </image>
                    </images>
@@ -269,7 +269,7 @@
                                    <name>${image.name}:${image.tag}</name>
                                    <registry>${image.registry}</registry>
                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                        <contextDir>${project.basedir}/</contextDir>
                                    </build>
                                </image>
                            </images>
@@ -303,13 +303,13 @@
                                    <name>${image.name}</name>
                                    <registry>${image.registry}</registry>
                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                        <contextDir>${project.basedir}/</contextDir>
                                    </build>
                                </image>
                                <image>
                                    <name>${image.name}</name>
                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                        <contextDir>${project.basedir}/</contextDir>
                                    </build>
                                </image>
                            </images>
@@ -343,13 +343,52 @@
                                    <name>${image.name}:${project.version}</name>
                                    <registry>${image.registry}</registry>
                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                        <contextDir>${project.basedir}/</contextDir>
                                    </build>
                                </image>
                                <image>
                                    <name>${image.name}:${project.version}</name>
                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
+                                        <contextDir>${project.basedir}/</contextDir>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>build-push-image</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>travisRelease</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>fabric8-maven-plugin</artifactId>
+                        <version>${dependency.fabric8.version}</version>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${image.name}:test-release-${project.version}</name>
+                                    <registry>${image.registry}</registry>
+                                    <build>
+                                        <contextDir>${project.basedir}/</contextDir>
+                                    </build>
+                                </image>
+                                <image>
+                                    <name>${image.name}:test-release-${project.version}</name>
+                                    <build>
+                                        <contextDir>/home/travis/build/Alfresco/acs-community-packaging/docker-alfresco</contextDir>
                                    </build>
                                </image>
                            </images>
--- a/docker-alfresco/test/.env
+++ b/docker-alfresco/test/.env
@@ -1,7 +1,7 @@
 ALFRESCO_TAG=latest
 TRANSFORMERS_TAG=2.1.0
 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>repo-4735-10</version>
    <packaging>pom</packaging>

    <parent>
@@ -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-repo-4735-10</tag>
    </scm>

    <distributionManagement>
@@ -96,7 +96,7 @@
        <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.googledrive.version>3.2.0-A2</alfresco.googledrive.version>

        <!-- Alfresco Office Services Module -->
        <alfresco.aos-module.version>1.3.0</alfresco.aos-module.version>
@@ -116,6 +116,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 +284,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 +545,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>repo-4735-10</version>
 	<relativePath>../pom.xml</relativePath>
    </parent>
    <packaging>pom</packaging>
--- a/scripts/travis/buildRelease.sh
+++ b/scripts/travis/buildRelease.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+set -e
+
+releaseVersion=$1
+developmentVersion=$2
+scm_path=$(mvn help:evaluate -Dexpression=project.scm.url -q -DforceStdout)
+
+git checkout -B "${TRAVIS_BRANCH}"
+
+if [ -z ${releaseVersion} ] || [ -z ${developmentVersion} ]; 
+    then echo skip 
+    if ${TRAVIS_BRANCH} == "master"; 
+    then echo "Please provide a Release and Development verison"
+        exit -1
+    fi
+    # 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} " \
+    -Prelease \
+    release:clean release:prepare release:perform
+fi
--- a/scripts/travis/companyReleaseDeployment.sh
+++ b/scripts/travis/companyReleaseDeployment.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -e
+
+if [ ${COMM_RELEASE_VERSION} = "" ];
+then
+  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/engineeringReleaseDeployment.sh
+++ b/scripts/travis/engineeringReleaseDeployment.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+set -env
+
+build_number=$1
+branch_name=$2
+release_stage=release
+s3_location=s3://alfresco-artefacts-staging/alfresco-content-services-community/$release_stage/$branch_name/$build_number/
+echo_s3_location=https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/alfresco-content-services-community/$release_stage
+
+aws s3 cp --acl private war/target/alfresco.war $s3_location
+aws s3 cp --acl private distribution/target/*-distribution*.zip $s3_location
+
+mkdir -p target
+touch target/README.txt
+
+distribution_zip_name=`ls distribution/target/*-distribution*.zip | xargs -n 1 basename`
+
+echo "
+$echo_s3_location/$branch_name/$build_number/alfresco.war\n
+$echo_s3_location/$branch_name/$build_number/$distribution_zip_name\n
+" >> target/README.txt
--- a/scripts/travis/verifyReleaseTag.sh
+++ b/scripts/travis/verifyReleaseTag.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+set -e
+
+alfresco_docker_image="alfresco/alfresco-content-repository-community"
+if [ -v ${release_version} ]||[ -z ${release_version} ]; then
+    # if we don't have a user added release version, get the verison from the pom
+    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
+fi
+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.0
-SOLR6_TAG=1.4.0
+SOLR6_TAG=1.4.1
 POSTGRES_TAG=11.4
 ACTIVEMQ_TAG=5.15.8
--- a/tests/pom.xml
+++ b/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.3.0-alpha-6-SNAPSHOT</version>
    <packaging>pom</packaging>

    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>6.3.0-SNAPSHOT</version>
+        <version>6.3.0-alpha-6-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/tests/tas-cmis/pom.xml
+++ b/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.3.0-alpha-6-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.3.0-alpha-6-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/tests/tas-email/pom.xml
+++ b/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.3.0-alpha-6-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.3.0-alpha-6-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/tests/tas-integration/pom.xml
+++ b/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.3.0-alpha-6-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.3.0-alpha-6-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/tests/tas-restapi/pom.xml
+++ b/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.3.0-alpha-6-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.3.0-alpha-6-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/tests/tas-webdav/pom.xml
+++ b/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.3.0-alpha-6-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.3.0-alpha-6-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- 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>repo-4735-10</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>