Merge "Let NEXUSPROXY override NEXUS_URL if both are set"

diff --combined .jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
index 452a00f,c82b58a..88d2c9c
--- 1/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
--- 2/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder
@@@ -76,7 -76,7 +76,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.0.2</defaultValue>
 +          <defaultValue>1.1.1</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -205,7 -205,7 +205,7 @@@
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.0.2
 +        <propertiesContent>PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -315,7 -315,7 +315,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=centos
  PACKER_TEMPLATE=java-builder
 -PACKER_VERSION=1.0.2
 +PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -494,7 -494,7 +494,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -620,7 -620,7 +620,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
index 07f1ec4,05f8247..5ba5f1f
--- 1/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
--- 2/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet
@@@ -76,7 -76,7 +76,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.0.2</defaultValue>
 +          <defaultValue>1.1.1</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -205,7 -205,7 +205,7 @@@
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.0.2
 +        <propertiesContent>PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -315,7 -315,7 +315,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=centos
  PACKER_TEMPLATE=mininet
 -PACKER_VERSION=1.0.2
 +PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -494,7 -494,7 +494,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -620,7 -620,7 +620,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
index f7f6b57,27b47a3..14ab24c
--- 1/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
--- 2/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder
@@@ -76,7 -76,7 +76,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.0.2</defaultValue>
 +          <defaultValue>1.1.1</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -205,7 -205,7 +205,7 @@@
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.0.2
 +        <propertiesContent>PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -315,7 -315,7 +315,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=ubuntu1604
  PACKER_TEMPLATE=java-builder
 -PACKER_VERSION=1.0.2
 +PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -494,7 -494,7 +494,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -620,7 -620,7 +620,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
index f4609d2,e18ea26..75e7acd
--- 1/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
--- 2/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet
@@@ -76,7 -76,7 +76,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.0.2</defaultValue>
 +          <defaultValue>1.1.1</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -205,7 -205,7 +205,7 @@@
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.0.2
 +        <propertiesContent>PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -315,7 -315,7 +315,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=ubuntu1604
  PACKER_TEMPLATE=mininet
 -PACKER_VERSION=1.0.2
 +PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -494,7 -494,7 +494,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -620,7 -620,7 +620,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/gerrit-ciman-packer-verify
index b27b0d0,3c8b46e..7d080da
--- 1/.jjb-test/expected-xml/gerrit-ciman-packer-verify
--- 2/.jjb-test/expected-xml/gerrit-ciman-packer-verify
+++ b/.jjb-test/expected-xml/gerrit-ciman-packer-verify
@@@ -76,7 -76,7 +76,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.0.2</defaultValue>
 +          <defaultValue>1.1.1</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -207,7 -207,7 +207,7 @@@
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.0.2
 +        <propertiesContent>PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -384,7 -384,7 +384,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -510,7 -510,7 +510,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/gerrit-maven-maven-clm-master
index b7b10be,f84f056..c7fcce8
--- 1/.jjb-test/expected-xml/gerrit-maven-maven-clm-master
--- 2/.jjb-test/expected-xml/gerrit-maven-maven-clm-master
+++ b/.jjb-test/expected-xml/gerrit-maven-maven-clm-master
@@@ -74,11 -74,6 +74,11 @@@ For example '<1.0.0' or '>=1.0.0,
  </description>
            <defaultValue>&lt;1.0.0</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>M2_HOME</name>
 +          <description>Maven selector to be used by shell scripts</description>
 +          <defaultValue>/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m
@@@ -349,7 -344,7 +349,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -475,7 -470,7 +475,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master
index 5df6131,308dbd3..f821bea
--- 1/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master
--- 2/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master
+++ b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master
@@@ -74,11 -74,6 +74,11 @@@ For example '<1.0.0' or '>=1.0.0,
  </description>
            <defaultValue>&lt;1.0.0</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>M2_HOME</name>
 +          <description>Maven selector to be used by shell scripts</description>
 +          <defaultValue>/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m
