Update to build with new Jenkins POM.

* Fixes release process to use appropriate Maven repository.
* Fixes FindBugs warnings found with new default FindBugs invocation.
* Fixes Jelly warnings with new default tests.

Author: Jmcfar

pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.554.1</version>
+    <version>2.19</version>
   </parent>
 
   <artifactId>codedeploy</artifactId>
@@ -16,9 +16,9 @@
 
   <developers>
     <developer>
-      <id>afitzgibbon</id>
-      <name>Andrew Fitz Gibbon</name>
-      <email>gibbon@amazon.com</email>
+      <id>jmcfar</id>
+      <name>Josh McFarlane</name>
+      <email>jmcfar@amazon.com</email>
     </developer>
   </developers>
 
@@ -45,9 +45,8 @@
   </repositories>
 
   <properties>
-    <jackson.version>2.1.1</jackson.version>
-    <spring.version>3.0.7.RELEASE</spring.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <jenkins.version>1.580.3</jenkins.version>
   </properties>
 
   <dependencies>
@@ -69,7 +68,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.5</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

src/main/java/com/amazonaws/codedeploy/AWSClients.java

@@ -129,7 +129,7 @@ private File createTestFile() throws IOException {
         File file = File.createTempFile("codedeploy-jenkins-plugin", ".txt");
         file.deleteOnExit();
 
-        Writer writer = new OutputStreamWriter(new FileOutputStream(file));
+        Writer writer = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");
         writer.write("");
         writer.close();
 

src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java

@@ -56,8 +56,9 @@
 import org.kohsuke.stapler.StaplerRequest;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileReader;
+import java.io.InputStreamReader;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Date;
@@ -78,7 +79,7 @@ public class AWSCodeDeployPublisher extends Publisher {
     public static final long      DEFAULT_TIMEOUT_SECONDS           = 900;
     public static final long      DEFAULT_POLLING_FREQUENCY_SECONDS = 15;
     public static final String    ROLE_SESSION_NAME                 = "jenkins-codedeploy-plugin";
-    public static final Regions[] AVAILABLE_REGIONS                 = {Regions.AP_NORTHEAST_1, Regions.AP_SOUTHEAST_1, Regions.AP_SOUTHEAST_2, Regions.EU_WEST_1, Regions.US_EAST_1, Regions.US_WEST_2, Regions.EU_CENTRAL_1, Regions.US_WEST_1, Regions.SA_EAST_1, Regions.AP_NORTHEAST_2, Regions.AP_SOUTH_1};
+    private static final Regions[] AVAILABLE_REGIONS                 = {Regions.AP_NORTHEAST_1, Regions.AP_SOUTHEAST_1, Regions.AP_SOUTHEAST_2, Regions.EU_WEST_1, Regions.US_EAST_1, Regions.US_WEST_2, Regions.EU_CENTRAL_1, Regions.US_WEST_1, Regions.SA_EAST_1, Regions.AP_NORTHEAST_2, Regions.AP_SOUTH_1};
 
     private final String  s3bucket;
     private final String  s3prefix;
@@ -190,7 +191,7 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListener lis
             return true;
         }
 
-        AWSClients aws;
+        final AWSClients aws;
         if ("awsAccessKey".equals(credentials)) {
             if (StringUtils.isEmpty(this.awsAccessKey) && StringUtils.isEmpty(this.awsSecretKey)) {
                 aws = AWSClients.fromDefaultCredentialChain(
@@ -220,8 +221,13 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListener lis
 
             verifyCodeDeployApplication(aws);
 
-            String projectName = build.getProject().getName();
-            RevisionLocation revisionLocation = zipAndUpload(aws, projectName, getSourceDirectory(build.getWorkspace()));
+            final String projectName = build.getProject().getName();
+            final FilePath workspace = build.getWorkspace();
+            if (workspace == null) {
+                throw new IllegalArgumentException("No workspace present for the build.");
+            }
+            final FilePath sourceDirectory = getSourceDirectory(workspace);
+            final RevisionLocation revisionLocation = zipAndUpload(aws, projectName, sourceDirectory);
 
             registerRevision(aws, revisionLocation);
             if ("onlyRevision".equals(deploymentMethod)){
@@ -296,10 +302,10 @@ private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePa
         File versionFile;
         versionFile = new File(sourceDirectory + "/" + versionFileName);
 
-        FileReader reader = null;
+        InputStreamReader reader = null;
         String version = null;
         try {
-          reader = new FileReader(versionFile);
+          reader = new InputStreamReader(new FileInputStream(versionFile), "UTF-8");
           char[] chars = new char[(int) versionFile.length() -1];
           reader.read(chars);
           version = new String(chars);
@@ -312,7 +318,10 @@ private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePa
 
         if (version != null){
           zipFile = new File("/tmp/" + projectName + "-" + version + ".zip");
-          zipFile.createNewFile();
+          final boolean fileCreated = zipFile.createNewFile();
+          if (!fileCreated) {
+            logger.println("File already exists, overwriting: " + zipFile.getPath());
+          }
         } else {
           zipFile = File.createTempFile(projectName + "-", ".zip");
         }
@@ -344,12 +353,15 @@ private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePa
 
             logger.println("Zipping files into " + zipFile.getAbsolutePath());
 
-
-
-            sourceDirectory.zip(
-                    new FileOutputStream(zipFile),
-                    new DirScanner.Glob(this.includes, this.excludes)
-            );
+            FileOutputStream outputStream = new FileOutputStream(zipFile);
+            try {
+                sourceDirectory.zip(
+                        outputStream,
+                        new DirScanner.Glob(this.includes, this.excludes)
+                );
+            } finally {
+                outputStream.close();
+            }
 
             if (prefix.isEmpty()) {
                 key = zipFile.getName();
@@ -376,7 +388,10 @@ private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePa
 
             return revisionLocation;
         } finally {
-            zipFile.delete();
+            final boolean deleted = zipFile.delete();
+            if (!deleted) {
+                logger.println("Failed to clean up file " + zipFile.getPath());
+            }
         }
     }
 
@@ -531,7 +546,7 @@ public boolean configure(StaplerRequest req, JSONObject formData) throws FormExc
             awsAccessKey = formData.getString("awsAccessKey");
             awsSecretKey = formData.getString("awsSecretKey");
             proxyHost = formData.getString("proxyHost");
-            proxyPort = Integer.valueOf(formData.getString("proxyPort"));
+            proxyPort = Integer.parseInt(formData.getString("proxyPort"));
 
             req.bindJSON(this, formData);
             save();

src/main/resources/com/amazonaws/codedeploy/AWSCodeDeployPublisher/config.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="AWS CodeDeploy Application Name" field="applicationName">
     <f:textbox />

src/main/resources/com/amazonaws/codedeploy/AWSCodeDeployPublisher/global.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:section title="AWS CodeDeploy Credentials">
       <f:description>

src/main/resources/index.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <div>
   This plugin provides a "post-build" step for AWS CodeDeploy.
 </div>