X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fcommon-variables.sh;h=0001ac835b2e5638de0aed671ca494be0e7d5d09;hb=04547fcca5cabd3d9ad24fced4a0cf268d789296;hp=5092a8eaa8cdc2112d542363df2781bd555a0c6d;hpb=6b4eba38370203ded897068371a4e50255ef588b;p=releng%2Fglobal-jjb.git

diff --git a/shell/common-variables.sh b/shell/common-variables.sh
index 5092a8ea..0001ac83 100644
--- a/shell/common-variables.sh
+++ b/shell/common-variables.sh
@@ -13,20 +13,12 @@ echo "---> common-variables.sh"
 # scripts. It is meant to be sourced in other scripts so that the variables can
 # be called.
 
+# shellcheck disable=SC2140
 MAVEN_OPTIONS="$(echo --show-version \
     --batch-mode \
     -Djenkins \
-    -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
+    "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer"\
+".Slf4jMavenTransferListener=warn" \
     -Dmaven.repo.local=/tmp/r \
     -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r)"
 echo "$MAVEN_OPTIONS"
-
-# Activates the lftools virtualenv
-lftools_activate() {
-    echo "WARNING: lftools_activate should no longer be used and will be removed in a future release."
-    virtualenv --quiet "/tmp/v/lftools"
-    set +u  # Ignore unbound variables in activate
-    # shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
-    source "/tmp/v/lftools/bin/activate"
-    set -u  # Restore unbound variable checking
-}