jjb: Run log4j2 lttng-ust-java-tests with LTTng-tools 2.14+

Change-Id: I96f540afea43ccfaa2df97a7edfa86ae816ca1f2
Signed-off-by: Kienan Stewart <kstewart@efficios.com>

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index d6e9a86b7b79f649912a97ed28dfb22741157a33..75feed5e435d41bd53317cdbebc1b69e1c670d8e 100755 (executable)
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -609,9 +609,15 @@ if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [[ ! "$conf" =~ (no-ust|relayd-only)
             "-Dlog4j-jar-location=${WORKSPACE}/deps/build/share/java/lttng-ust-agent-log4j.jar"
             "-Dlog4j2-jar-location=${WORKSPACE}/deps/build/share/java/lttng-ust-agent-log4j2.jar"
             "-DargLine=-Djava.library.path=${WORKSPACE}/deps/build/${LIBDIR_ARCH}"
-            '-Dgroups=!domain:log4j2'
         )
 
+        # Merged into master ~ 47abf22b48023960069e1d3e23f42298ce4b3c2a
+        if verlt "${PACKAGE_VERSION}" "2.14" ; then
+            LTTNG_UST_JAVA_TESTS_MAVEN_OPTS+=(
+                '-Dgroups=!domain:log4j2'
+            )
+        fi
+
         env "${LTTNG_UST_JAVA_TESTS_ENV[@]}" mvn -version
 
         if [[ -n "${LTTNG_TOOLS_UST_JAVA_TESTS_LOG4J_API_VERSION:-}" ]] ; then