Skip to content

Commit

Permalink
Bump to more recent LTS compatible with JDK8
Browse files Browse the repository at this point in the history
  • Loading branch information
vjuranek committed Jul 24, 2015
1 parent d7f3b9c commit cff114d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/hudson/plugins/groovy/FileScriptSource.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
1 change: 1 addition & 0 deletions src/main/java/hudson/plugins/groovy/Groovy.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/hudson/plugins/groovy/GroovyInstallation.java
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand All @@ -41,6 +42,12 @@ public String call() throws IOException {
}
return null;
}

@Override
public void checkRoles(RoleChecker checker) throws SecurityException {
//currently no-op
}

This comment has been minimized.

Copy link
@jglick

jglick Aug 3, 2015

Member

Probably wrong. See jenkinsci/remoting#56.

private static final long serialVersionUID = 1L;
});
}
Expand Down

0 comments on commit cff114d

Please sign in to comment.