You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2018/01/11 05:17:35 UTC
asterixdb git commit: [NO ISSUE] Override log4j2 config file location
when required
Repository: asterixdb
Updated Branches:
refs/heads/master 50860b839 -> 119523489
[NO ISSUE] Override log4j2 config file location when required
Define log4j2 config file for failsafe plugin
Change-Id: I8b451241063001718fb35efc8336b773101298ab
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2271
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Tested-by: Murtadha Hubail <mh...@apache.org>
Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/11952348
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/11952348
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/11952348
Branch: refs/heads/master
Commit: 11952348969d0e99365fe9f44654720c909cfc5d
Parents: 50860b8
Author: Michael Blow <mi...@couchbase.com>
Authored: Wed Jan 10 20:11:43 2018 -0500
Committer: Michael Blow <mb...@apache.org>
Committed: Wed Jan 10 21:17:17 2018 -0800
----------------------------------------------------------------------
asterixdb/asterix-maven-plugins/pom.xml | 1 +
asterixdb/pom.xml | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/11952348/asterixdb/asterix-maven-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-maven-plugins/pom.xml b/asterixdb/asterix-maven-plugins/pom.xml
index c76c286..2cb4d36 100644
--- a/asterixdb/asterix-maven-plugins/pom.xml
+++ b/asterixdb/asterix-maven-plugins/pom.xml
@@ -39,6 +39,7 @@
<properties>
<appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory>
+ <testLog4jConfigFile>${basedir}/../../asterix-app/src/test/resources/log4j2-test.xml</testLog4jConfigFile>
</properties>
<modules>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/11952348/asterixdb/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index aa08bc3..5bed915 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -55,6 +55,7 @@
<maven.test.skip>false</maven.test.skip>
<skip.surefire.tests>${skipTests}</skip.surefire.tests>
<skip.testResources>${maven.test.skip}</skip.testResources>
+ <testLog4jConfigFile>${basedir}/../asterix-app/src/test/resources/log4j2-test.xml</testLog4jConfigFile>
<!-- Definition of tests in various categories which may be excluded -->
<repeated.tests>**/RepeatedTest.java</repeated.tests>
@@ -94,12 +95,14 @@
-enableassertions -Xmx${test.heap.size}m
-Dfile.encoding=UTF-8
-Djava.util.logging.config.file=${user.home}/logging.properties
- -Dlog4j.configurationFile=${basedir}/../asterix-app/src/test/resources/log4j2-test.xml
-DrunSlowAQLTests=${runSlowAQLTests}
-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=${debug.suspend.flag}
${coverageArgLine}
</argLine>
+ <systemProperties>
+ <log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile>
+ </systemProperties>
<includes>
<include>${global.test.includes},${test.includes}</include>
</includes>
@@ -117,6 +120,9 @@
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<argLine>${coverageArgLine}</argLine>
+ <systemProperties>
+ <log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile>
+ </systemProperties>
</configuration>
<executions>
<execution>