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 e7fcac91fcb82e66762ec90abcb3782a24b4a87c..8f667c59044117b9c997ed224755bd42e530326e 100755 (executable)
--- 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)