@@@ -246,7 -241,7 +246,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -528,7 -523,7 +528,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -654,7 -649,7 +654,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master
index e964e94,b1b924a..95cbcc8
--- 1/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master
--- 2/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master
+++ b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master
@@@ -74,11 -74,6 +74,11 @@@ For example '<1.0.0' or '>=1.0.0,
  </description>
            <defaultValue>&lt;1.0.0</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>M2_HOME</name>
 +          <description>Maven selector to be used by shell scripts</description>
 +          <defaultValue>/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m
@@@ -382,7 -377,7 +382,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -508,7 -503,7 +508,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/gerrit-maven-maven-release-master
index ec86e1e,271ad81..6e9989a
--- 1/.jjb-test/expected-xml/gerrit-maven-maven-release-master
--- 2/.jjb-test/expected-xml/gerrit-maven-maven-release-master
+++ b/.jjb-test/expected-xml/gerrit-maven-maven-release-master
@@@ -74,11 -74,6 +74,11 @@@ For example '<1.0.0' or '>=1.0.0,
  </description>
            <defaultValue>&lt;1.0.0</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>M2_HOME</name>
 +          <description>Maven selector to be used by shell scripts</description>
 +          <defaultValue>/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m
@@@ -251,7 -246,7 +251,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -558,7 -553,7 +558,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -684,7 -679,7 +684,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8
index 59bf531,9137cb9..f9a5b1b
--- 1/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8
--- 2/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8
+++ b/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8
@@@ -74,11 -74,6 +74,11 @@@ For example '<1.0.0' or '>=1.0.0,
  </description>
            <defaultValue>&lt;1.0.0</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>M2_HOME</name>
 +          <description>Maven selector to be used by shell scripts</description>
 +          <defaultValue>/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m
@@@ -543,7 -538,7 +543,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -669,7 -664,7 +669,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8
index 6003232,7732de0..e079057
--- 1/.jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8
--- 2/.jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8
+++ b/.jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8
@@@ -74,11 -74,6 +74,11 @@@ For example '<1.0.0' or '>=1.0.0,
  </description>
            <defaultValue>&lt;1.0.0</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>M2_HOME</name>
 +          <description>Maven selector to be used by shell scripts</description>
 +          <defaultValue>/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m
@@@ -514,7 -509,7 +514,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -640,7 -635,7 +640,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/gerrit-maven-sonar
index 3575cb7,26b0985..ecbd832
--- 1/.jjb-test/expected-xml/gerrit-maven-sonar
--- 2/.jjb-test/expected-xml/gerrit-maven-sonar
+++ b/.jjb-test/expected-xml/gerrit-maven-sonar
@@@ -74,11 -74,6 +74,11 @@@ For example '<1.0.0' or '>=1.0.0,
  </description>
            <defaultValue>&lt;1.0.0</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>M2_HOME</name>
 +          <description>Maven selector to be used by shell scripts</description>
 +          <defaultValue>/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m
@@@ -433,7 -428,7 +433,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -559,7 -554,7 +559,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/gerrit-rtd-rtd-verify-master
index 08dccd8,700e4eb..1542c94
--- 1/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master
--- 2/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master
+++ b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master
@@@ -81,7 -81,7 +81,7 @@@ For example '<1.0.0' or '>=1.0.0,
      <userRemoteConfigs>
        <hudson.plugins.git.UserRemoteConfig>
          <name>origin</name>
 -        <refspec>$GERRIT_REFSPEC</refspec>
 +        <refspec/>
          <url>$GIT_URL/$PROJECT</url>
          <credentialsId>test-credential</credentialsId>
        </hudson.plugins.git.UserRemoteConfig>
