From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 18 Feb 2022 16:01:23 +0000 (-0500)
Subject: jjb: lttng-ust: Add log4j2 to agents config
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=efb13b46b3c201769386cf5c2885ccd56d3a63aa;p=lttng-ci.git

jjb: lttng-ust: Add log4j2 to agents config

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

diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index e7fcac9..8f667c5 100755
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -231,6 +231,11 @@ agents)
     echo "Java and Python agents configuration"
 
     CONF_OPTS+=("--enable-java-agent-all" "--enable-jni-interface" "--enable-python-agent")
+
+    # Explicitly add '--enable-java-agent-log4j2', it's not part of '-all' in stable 2.12/2.13
+    if verlt "$PACKAGE_VERSION" "2.14"; then
+	    CONF_OPTS+=("--enable-java-agent-log4j2")
+    fi
     ;;
 
 debug-rcu)