Update parent pom (jenkinsci#10)

* Set mandatory config in jelly files

* Don't use Message class

* Use try/catch to close file consistently

* Check return value of file deletion

Report the failure to the listener similar to other failures

* Check run.getResult() for null

* Log URL exception that was previously hidden

* Use UTF-8 character set

* Check file filter for null before adding to collection

* Use parent pom 4.37

* Hide a spotbugs warning

* Require Jenkins 2.303.3

Author: MarkEWaite

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>1.565.3</version>
+        <version>4.37</version>
         <relativePath />
     </parent>
   <artifactId>global-post-script</artifactId>
@@ -23,8 +23,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <java.level>8</java.level>
+    <jenkins.version>2.303.3</jenkins.version>
   </properties>
 
   <developers>
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/main/java/com/orctom/jenkins/plugin/globalpostscript/GlobalPostScript.java

@@ -48,7 +48,8 @@ public static String getRemoteJobUrl(String jobUrl) {
   public void onCompleted(Run run, TaskListener listener) {
     EnvVars envVars = getEnvVars(run, listener);
 
-    if (run.getResult().isWorseThan(getDescriptorImpl().getResultCondition())) {
+    Result result = run.getResult();
+    if (result == null || result.isWorseThan(getDescriptorImpl().getResultCondition())) {
       return;
     }
 
@@ -68,7 +69,8 @@ public void onCompleted(Run run, TaskListener listener) {
   private EnvVars getEnvVars(Run run, TaskListener listener) {
     try {
       EnvVars envVars = run.getEnvironment(listener);
-      envVars.put("BUILD_RESULT", run.getResult().toString());
+      Result result = run.getResult();
+      envVars.put("BUILD_RESULT", result == null ? "ongoing" : result.toString());
       return envVars;
     } catch (Throwable e) {
       e.printStackTrace();
@@ -149,9 +151,9 @@ public void triggerJob(String jobName, Map<String, String> params) {
               job.getAbsoluteUrl() + job.getNextBuildNumber() + "/",
               "#" + job.getNextBuildNumber());
           if (scheduled) {
-            println(hudson.tasks.Messages.BuildTrigger_Triggering(name));
+            println("Triggering " + name);
           } else {
-            println(hudson.tasks.Messages.BuildTrigger_InQueue(name));
+            println("In queue " + name);
           }
         }
       } else {
@@ -168,6 +170,7 @@ public void triggerRemoteJob(String jobTriggerUrl) {
         jobURL.appendToParamValue("cause", new URLCodec().encode(getCause(), "UTF-8"));
         url = jobURL.getURL();
       } catch (Exception e) {
+        println("[WARNING] ignoring URL exception for " + jobTriggerUrl);
       }
 
       HttpClient client = new HttpClient();
@@ -176,7 +179,7 @@ public void triggerRemoteJob(String jobTriggerUrl) {
         client.executeMethod(method);
         int statusCode = method.getStatusCode();
         if (statusCode < 400) {
-          println(hudson.tasks.Messages.BuildTrigger_Triggering(jobUrl));
+          println("Triggering " + jobUrl);
         } else {
           println("[ERROR] Failed to trigger: " + jobUrl + " | " + statusCode);
         }
@@ -250,7 +253,10 @@ public boolean accept(File dir, String name) {
         }
       };
 
-      Collections.addAll(items, scriptFolder.list(filter));
+      String [] filteredFiles = scriptFolder.list(filter);
+      if (filteredFiles != null) {
+        Collections.addAll(items, filteredFiles);
+      }
       return items;
     }
 

src/main/java/com/orctom/jenkins/plugin/globalpostscript/runner/GroovyScriptRunner.java

@@ -50,8 +50,13 @@ protected ClassLoader getGroovyClassloader() {
     return getGroovyClassloader(libFolder);
   }
 
-  protected ClassLoader getGroovyClassloader(File libFolder) {
+  private GroovyClassLoader getGroovyClassloaderFromParent() {
     GroovyClassLoader cl = new GroovyClassLoader(getParentClassloader());
+    return cl;
+  }
+
+  protected ClassLoader getGroovyClassloader(File libFolder) {
+    GroovyClassLoader cl = getGroovyClassloaderFromParent();
     if (!libFolder.exists() || !libFolder.isDirectory()) {
       return cl;
     }

src/main/java/com/orctom/jenkins/plugin/globalpostscript/runner/ShellScriptRunner.java

@@ -7,6 +7,7 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 import static com.orctom.jenkins.plugin.globalpostscript.ScriptContentLoader.getScriptContent;
@@ -39,19 +40,21 @@ public void run(File script,
       }
       Process process = builder.start();
 
-      BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
-
-      String line;
-      while ((line = reader.readLine()) != null) {
-        println(listener, line);
+      try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8))) {
+        String line;
+        while ((line = reader.readLine()) != null) {
+          println(listener, line);
+        }
       }
 
     } catch (Throwable e) {
       e.printStackTrace();
       println(listener, "[ERROR] Failed to execute: " + script.getName() + ", " + e.getMessage());
     } finally {
       if (null != temp) {
-        temp.delete();
+        if (temp.delete()) {
+          println(listener, "[WARNING] Failed to delete temp file: " + temp.getName());
+        }
       }
     }
   }

src/main/resources/com/orctom/jenkins/plugin/globalpostscript/GlobalPostScript/global.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
     <f:section title="Global Post Script">
         <f:entry title="Script File Name" field="script" description="Just The Script File Name, in $JENKINS_HOME/global-post-script">

src/main/resources/com/orctom/jenkins/plugin/globalpostscript/GlobalPostScriptAction/badge.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
     <j:if test="${null != it.iconFileName}">
         <img src="${rootURL}${it.iconFileName}" width="16" height="16" alt="${it.displayName}" title="${it.displayName}" />

src/main/resources/index.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <!--
   This view is used to render the installed plugins page.
 -->