[maven-release-plugin][skip ci] prepare release acs-community-packaging-6.3.0-repo-4735-2-9

Should now be: alfresco/alfresco-content-repository-community-test-release:tag

.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

@@ -10,7 +10,9 @@ services:
 cache:
   directories:
     - $HOME/.m2
-
+# the cache can grow constantly
+before_cache:
+  - rm -rf $HOME/.m2/repository/org/alfresco
 env:
   global:
     - VERSION_EDITION=Community
@@ -19,10 +21,20 @@ branches:
   only:
     - master
     - develop
+    - feature/REPO-4735_Add-release-stages-2
+
+stages:
+  - name: test
+    if: branch !=feature/REPO-4735_Add-release-stages-2
+  - engineering release
+  - company release
+
+before_install: "cp .travis.settings.xml $HOME/.m2/settings.xml"
 
 matrix:
   include:
-    - name: "WhiteSource scan"
+    - stage: test
+      name: "WhiteSource scan"
       # only on master and if it is not a PR
       if: fork = false AND branch = master AND type != pull_request
       install:
@@ -88,3 +100,83 @@ 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-2 AND commit_message !~ /\[no-release\]/
+      # Leaving blank will auto increment the 
+      env: 
+        # Must be in the format <alfresco-version>-<additional_versioning> ie. 6.3.0-repo-xxxx-x or 6.3.0-A-x
+        - release_version=6.3.0-repo-4735-2-9
+        - development_version=6.3.0-SNAPSHOT
+        - COMM_RELEASE_VERSION=
+      install: travis_wait 30 mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -q
+      # 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: bash ./scripts/travis/verifyReleaseTag.sh 
+      script:
+        # Use full history for release
+        - git checkout -B "${TRAVIS_BRANCH}"
+        # Add email to link commits to user
+        - git config user.email "${GIT_EMAIL}"
+        # run build release script
+        # - ./scripts/travis/buildRelease.sh ${release_version} ${development_version}
+        # - travis_wait 30 mvn -B -DskipTests -Darguments="-DskipTests"
+        - travis_wait 30 mvn -B -DskipTests -Darguments="-DskipTests" -Prelease -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DdevelopmentVersion=${development_version} -DreleaseVersion=${release_version} release:prepare -q
+        - travis_wait 30 mvn -B -DskipTests -Darguments="-DskipTests" -Prelease -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DdevelopmentVersion=${development_version} -DreleaseVersion=${release_version} release:perform -X
+      after_failure: 
+        - mvn release:rollback -DscmCommen  tPrefix="[maven-release-plugin][skip ci] "
+      # 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"
+      #   skip_cleanup: true
+      #   acl: private
+      #   upload_dir:"/alfresco-content-services-community/release/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER}/"
+      #   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/"
+      #   skip_cleanup: true
+      #   acl: private
+      #   upload_dir: "alfresco-content-services-community/release/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER}/"
+      #   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 run 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
+      

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-2-9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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 LINUXUSERNAME=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} ${LINUXUSERNAME} && \
     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 ${LINUXUSERNAME}

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.3.0-repo-4735-2-9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -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,19 +335,21 @@
                 <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>
-                                    <name>${image.name}:${project.version}</name>
+                                    <alias>quay.io</alias>
+                                    <name>${image.name}-test-release:${project.version}</name>
                                     <registry>${image.registry}</registry>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
                                     </build>
                                 </image>
                                 <image>
-                                    <name>${image.name}:${project.version}</name>
+                                    <alias>dockerhub</alias>
+                                    <name>${image.name}-test-release:${project.version}</name>
                                     <build>
                                         <dockerFileDir>${project.basedir}/</dockerFileDir>
                                     </build>

docker-alfresco/test/.env

@@ -4,6 +4,6 @@ SHARE_TAG=6.2.0
 SOLR6_TAG=1.4.1
 POSTGRES_TAG=11.4
 ACTIVEMQ_TAG=5.15.8
-REGISTRY=
+REGISTRY=test-
 LEGACY_TRANSFORM_SERVICE_ENABLED=true
 LOCAL_TRANSFORM_SERVICE_ENABLED=true

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-2-9</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-2-9</tag>
     </scm>
 
     <distributionManagement>
@@ -86,6 +86,7 @@
 
         <dependency.spring.version>5.2.2.RELEASE</dependency.spring.version>
         <dependency.fabric8.version>4.3.1</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.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>
+        
+        <maven.build.sourceVersion>11</maven.build.sourceVersion>
     </properties>
 
     <dependencyManagement>
@@ -543,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>

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-2-9</version>
 	<relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

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

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

scripts/travis/engineeringReleaseDeployment.sh

@@ -0,0 +1,16 @@
+#!/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`

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

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-2-9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>