Index: applications/jetspeed-demo/pom.xml
===================================================================
--- applications/jetspeed-demo/pom.xml	(revision 1851804)
+++ applications/jetspeed-demo/pom.xml	(working copy)
@@ -39,7 +39,6 @@
     <dependency>
       <groupId>org.apache.portals.jetspeed-2</groupId>
       <artifactId>jetspeed</artifactId>
-      <version>${project.version}</version>
       <type>war</type>
       <scope>runtime</scope>
     </dependency>
Index: maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
===================================================================
--- maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java	(revision 1851804)
+++ maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java	(working copy)
@@ -154,7 +154,7 @@
     private Map destinations;
 
     /** @parameter expression="${plugin.artifacts}" */
-    private ArrayList pluginArtifacts;
+    private List<Artifact> pluginArtifacts;
     
     /**
      * @parameter
@@ -193,7 +193,7 @@
         
         boolean infusion = false;
         
-        List objects = new ArrayList();
+        List<DeploymentObject> objects = new ArrayList<>();
                 
         for (int i = 0; i < deployments.length; i++)
         {
@@ -353,7 +353,7 @@
         String deploySelection = System.getProperty("deploy");
         if (deploySelection != null)
         {
-            List selection = new ArrayList();
+            List<DeploymentObject> selection = new ArrayList<>();
             StringTokenizer st = new StringTokenizer(deploySelection,",;");
             while (st.hasMoreTokens())
             {
@@ -365,9 +365,7 @@
                     name = destination.substring(split+1);
                     destination = destination.substring(0, split);
                 }
-                for (Iterator iter = objects.iterator(); iter.hasNext(); )
-                {
-                    DeploymentObject dobj = (DeploymentObject)iter.next();
+                for (DeploymentObject dobj : objects) {                    
                     if (dobj.deployment.destination.equals(destination))
                     {
                         if (name == null || name.equals(dobj.deployment.targetName) && !(selection.contains(dobj)))
@@ -385,10 +383,8 @@
             getLog().info("Deploying to targetBaseDir "+targetBaseDir.getAbsolutePath());
         }
         
-        for (Iterator iter = objects.iterator(); iter.hasNext(); )
+        for (DeploymentObject dobj : objects )
         {
-            DeploymentObject dobj = (DeploymentObject)iter.next();
-
             String infoPostFix = "";
             if (dobj.deployment.infuse.booleanValue())
             {
@@ -644,38 +640,13 @@
         FileChannel srcChannel = null;
         FileChannel dstChannel = null;
 
-        try
+        try (FileInputStream s = new FileInputStream(src); FileOutputStream d = new FileOutputStream(dest))
         {
             dest.createNewFile();
-            srcChannel = new FileInputStream(src).getChannel();
-            dstChannel = new FileOutputStream(dest).getChannel();
+            srcChannel = s.getChannel();
+            dstChannel = d.getChannel();
             dstChannel.transferFrom(srcChannel, 0, srcChannel.size());
-            srcChannel.close();
-            dstChannel.close();
         }
-        finally
-        {
-            if ( srcChannel != null && srcChannel.isOpen() )
-            {
-                try
-                {
-                    srcChannel.close();
-                }
-                catch (Exception e)
-                {
-                }
-            }
-            if ( dstChannel != null && dstChannel.isOpen() )
-            {
-                try
-                {
-                    dstChannel.close();
-                }
-                catch (Exception e)
-                {
-                }
-            }
-        }
     }
 
     private static final boolean rmdir(File dir)
Index: maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/mojo/AbstractUnpackMojo.java
===================================================================
--- maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/mojo/AbstractUnpackMojo.java	(revision 1851804)
+++ maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/mojo/AbstractUnpackMojo.java	(working copy)
@@ -16,10 +16,11 @@
  */
 package org.apache.jetspeed.maven.mojo;
 
-import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.jetspeed.maven.utils.Artifacts;
 import org.apache.jetspeed.maven.utils.UnpackResources;
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -57,7 +58,7 @@
     
     protected abstract boolean isSkip();
     
-    protected abstract ArrayList getPluginArtifacts();
+    protected abstract List<Artifact> getPluginArtifacts();
     
     protected abstract UnpackResources getUnpack();
     
Index: maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/Artifacts.java
===================================================================
--- maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/Artifacts.java	(revision 1851804)
+++ maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/Artifacts.java	(working copy)
@@ -16,9 +16,9 @@
  */
 package org.apache.jetspeed.maven.utils;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.maven.artifact.Artifact;
 
@@ -28,15 +28,13 @@
  */
 public class Artifacts
 {
-    private HashMap artifactsMap = new HashMap();
+    private Map<String, Artifact> artifactsMap = new HashMap<>();
     
-    public Artifacts(ArrayList artifacts)
+    public Artifacts(List<Artifact> artifacts)
     {
         if (artifacts != null)
         {
-            for (Iterator iter = artifacts.iterator(); iter.hasNext(); )
-            {
-                Artifact artifact = (Artifact)iter.next();
+            for (Artifact artifact : artifacts) {                
                 artifactsMap.put(artifact.getGroupId()+":"+artifact.getArtifactId()+":"+artifact.getType(), artifact);
             }
         }        
@@ -49,11 +47,11 @@
     
     public Artifact getFirstArtifact()
     {
-        return (Artifact)artifactsMap.values().iterator().next();
+        return artifactsMap.values().iterator().next();
     }
     
     public Artifact get(String key)
     {
-        return (Artifact)artifactsMap.get(key);
+        return artifactsMap.get(key);
     }
 }
\ No newline at end of file
Index: maven/jetspeed-unpack-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackMojo.java
===================================================================
--- maven/jetspeed-unpack-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackMojo.java	(revision 1851804)
+++ maven/jetspeed-unpack-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackMojo.java	(working copy)
@@ -16,10 +16,11 @@
  */
 package org.apache.jetspeed.maven.plugins;
 
-import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.jetspeed.maven.mojo.AbstractUnpackMojo;
 import org.apache.jetspeed.maven.utils.UnpackResources;
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.project.MavenProject;
 
 /**
@@ -50,7 +51,7 @@
     /** @parameter expression="${plugin.artifacts}"
      *  @readonly
      **/
-    private ArrayList pluginArtifacts;
+    private List<Artifact> pluginArtifacts;
     
     /** The Maven project.
      * @parameter expression="${project}"
@@ -64,7 +65,7 @@
         return skip;
     }
     
-    protected ArrayList getPluginArtifacts()
+    protected List<Artifact> getPluginArtifacts()
     {
         return pluginArtifacts;
     }
Index: maven/jetspeed-unpack-war-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackWarMojo.java
===================================================================
--- maven/jetspeed-unpack-war-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackWarMojo.java	(revision 1851804)
+++ maven/jetspeed-unpack-war-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackWarMojo.java	(working copy)
@@ -17,9 +17,11 @@
 package org.apache.jetspeed.maven.plugins;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.jetspeed.maven.utils.UnpackResources;
 import org.apache.jetspeed.maven.mojo.AbstractUnpackMojo;
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.project.MavenProject;
 
 /**
@@ -50,7 +52,7 @@
     /** @parameter expression="${plugin.artifacts}"
      *  @readonly
      **/
-    private ArrayList pluginArtifacts;
+    private List<Artifact> pluginArtifacts;
     
     /** The Maven project.
      * @parameter expression="${project}"
@@ -64,7 +66,7 @@
         return skip;
     }
     
-    protected ArrayList getPluginArtifacts()
+    protected List<Artifact> getPluginArtifacts()
     {
         return pluginArtifacts;
     }