Merge remote-tracking branch 'remotes/origin/release/V2.7' into feature-2.7/APPS-230_BuildAGSArtifactsOnTravis

# Conflicts:
#	.travis.settings.xml
#	.travis.yml

.travis.settings.xml

@@ -5,13 +5,6 @@
          <activation>
             <activeByDefault>true</activeByDefault>
          </activation>
-
-            <!-- Added to automatically download javadoc. -->
-            <properties>
-               <downloadSources>true</downloadSources>
-               <downloadJavadocs>true</downloadJavadocs>
-            </properties>
-
          <repositories>
             <repository>
                <id>alfresco-internal</id>
@@ -27,17 +20,20 @@
          </repositories>
          <pluginRepositories>
             <pluginRepository>
-                  <id>alfresco-private</id>
+               <id>alfresco-internal</id>
                <name>Alfresco Internal Repository</name>
+               <url>https://artifacts.alfresco.com/nexus/content/groups/internal</url>
+            </pluginRepository>
+            <pluginRepository>
+               <id>alfresco-public</id>
+               <name>Alfresco Public Repository</name>
+               <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+            </pluginRepository>
+            <pluginRepository>
+               <id>alfresco-private</id>
+               <name>Alfresco Private Repository</name>
                <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
             </pluginRepository>
-               <!--
-               <pluginRepository>
-                 <id>alfresco-internal-snapshots</id>
-                 <name>Alfresco Internal Snapshots Repository</name>
-                 <url>https://artifacts.alfresco.com/nexus/content/repositories/enterprise-snapshots</url>
-                </pluginRepository>
-               -->
          </pluginRepositories>
       </profile>
    </profiles>

.travis.yml

@@ -1,6 +1,5 @@
 os: linux
 dist: xenial
-sudo: false
 language: java
 jdk:
   - openjdk8
@@ -22,7 +21,7 @@ before_cache:
 
 before_install:
   - "cp .travis.settings.xml $HOME/.m2/settings.xml"
-install: skip
+install: true
 
 stages:
   - name: Build AGS
@@ -34,21 +33,19 @@ stages:
 
 jobs:
   include:
-
     - name: "Build AGS Community"
       stage: Build AGS
       before_install: source scripts/setUpMavenPhase.sh
       install:
         - travis_retry travis_wait 80 mvn ${MAVEN_PHASE} -B -q -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-        script: skip
 
     - name: "Build AGS Enterprise"
       stage: Build AGS
       before_install: source scripts/setUpMavenPhase.sh
       install:
         - travis_retry travis_wait 60 mvn clean install -B -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      script:
         - travis_retry travis_wait 60 mvn ${MAVEN_PHASE} -B -q -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-        script: skip
 
     - name: "AGS Benchmark"
       stage: Build AGS
@@ -60,21 +57,48 @@ jobs:
 
     - name: "Community Integrations Tests on MySQL"
       stage: Tests
+      script:
+        - echo "Community Integrations Tests on MySQL"
     - name: "Enterprise Integrations Tests on MySQL"
+      stage: Tests
+      script:
+        - echo "Enterprise Integrations Tests on MySQL"
     - name: "Community Rest API Tests"
+      stage: Tests
+      script:
+        - echo "Community Rest API Tests"
     - name: "Enterprise Rest API Tests"
+      stage: Tests
+      script:
+        - echo "Enterprise Rest API Tests"
     - name: "Community UI Tests ..."
+      stage: Tests
+      script:
+        - echo "Community UI Tests ..."
     - name: "Enterprise UI Tests ..."
+      stage: Tests
+      script:
+        - echo "Enterprise UI Tests ..."
 
     - name: "Source Clear Scan (SCA)"
       stage: Security Scans
+      script:
+       - echo "Source Clear Scan (SCA)"
     - name: "Static Analysis (SAST)"
-
+      stage: Security Scans
+      script:
+       - echo "Static Analysis (SAST)"
 
     - name: "Community Release"
       stage: Release
+      script:
+        - echo "Community Release"
     - name: "Enterprise Release"
+      stage: Release
+      script:
+        - echo "Enterprise Release"
 
     - name: "Copy to S3 Release Bucket"
       stage: Publish
-
+      script:
+        - echo "Copy to S3 Release Bucket"