cleanup Jenkinsfile: non needed/unused variable (#2880)

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

Jenkinsfile

@@ -17,20 +17,13 @@ def getFullBuild(jdk, os) {
   return {
     node(os) {
       // System Dependent Locations
-      def mvntool = tool name: 'maven3.5', type: 'hudson.tasks.Maven$MavenInstallation'
-      def mvntoolInvoker = tool name: 'maven3.5', type: 'hudson.tasks.Maven$MavenInstallation'
-      def jdktool = tool name: "$jdk", type: 'hudson.model.JDK'
       def mvnName = 'maven3.5'
       def localRepo = "${env.JENKINS_HOME}/${env.EXECUTOR_NUMBER}" // ".repository" // 
       def settingsName = 'oss-settings.xml'
       def mavenOpts = '-Xms1g -Xmx4g -Djava.awt.headless=true'
 
-      // Environment
-      List mvnEnv = ["PATH+MVN=${mvntool}/bin", "PATH+JDK=${jdktool}/bin", "JAVA_HOME=${jdktool}/", "MAVEN_HOME=${mvntool}"]
-      mvnEnv.add("MAVEN_OPTS=$mavenOpts")
 
-      try
-      {
+      try {
         stage("Checkout - ${jdk}") {
           checkout scm
         }
@@ -39,10 +32,8 @@ def getFullBuild(jdk, os) {
         throw e
       }
 
-      try
-      {
+      try {
         stage("Compile - ${jdk}") {
-          withEnv(mvnEnv) {
           timeout(time: 15, unit: 'MINUTES') {
             withMaven(
                     maven: mvnName,
@@ -53,8 +44,6 @@ def getFullBuild(jdk, os) {
                     mavenLocalRepo: localRepo) {
               sh "mvn -V -B clean install -DskipTests -T6 -e"
             }
-
-            }
           }
         }
       } catch(Exception e) {
@@ -62,10 +51,8 @@ def getFullBuild(jdk, os) {
         throw e
       }
 
-      try
-      {
+      try {
         stage("Javadoc - ${jdk}") {
-          withEnv(mvnEnv) {
           timeout(time: 20, unit: 'MINUTES') {
             withMaven(
                     maven: mvnName,
@@ -78,16 +65,13 @@ def getFullBuild(jdk, os) {
             }
           }
         }
-        }
       } catch(Exception e) {
         notifyBuild("Javadoc Failure", jdk)
         throw e
       }
 
-      try
-      {
+      try {
         stage("Test - ${jdk}") {
-          withEnv(mvnEnv) {
           timeout(time: 90, unit: 'MINUTES') {
             // Run test phase / ignore test failures
             withMaven(
@@ -98,7 +82,7 @@ def getFullBuild(jdk, os) {
                     //options: [invokerPublisher(disabled: false)],
                     mavenOpts: mavenOpts,
                     mavenLocalRepo: localRepo) {
-                sh "mvn -V -B install -Dmaven.test.failure.ignore=true -e -Pmongodb -T3 -DmavenHome=${mvntoolInvoker} -Dunix.socket.tmp="+env.JENKINS_HOME
+              sh "mvn -V -B install -Dmaven.test.failure.ignore=true -e -Pmongodb -T3 -Dunix.socket.tmp="+env.JENKINS_HOME
             }
             // withMaven doesn't label..
             // Report failures in the jenkins UI
@@ -120,12 +104,11 @@ def getFullBuild(jdk, os) {
                               ",**/org/eclipse/jetty/http/spi/**" +
                               // test classes
                               ",**/org/eclipse/jetty/tests/**" + ",**/org/eclipse/jetty/test/**";
-                step( [$class          : 'JacocoPublisher',
-                       inclusionPattern: '**/org/eclipse/jetty/**/*.class',
+              jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
                      exclusionPattern: jacocoExcludes,
                      execPattern     : '**/target/jacoco.exec',
                      classPattern    : '**/target/classes',
-                       sourcePattern   : '**/src/main/java'] )
+                     sourcePattern   : '**/src/main/java'
               consoleParsers = [[parserName: 'Maven'],
                                 [parserName: 'JavaDoc'],
                                 [parserName: 'JavaC']];
@@ -135,12 +118,10 @@ def getFullBuild(jdk, os) {
             step( [$class        : 'WarningsPublisher',
                    consoleParsers: consoleParsers] )
           }
-            if(isUnstable())
-            {
+          if(isUnstable()) {
             notifyBuild("Unstable / Test Errors", jdk)
           }
         }
-        }
       } catch(Exception e) {
         notifyBuild("Test Failure", jdk)
         throw e
@@ -149,7 +130,6 @@ def getFullBuild(jdk, os) {
       try
       {
         stage ("Compact3 - ${jdk}") {
-          withEnv(mvnEnv) {
           withMaven(
                   maven: mvnName,
                   jdk: "$jdk",
@@ -160,7 +140,6 @@ def getFullBuild(jdk, os) {
             sh "mvn -f aggregates/jetty-all-compact3 -V -B -Pcompact3 clean install -T5"
           }
         }
-        }
       } catch(Exception e) {
         notifyBuild("Compact3 Failure", jdk)
         throw e
@@ -177,8 +156,7 @@ def isMainBuild(jdk) {
 
 // True if this build is part of the "active" branches
 // for Jetty.
-def isActiveBranch()
-{
+def isActiveBranch() {
   def branchName = "${env.BRANCH_NAME}"
   return ( branchName == "master" ||
           ( branchName.startsWith("jetty-") && branchName.endsWith(".x") ) );
@@ -186,16 +164,13 @@ def isActiveBranch()
 
 // Test if the Jenkins Pipeline or Step has marked the
 // current build as unstable
-def isUnstable()
-{
+def isUnstable() {
   return currentBuild.result == "UNSTABLE"
 }
 
 // Send a notification about the build status
-def notifyBuild(String buildStatus, String jdk)
-{
-  if ( !isActiveBranch() )
-  {
+def notifyBuild(String buildStatus, String jdk) {
+  if ( !isActiveBranch() ) {
     // don't send notifications on transient branches
     return
   }