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

Merge remote-tracking branch 'remotes/origin/release/V2.7.1.x' into merge-2.7/APPS-236_RunCRTests_merge2.7_no

Browse Source 
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties
#	travis-env-vars.yml
This commit is contained in:
Claudia Agache
2020-08-27 14:10:29 +03:00
parent 3c1eda7601 0ca42acb59
commit 03f04cb580
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties
View File

@@ -7,9 +7,3 @@ log4j.appender.file.File=./target/reports/rm-automation-community-rest-api.log
log4j.appender.file.MaxBackupIndex=10
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
# Direct log messages to stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Threshold=INFO
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n

2
travis-env-vars.yml
View File

@@ -3,4 +3,4 @@ env:
- AUTOMATION_COMMUNITY_PATH=rm-automation/rm-automation-community-rest-api
- AUTOMATION_ENTERPRISE_PATH=rm-automation/rm-automation-enterprise-rest-api
- AUTOMATION_UI_PATH=rm-automation/rm-automation-ui
- S3_INSTALLER_PATH=/eu.dl.alfresco.com/release/community/201707-build-00028/alfresco-community-installer-201707-linux-x64.bin
- S3_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.7/5.2.7.4/alfresco-content-services-installer-5.2.7.4-linux-x64.bin