@@@ -327,7 -327,7 +327,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -453,7 -453,7 +453,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
index 9c2c3ae,f093100..de1d780
--- 1/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
--- 2/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
+++ b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder
@@@ -71,7 -71,7 +71,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.0.2</defaultValue>
 +          <defaultValue>1.1.1</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -163,7 -163,7 +163,7 @@@ zxiiro</whitelist
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.0.2
 +        <propertiesContent>PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -273,7 -273,7 +273,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=centos
  PACKER_TEMPLATE=java-builder
 -PACKER_VERSION=1.0.2
 +PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -452,7 -452,7 +452,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -578,7 -578,7 +578,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
index 7b49e9a,9a1e8ea..fd7dca0
--- 1/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
--- 2/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
+++ b/.jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet
@@@ -71,7 -71,7 +71,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.0.2</defaultValue>
 +          <defaultValue>1.1.1</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -163,7 -163,7 +163,7 @@@ zxiiro</whitelist
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.0.2
 +        <propertiesContent>PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -273,7 -273,7 +273,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=centos
  PACKER_TEMPLATE=mininet
 -PACKER_VERSION=1.0.2
 +PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -452,7 -452,7 +452,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -578,7 -578,7 +578,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
index 7cebbac,7fe8901..da26280
--- 1/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
--- 2/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
+++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder
@@@ -71,7 -71,7 +71,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.0.2</defaultValue>
 +          <defaultValue>1.1.1</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -163,7 -163,7 +163,7 @@@ zxiiro</whitelist
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.0.2
 +        <propertiesContent>PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -273,7 -273,7 +273,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=ubuntu1604
  PACKER_TEMPLATE=java-builder
 -PACKER_VERSION=1.0.2
 +PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -452,7 -452,7 +452,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -578,7 -578,7 +578,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
index a50f2d2,b8c5720..cea653e
--- 1/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
--- 2/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
+++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet
@@@ -71,7 -71,7 +71,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.0.2</defaultValue>
 +          <defaultValue>1.1.1</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -163,7 -163,7 +163,7 @@@ zxiiro</whitelist
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.0.2
 +        <propertiesContent>PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -273,7 -273,7 +273,7 @@@ exit 
        <info>
          <propertiesContent>PACKER_PLATFORM=ubuntu1604
  PACKER_TEMPLATE=mininet
 -PACKER_VERSION=1.0.2
 +PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -452,7 -452,7 +452,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -578,7 -578,7 +578,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/github-ciman-packer-verify
index 3e473eb,16d9788..b00f436
--- 1/.jjb-test/expected-xml/github-ciman-packer-verify
--- 2/.jjb-test/expected-xml/github-ciman-packer-verify
+++ b/.jjb-test/expected-xml/github-ciman-packer-verify
@@@ -71,7 -71,7 +71,7 @@@ For example '<1.0.0' or '>=1.0.0,
          <hudson.model.StringParameterDefinition>
            <name>PACKER_VERSION</name>
            <description>Packer version to download and install.</description>
 -          <defaultValue>1.0.2</defaultValue>
 +          <defaultValue>1.1.1</defaultValue>
          </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
@@@ -151,7 -151,7 +151,7 @@@
      </org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep>
      <EnvInjectBuilder>
        <info>
 -        <propertiesContent>PACKER_VERSION=1.0.2
 +        <propertiesContent>PACKER_VERSION=1.1.1
  </propertiesContent>
        </info>
      </EnvInjectBuilder>
@@@ -328,7 -328,7 +328,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -454,7 -454,7 +454,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/github-maven-maven-clm-master
index 784044c,ed55a49..d1bc826
--- 1/.jjb-test/expected-xml/github-maven-maven-clm-master
--- 2/.jjb-test/expected-xml/github-maven-maven-clm-master
+++ b/.jjb-test/expected-xml/github-maven-maven-clm-master
@@@ -69,11 -69,6 +69,11 @@@ For example '<1.0.0' or '>=1.0.0,
  </description>
            <defaultValue>&lt;1.0.0</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>M2_HOME</name>
 +          <description>Maven selector to be used by shell scripts</description>
 +          <defaultValue>/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m
