Upgrade to Jenkins 2.33

build.gradle

@@ -6,12 +6,12 @@ buildscript {
         }
     }
     dependencies {
-        classpath "org.jenkins-ci.tools:gradle-jpi-plugin:0.10.1"
+        classpath "org.jenkins-ci.tools:gradle-jpi-plugin:0.20.0"
     }
 }
 
 plugins {
-  id "net.researchgate.release" version "2.3.4"
+  id "net.researchgate.release" version "2.4.0"
 }
 
 apply plugin: "org.jenkins-ci.jpi"
@@ -21,16 +21,16 @@ repositories {
 }
 
 dependencies {
-    compile "com.fasterxml.jackson.core:jackson-databind:2.4.4"
-    testCompile "org.mockito:mockito-core:1.10.19"
+    compile "com.fasterxml.jackson.core:jackson-databind:2.8.5"
+    testCompile "org.mockito:mockito-core:2.2.15"
 }
 
 group = "org.jenkins-ci.plugins"
-version = version 
+version = version
 description = "A Jenkins plugin that installs Terraform as a build wrapper for infrastructure creation"
 
 jenkinsPlugin {
-    coreVersion = "1.580"
+    coreVersion = "2.33"
     shortName = "terraform"
     displayName = "Terraform Plugin"
     url = "https://wiki.jenkins-ci.org/display/JENKINS/Terraform+Plugin"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Nov 24 22:44:29 EST 2015
+#Mon Nov 21 17:31:05 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip

gradlew

@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args

src/main/java/org/jenkinsci/plugins/terraform/TerraformInstallation.java

@@ -1,5 +1,6 @@
 package org.jenkinsci.plugins.terraform;
 
+import org.jenkinsci.remoting.RoleChecker;
 
 import hudson.EnvVars;
 import hudson.FilePath;
@@ -58,15 +59,15 @@ public TerraformInstallation forEnvironment(EnvVars environment) {
         return new TerraformInstallation(getName(), environment.expand(getHome()), getProperties().toList());
     }
 
-    
+
     public String getExecutablePath(final Launcher launcher) throws IOException, InterruptedException {
-        return launcher.getChannel().call(new Callable<String, IOException>() {
+	return launcher.getChannel().call(new Callable<String, IOException>() {
             public String call() throws IOException {
 
                 FilePath homeDirectory = new FilePath(new File(getHome()));
 
                 try {
-                    if (!(homeDirectory.exists() && homeDirectory.isDirectory())) 
+                    if (!(homeDirectory.exists() && homeDirectory.isDirectory()))
                         throw new FileNotFoundException(Messages.HomeDirectoryNotFound(homeDirectory));
                 } catch (InterruptedException ex) {
                     throw new IOException(ex);
@@ -83,18 +84,22 @@ public String call() throws IOException {
 
                 return executable.getRemote();
             }
+	    @Override
+	    public void checkRoles(RoleChecker rc) throws SecurityException
+	    {
+	    }
         });
     }
 
 
     protected String getExecutableFilename() {
         return Functions.isWindows() ? WINDOWS_EXECUTABLE : UNIX_EXECUTABLE;
-    } 
+    }
 
 
     @Extension
     public static class DescriptorImpl extends ToolDescriptor<TerraformInstallation> {
-    
+
         @Override
         public String getDisplayName() {
             return "Terraform";