Replace deprecated methods from StringUtils (#587)
* Replace deprecated methods from StringUtils
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 ad929a2..56b1e6c 100644
--- a/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
@@ -205,27 +205,27 @@
* The comma separated list of tokens to include when copying the content of the warSourceDirectory.
*/
@Parameter(defaultValue = "**")
- private String warSourceIncludes;
+ private String warSourceIncludes = "**";
/**
* The comma separated list of tokens to exclude when copying the content of the warSourceDirectory.
*/
@Parameter
- private String warSourceExcludes;
+ private String warSourceExcludes = "";
/**
* The comma separated list of tokens to include when doing a WAR overlay. Default is
* {@link org.apache.maven.plugins.war.Overlay#DEFAULT_INCLUDES}
*/
@Parameter
- private String dependentWarIncludes = StringUtils.join(Overlay.DEFAULT_INCLUDES, ",");
+ private String dependentWarIncludes = String.join(",", Overlay.DEFAULT_INCLUDES);
/**
* The comma separated list of tokens to exclude when doing a WAR overlay. Default is
* {@link org.apache.maven.plugins.war.Overlay#DEFAULT_EXCLUDES}
*/
@Parameter
- private String dependentWarExcludes = StringUtils.join(Overlay.DEFAULT_EXCLUDES, ",");
+ private String dependentWarExcludes = String.join(",", Overlay.DEFAULT_EXCLUDES);
/**
* The comma separated list of tokens to exclude from the WAR before packaging. This option may be used to implement
@@ -410,7 +410,7 @@
protected String[] getExcludes() {
List<String> excludeList = new ArrayList<>();
if (warSourceExcludes != null && !warSourceExcludes.isEmpty()) {
- excludeList.addAll(Arrays.asList(StringUtils.split(warSourceExcludes, ",")));
+ excludeList.addAll(Arrays.asList(warSourceExcludes.split(",")));
}
// if webXML is specified, omit the one in the source directory
@@ -432,7 +432,7 @@
* @return an array of tokens to include
*/
protected String[] getIncludes() {
- return StringUtils.split(StringUtils.defaultString(warSourceIncludes), ",");
+ return warSourceIncludes.split(",");
}
/**
@@ -441,7 +441,7 @@
* @return an array of tokens to exclude
*/
protected String[] getDependentWarExcludes() {
- return StringUtils.split(StringUtils.defaultString(dependentWarExcludes), ",");
+ return dependentWarExcludes.split(",");
}
/**
@@ -450,7 +450,7 @@
* @return an array of tokens to include
*/
protected String[] getDependentWarIncludes() {
- return StringUtils.split(StringUtils.defaultString(dependentWarIncludes), ",");
+ return dependentWarIncludes.split(",");
}
/**
@@ -1066,7 +1066,7 @@
if (packagingExcludes == null || packagingExcludes.isEmpty()) {
return new String[0];
} else {
- return org.codehaus.plexus.util.StringUtils.split(packagingExcludes, ",");
+ return packagingExcludes.split(",");
}
}
@@ -1084,7 +1084,7 @@
if (packagingIncludes == null || packagingIncludes.isEmpty()) {
return new String[] {"**"};
} else {
- return org.codehaus.plexus.util.StringUtils.split(packagingIncludes, ",");
+ return packagingIncludes.split(",");
}
}
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 7f8a579..968b730 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
@@ -28,8 +28,8 @@
import org.apache.maven.plugins.war.Overlay;
import org.apache.maven.plugins.war.util.PathSet;
import org.apache.maven.shared.filtering.MavenFilteringException;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.StringUtils;
/**
* Handles the project own resources, that is:
diff --git a/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java b/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java
index 058cdda..50e9712 100644
--- a/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java
@@ -39,7 +39,7 @@
public void setUp() throws Exception {
super.setUp();
- mojo = (WarExplodedMojo) lookupMojo("exploded", getPomFile());
+ mojo = lookupMojo("exploded", getPomFile());
}
/**
diff --git a/src/test/java/org/apache/maven/plugins/war/util/PathSetTest.java b/src/test/java/org/apache/maven/plugins/war/util/PathSetTest.java
index f75aae7..cca89b0 100644
--- a/src/test/java/org/apache/maven/plugins/war/util/PathSetTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/util/PathSetTest.java
@@ -24,7 +24,6 @@
import java.util.Iterator;
import java.util.Set;
-import org.codehaus.plexus.util.StringUtils;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -103,9 +102,9 @@
i++;
assertTrue(ps.contains(pathstr));
assertTrue(ps.contains("/" + pathstr));
- assertTrue(ps.contains("/" + StringUtils.replace(pathstr, '/', '\\')));
- assertFalse(ps.contains("/" + StringUtils.replace(pathstr, '/', '\\') + "/a"));
- assertFalse(ps.contains("/a/" + StringUtils.replace(pathstr, '/', '\\')));
+ assertTrue(ps.contains("/" + pathstr.replace('/', '\\')));
+ assertFalse(ps.contains("/" + pathstr.replace('/', '\\') + "/a"));
+ assertFalse(ps.contains("/a/" + pathstr.replace('/', '\\')));
}
assertEquals(2, i, "Wrong count of iterations");
@@ -117,9 +116,9 @@
assertFalse(pathstr.startsWith("ab/c//"));
assertTrue(ps.contains(pathstr));
assertTrue(ps.contains("/" + pathstr));
- assertTrue(ps.contains("/" + StringUtils.replace(pathstr, '/', '\\')));
- assertFalse(ps.contains("/" + StringUtils.replace(pathstr, '/', '\\') + "/a"));
- assertFalse(ps.contains("/ab/" + StringUtils.replace(pathstr, '/', '\\')));
+ assertTrue(ps.contains("/" + pathstr.replace('/', '\\')));
+ assertFalse(ps.contains("/" + pathstr.replace('/', '\\') + "/a"));
+ assertFalse(ps.contains("/ab/" + pathstr.replace('/', '\\')));
}
assertEquals(2, i, "Wrong count of iterations");
}