@@@ -344,7 -339,7 +344,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -470,7 -465,7 +470,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/github-maven-maven-javadoc-publish-master
index db04105,f9000e7..e59de5b
--- 1/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master
--- 2/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master
+++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master
@@@ -69,11 -69,6 +69,11 @@@ For example '<1.0.0' or '>=1.0.0,
  </description>
            <defaultValue>&lt;1.0.0</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>M2_HOME</name>
 +          <description>Maven selector to be used by shell scripts</description>
 +          <defaultValue>/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m
@@@ -222,7 -217,7 +222,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -504,7 -499,7 +504,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -630,7 -625,7 +630,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/github-maven-maven-javadoc-verify-master
index 7559cef,8916ef9..0981843
--- 1/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master
--- 2/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master
+++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master
@@@ -69,11 -69,6 +69,11 @@@ For example '<1.0.0' or '>=1.0.0,
  </description>
            <defaultValue>&lt;1.0.0</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>M2_HOME</name>
 +          <description>Maven selector to be used by shell scripts</description>
 +          <defaultValue>/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m
@@@ -344,7 -339,7 +344,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -470,7 -465,7 +470,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/github-maven-maven-release-master
index e207cc0,5b043c1..6275353
--- 1/.jjb-test/expected-xml/github-maven-maven-release-master
--- 2/.jjb-test/expected-xml/github-maven-maven-release-master
+++ b/.jjb-test/expected-xml/github-maven-maven-release-master
@@@ -69,11 -69,6 +69,11 @@@ For example '<1.0.0' or '>=1.0.0,
  </description>
            <defaultValue>&lt;1.0.0</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>M2_HOME</name>
 +          <description>Maven selector to be used by shell scripts</description>
 +          <defaultValue>/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m
@@@ -219,7 -214,7 +219,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -526,7 -521,7 +526,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -652,7 -647,7 +652,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8
index 2a955ee,af451b2..d68b970
--- 1/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8
--- 2/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8
+++ b/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8
@@@ -69,11 -69,6 +69,11 @@@ For example '<1.0.0' or '>=1.0.0,
  </description>
            <defaultValue>&lt;1.0.0</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>M2_HOME</name>
 +          <description>Maven selector to be used by shell scripts</description>
 +          <defaultValue>/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m
@@@ -470,7 -465,7 +470,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -596,7 -591,7 +596,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;
  

diff --combined .jjb-test/expected-xml/github-maven-sonar
index d1419d4,fbbac92..11def2f
--- 1/.jjb-test/expected-xml/github-maven-sonar
--- 2/.jjb-test/expected-xml/github-maven-sonar
+++ b/.jjb-test/expected-xml/github-maven-sonar
@@@ -69,11 -69,6 +69,11 @@@ For example '<1.0.0' or '>=1.0.0,
  </description>
            <defaultValue>&lt;1.0.0</defaultValue>
          </hudson.model.StringParameterDefinition>
 +        <hudson.model.StringParameterDefinition>
 +          <name>M2_HOME</name>
 +          <description>Maven selector to be used by shell scripts</description>
 +          <defaultValue>/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33</defaultValue>
 +        </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>MAVEN_OPTS</name>
            <description>Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m
@@@ -398,7 -393,7 +398,7 @@@ echo &quot;---&gt; create-netrc.sh&quot
  # Ensure we fail the job if any steps fail.
  set -eu -o pipefail
  
- NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+ NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
  CREDENTIAL=$(xmlstarlet sel -N &quot;x=http://maven.apache.org/SETTINGS/1.0.0&quot; \
      -t -m &quot;/x:settings/x:servers/x:server[x:id='${SERVER_ID}']&quot; \
      -v x:username -o &quot;:&quot; -v x:password \
@@@ -524,7 -519,7 +524,7 @@@ the
  
      echo &quot;WARNING: Logging server not set&quot;
  else
-     NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+     NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
      NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
      BUILD_URL=&quot;${BUILD_URL}&quot;