jjb: common: add log4j 2.x jars in CLASSPATH

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I0aa05ade2d09deabcbd72d3ee17be75f5ac48144

diff --git a/scripts/common/coverity.sh b/scripts/common/coverity.sh
index a44a962bf29c501a760c0f515b573535f600aa27..d23160af514ac6642d43a9a8e5db111d78397619 100755 (executable)
--- a/scripts/common/coverity.sh
+++ b/scripts/common/coverity.sh
@@ -85,7 +85,7 @@ lttng-tools)
 lttng-ust)
     CONF_OPTS="--enable-java-agent-all --enable-python-agent"
     BUILD_TYPE="autotools"
-    export CLASSPATH="/usr/share/java/log4j-1.2.jar"
+    export CLASSPATH="/usr/share/java/log4j-api.jar:/usr/share/java/log4j-core.jar:/usr/share/java/log4j-1.2.jar"
     ;;
 lttng-scope|ctf-java|libdelorean-java|jabberwocky)
     CONF_OPTS=""

diff --git a/scripts/common/scan-build.sh b/scripts/common/scan-build.sh
index e5652b19a75688316cff7516b1827ff78843a8ca..9f3caea8ef02edfe836942ce907471d0ef677515 100755 (executable)
--- a/scripts/common/scan-build.sh
+++ b/scripts/common/scan-build.sh
@@ -77,7 +77,7 @@ lttng-tools)
 lttng-ust)
     CONF_OPTS="--enable-java-agent-all --enable-python-agent"
     BUILD_TYPE="autotools"
-    export CLASSPATH="/usr/share/java/log4j-1.2.jar"
+    export CLASSPATH="/usr/share/java/log4j-api.jar:/usr/share/java/log4j-core.jar:/usr/share/java/log4j-1.2.jar"
     ;;
 *)
     echo "Generic project, no configure options."