Clean up remaining CodeQL deprecated-call alerts

maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/AbstractExternalDependencyMojo.java

@@ -1,4 +1,4 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -45,7 +45,6 @@
 import org.codehaus.plexus.digest.DigesterException;
 import org.codehaus.plexus.digest.Md5Digester;
 import org.codehaus.plexus.digest.Sha1Digester;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.WriterFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -155,14 +154,15 @@
     {
         Model model = generateModel(artifact);
 
-        Writer writer = null;
         try
         {
             File pomFile = File.createTempFile(artifact.getGroupId() + "."
                     + artifact.getArtifactId(), ".pom");
 
-            writer = WriterFactory.newXmlWriter(pomFile);
-            new MavenXpp3Writer().write(writer, model);
+            try (Writer writer = WriterFactory.newXmlWriter(pomFile))
+            {
+                new MavenXpp3Writer().write(writer, model);
+            }
 
             return pomFile;
         }
@@ -171,10 +171,6 @@
             throw new MojoExecutionException(
                     "Error writing temporary POM file: " + e.getMessage(), e);
         }
-        finally
-        {
-            IOUtil.close(writer);
-        }
     }
 
     /**

maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/ArtifactItem.java

@@ -1,4 +1,4 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements. See the NOTICE file distributed with this
  * work for additional information regarding copyright ownership. The ASF
@@ -15,9 +15,9 @@
 package com.savage7.maven.plugin.dependency;
 
 import java.io.File;
+import java.util.Objects;
 
 import org.apache.maven.artifact.Artifact;
-import org.codehaus.plexus.util.StringUtils;
 
 /**
  * ArtifactItem represents information specified in the plugin configuration
@@ -357,12 +357,12 @@
         if (this.classifier == null)
         {
             return groupId + ":" + artifactId + ":"
-                + StringUtils.defaultString(version, "?") + ":" + packaging;
+                + Objects.toString(version, "?") + ":" + packaging;
         }
         else
         {
             return groupId + ":" + artifactId + ":" + classifier + ":"
-                + StringUtils.defaultString(version, "?") + ":" + packaging;
+                + Objects.toString(version, "?") + ":" + packaging;
         }
     }