From 8c5df8a6238af561cc3c5a88d382ef7aa88d21b7 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 24 Apr 2020 15:49:23 +0100
Subject: [PATCH] Pull in upstream projects, include Share 6.2.1-RC2 and
 [release] ACS 6.2.1-RC1

---
 .travis.yml                                                 | 2 +-
 pom.xml                                                     | 6 +++---
 tests/environment/.env                                      | 2 +-
 .../alfresco/rest/renditions/AvailableRenditionTests.java   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 64b41e392c..207c2c537b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ 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-A-x
-    - RELEASE_VERSION=6.2.1-A2
+    - RELEASE_VERSION=6.2.1-RC1
     - DEVELOPMENT_VERSION=6.2.1-SNAPSHOT
     - COMM_RELEASE_VERSION=
 branches:
diff --git a/pom.xml b/pom.xml
index c781332afc..d1c657bea0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,9 +68,9 @@
         <version.edition>Community</version.edition>
         <image.tag>latest</image.tag>
 
-        <dependency.alfresco-remote-api.version>7.123</dependency.alfresco-remote-api.version>
-        <dependency.alfresco-repository.version>7.167</dependency.alfresco-repository.version>
-        <dependency.alfresco-data-model.version>8.50.10</dependency.alfresco-data-model.version>
+        <dependency.alfresco-remote-api.version>7.125</dependency.alfresco-remote-api.version>
+        <dependency.alfresco-repository.version>7.171</dependency.alfresco-repository.version>
+        <dependency.alfresco-data-model.version>8.50.11</dependency.alfresco-data-model.version>
         <dependency.alfresco-core.version>7.31</dependency.alfresco-core.version>
 
         <dependency.alfresco-hb-data-sender.version>1.0.12</dependency.alfresco-hb-data-sender.version>
diff --git a/tests/environment/.env b/tests/environment/.env
index 935779c133..20a19784c8 100644
--- a/tests/environment/.env
+++ b/tests/environment/.env
@@ -1,4 +1,4 @@
-TRANSFORMERS_TAG=2.2.0-A4
+TRANSFORMERS_TAG=2.2.0-A5
 SOLR6_TAG=1.4.2-RC3
 POSTGRES_TAG=11.4
 ACTIVEMQ_TAG=5.15.8
diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/AvailableRenditionTests.java b/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/AvailableRenditionTests.java
index 73cd4d02f5..e73a7b1c2d 100644
--- a/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/AvailableRenditionTests.java
+++ b/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/AvailableRenditionTests.java
@@ -37,7 +37,7 @@ public class AvailableRenditionTests extends RenditionIntegrationTests
         super.dataPreparation();
 
         // Upload files and get available renditions for each file
-        List<String> toTest = Arrays.asList("doc", "xls", "ppt", "docx", "pptx", "msg", "pdf", "png", "gif", "jpg");
+        List<String> toTest = Arrays.asList("doc", "xls", "ppt", "docx", "xlsx", "pptx", "msg", "pdf", "png", "gif", "jpg");
         List<Object[]> renditionsForFiles = new LinkedList<>();
         for (String extensions : toTest)
         {