This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git

commit bb0be7a4583da7b661cbe49f16079bf2a8c75272
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Tue Nov 17 02:59:26 2026 +0000

    Replace remaining StringUtils and Commons calls with the JDK
---
 src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java    | 7 ++++---
 .../maven/plugins/war/packaging/AbstractWarPackagingTask.java      | 5 +++--
 .../maven/plugins/war/packaging/WarProjectPackagingTask.java       | 7 ++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java 
b/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
index 52aaa93..3d90461 100644
--- a/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
@@ -57,7 +57,6 @@ import 
org.apache.maven.shared.filtering.MavenResourcesFiltering;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
 import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-import org.codehaus.plexus.util.StringUtils;
 
 /**
  * Contains common jobs for WAR mojos.
@@ -414,12 +413,14 @@ public abstract class AbstractWarMojo extends 
AbstractMojo {
         }
 
         // if webXML is specified, omit the one in the source directory
-        if (webXml != null && StringUtils.isNotEmpty(webXml.getName())) {
+        if (webXml != null && (webXml.getName() != null && 
!webXml.getName().isEmpty())) {
             excludeList.add("**/WEB-INF/web.xml");
         }
 
         // if contextXML is specified, omit the one in the source directory
-        if (containerConfigXML != null && 
StringUtils.isNotEmpty(containerConfigXML.getName())) {
+        if (containerConfigXML != null
+                && (containerConfigXML.getName() != null
+                        && !containerConfigXML.getName().isEmpty())) {
             excludeList.add("**/META-INF/" + containerConfigXML.getName());
         }
 
diff --git 
a/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java
 
b/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java
index f9e8861..b5f4b37 100644
--- 
a/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java
+++ 
b/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java
@@ -39,7 +39,6 @@ import 
org.codehaus.plexus.interpolation.InterpolationException;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.SelectorUtils;
-import org.codehaus.plexus.util.StringUtils;
 
 /**
  * @author Stephane Nicoll
@@ -247,7 +246,9 @@ public abstract class AbstractWarPackagingTask implements 
WarPackagingTask {
                 if (isXmlFile(file)) {
                     // For xml-files we extract the encoding from the files
                     encoding = getEncoding(file);
-                } else if (isPropertiesFile(file) && 
StringUtils.isNotEmpty(context.getPropertiesEncoding())) {
+                } else if (isPropertiesFile(file)
+                        && (context.getPropertiesEncoding() != null
+                                && 
!context.getPropertiesEncoding().isEmpty())) {
                     encoding = context.getPropertiesEncoding();
                 } else {
                     // For all others we use the configured encoding
diff --git 
a/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
 
b/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
index 2f87663..97a3963 100644
--- 
a/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
+++ 
b/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
@@ -29,7 +29,6 @@ import org.apache.maven.plugins.war.Overlay;
 import org.apache.maven.plugins.war.util.PathSet;
 import org.apache.maven.shared.filtering.MavenFilteringException;
 import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.StringUtils;
 
 /**
  * Handles the project own resources, that is:
@@ -204,7 +203,7 @@ public class WarProjectPackagingTask extends 
AbstractWarPackagingTask {
             WarPackagingContext context, File webinfDir, File metainfDir, 
Boolean failOnMissingWebXml)
             throws MojoFailureException, MojoExecutionException {
         try {
-            if (webXml != null && StringUtils.isNotEmpty(webXml.getName())) {
+            if (webXml != null && (webXml.getName() != null && 
!webXml.getName().isEmpty())) {
                 if (!webXml.exists() && (failOnMissingWebXml == null || 
failOnMissingWebXml)) {
                     throw new MojoFailureException("The specified web.xml file 
'" + webXml + "' does not exist");
                 }
@@ -239,7 +238,9 @@ public class WarProjectPackagingTask extends 
AbstractWarPackagingTask {
                 }
             }
 
-            if (containerConfigXML != null && 
StringUtils.isNotEmpty(containerConfigXML.getName())) {
+            if (containerConfigXML != null
+                    && (containerConfigXML.getName() != null
+                            && !containerConfigXML.getName().isEmpty())) {
                 String xmlFileName = containerConfigXML.getName();
 
                 context.getWebappStructure().registerFileForced(id, 
META_INF_PATH + "/" + xmlFileName);

Reply via email to