inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pull in upstream projects, include Share 6.2.1-RC2 and [release] ACS 6.2.1-RC1

Browse Source
This commit is contained in:
Alan Davis
2020-04-24 15:49:23 +01:00
parent d1709e19a4
commit 8c5df8a623
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -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:

6
pom.xml
View File

@@ -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>

2
tests/environment/.env
View File

@@ -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

2
tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/AvailableRenditionTests.java
View File

@@ -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)
{