From ecd9a63d46e1cac5f0a5b227897f346d64214ed3 Mon Sep 17 00:00:00 2001
From: Valera V Harseko <vharseko@3a-systems.ru>
Date: Tue, 8 Sep 2026 16:35:04 +0300
Subject: [PATCH] Clean up remaining CodeQL deprecated-call alerts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

All three open CodeQL alerts on master are java/deprecated-call in
maven-external-dependency-plugin:

- ArtifactItem.toString(): use Objects.toString(version, "?") instead of the
  deprecated plexus-utils StringUtils.defaultString(version, "?") — identical
  semantics for a String field.
- AbstractExternalDependencyMojo.generatePomFile(): use try-with-resources
  instead of the deprecated IOUtil.close(writer) in a finally block. Side
  effect: a failure while flushing or closing the temporary POM writer now
  surfaces as MojoExecutionException instead of being swallowed.

No other behaviour changes; the module compiles.
---
 .../dependency/AbstractExternalDependencyMojo.java   | 12 ++++--------
 .../maven/plugin/dependency/ArtifactItem.java        |  6 +++---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/AbstractExternalDependencyMojo.java b/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/AbstractExternalDependencyMojo.java
index 6187ddbd1..584c7aa19 100644
--- a/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/AbstractExternalDependencyMojo.java
+++ b/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/AbstractExternalDependencyMojo.java
@@ -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 @@ protected File generatePomFile(ArtifactItem artifact)
     {
         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 @@ protected File generatePomFile(ArtifactItem artifact)
             throw new MojoExecutionException(
                     "Error writing temporary POM file: " + e.getMessage(), e);
         }
-        finally
-        {
-            IOUtil.close(writer);
-        }
     }
 
     /**
diff --git a/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/ArtifactItem.java b/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/ArtifactItem.java
index 2c1a10481..e2d0168f6 100644
--- a/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/ArtifactItem.java
+++ b/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/ArtifactItem.java
@@ -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 @@ public final String toString()
         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;
         }
     }