From cff114d67f056cfdfbfa5f8f2d234818cb04ee03 Mon Sep 17 00:00:00 2001
From: Vojtech Juranek <vjuranek@redhat.com>
Date: Fri, 24 Jul 2015 14:13:26 +0200
Subject: [PATCH] Bump to more recent LTS compatible with JDK8

---
 pom.xml                                                    | 2 +-
 src/main/java/hudson/plugins/groovy/FileScriptSource.java  | 2 +-
 src/main/java/hudson/plugins/groovy/Groovy.java            | 1 +
 .../java/hudson/plugins/groovy/GroovyInstallation.java     | 7 +++++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e20cd1c..3138f19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>1.532</version>
+        <version>1.580.3</version>
     </parent>
 
     <artifactId>groovy</artifactId>
diff --git a/src/main/java/hudson/plugins/groovy/FileScriptSource.java b/src/main/java/hudson/plugins/groovy/FileScriptSource.java
index 6558a6d..a8cfc3c 100644
--- a/src/main/java/hudson/plugins/groovy/FileScriptSource.java
+++ b/src/main/java/hudson/plugins/groovy/FileScriptSource.java
@@ -43,7 +43,7 @@ public String getScriptFile() {
     }
 
     @Override
-    public InputStream getScriptStream(FilePath projectWorkspace) throws IOException {
+    public InputStream getScriptStream(FilePath projectWorkspace) throws IOException, InterruptedException {
         return getScriptFile(projectWorkspace).read();
     }
 
diff --git a/src/main/java/hudson/plugins/groovy/Groovy.java b/src/main/java/hudson/plugins/groovy/Groovy.java
index 1bcdc82..9a3b496 100644
--- a/src/main/java/hudson/plugins/groovy/Groovy.java
+++ b/src/main/java/hudson/plugins/groovy/Groovy.java
@@ -237,6 +237,7 @@ protected hudson.plugins.groovy.GroovyInstallation getGroovy() {
     }
 
     //backward compatibility, default is Unix
+    @Deprecated
     protected List<String> buildCommandLine(AbstractBuild<?,?> build,FilePath script) throws IOException, InterruptedException  {
     	return buildCommandLine(build, null, script, true);
     }
diff --git a/src/main/java/hudson/plugins/groovy/GroovyInstallation.java b/src/main/java/hudson/plugins/groovy/GroovyInstallation.java
index a6250c6..4779b7e 100644
--- a/src/main/java/hudson/plugins/groovy/GroovyInstallation.java
+++ b/src/main/java/hudson/plugins/groovy/GroovyInstallation.java
@@ -20,6 +20,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.jenkinsci.remoting.RoleChecker;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 public class GroovyInstallation extends ToolInstallation implements EnvironmentSpecific<GroovyInstallation>, NodeSpecific<GroovyInstallation> {
@@ -41,6 +42,12 @@ public String call() throws IOException {
                 }
                 return null;
             }
+            
+            @Override
+            public void checkRoles(RoleChecker checker) throws SecurityException {
+                //currently no-op
+            }
+            
             private static final long serialVersionUID = 1L;
         });
     }