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-surefire.git
The following commit(s) were added to refs/heads/master by this push:
new 8edbbdd95 Use commons-lang3 and commons-io instead of
maven-shared-utils StringUtils and FileUtils
8edbbdd95 is described below
commit 8edbbdd951e097ddf32387a79ab5ebe310cb2670
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sun Nov 8 12:16:33 2026 +0000
Use commons-lang3 and commons-io instead of maven-shared-utils StringUtils
and FileUtils
The cli, ShutdownHookUtils, logging, xml and
io.SelectorUtils/MatchPatterns/DirectoryScanner parts stay on
maven-shared-utils: no replacement yet, or plexus-utils is not on that
classpath.
Part of apache/maven-shared-utils#452
---
.../apache/maven/plugin/failsafe/VerifyMojo.java | 5 ++--
.../failsafe/util/FailsafeSummaryXmlUtils.java | 2 +-
.../plugin/surefire/AbstractSurefireMojo.java | 30 ++++++++++++++--------
.../maven/plugin/surefire/SurefireProperties.java | 2 +-
.../maven/plugin/surefire/TestClassPath.java | 2 +-
.../booterclient/ClasspathForkConfiguration.java | 2 +-
.../booterclient/JarManifestForkConfiguration.java | 2 +-
.../ModularClasspathForkConfiguration.java | 2 +-
.../surefire/report/DefaultReporterFactory.java | 2 +-
.../maven/plugin/surefire/report/FileReporter.java | 2 +-
.../surefire/report/StatelessXmlReporter.java | 4 +--
.../plugin/surefire/report/WrappedReportEntry.java | 2 +-
.../maven/plugin/surefire/util/FileScanner.java | 2 +-
.../apache/maven/surefire/api/booter/Command.java | 2 +-
.../api/report/CategorizedReportEntry.java | 2 +-
.../maven/surefire/api/testset/ResolvedTest.java | 4 +--
.../surefire/api/testset/TestListResolver.java | 6 ++---
.../surefire/api/util/internal/ClassMethod.java | 2 +-
.../maven/surefire/booter/CommandReader.java | 4 +--
.../maven/surefire/booter/ProcessCheckerType.java | 2 +-
.../maven/surefire/booter/PropertiesWrapper.java | 2 +-
.../booter/SurefireBooterForkException.java | 2 +-
.../surefire/extensions/ConsoleOutputReporter.java | 2 +-
.../surefire/extensions/StatelessReporter.java | 2 +-
.../surefire/report/SmartStackTraceParser.java | 8 +++---
.../junitplatform/JUnitPlatformProvider.java | 4 +--
surefire-report-parser/pom.xml | 4 +--
.../plugins/surefire/report/ReportTestCase.java | 8 +++---
.../surefire/report/SurefireReportParser.java | 17 ++++++------
.../surefire/report/TestSuiteXmlParser.java | 5 +++-
30 files changed, 72 insertions(+), 63 deletions(-)
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
index e6262d1a7..ba5d2a06a 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
@@ -41,7 +41,7 @@
import static org.apache.maven.plugin.surefire.SurefireHelper.reportExecution;
import static org.apache.maven.surefire.api.suite.RunResult.noTestsRun;
-import static
org.apache.maven.surefire.shared.utils.StringUtils.capitalizeFirstLetter;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.capitalize;
/**
* Verify integration tests ran using Failsafe.
@@ -177,8 +177,7 @@ public VerifyMojo(Logger logger) {
public void execute() throws MojoExecutionException, MojoFailureException {
cli = commandLineOptions();
if (verifyParameters()) {
- logDebugOrCliShowErrors(
- capitalizeFirstLetter(getPluginName()) + " report
directory: " + getReportsDirectory());
+ logDebugOrCliShowErrors(capitalize(getPluginName()) + " report
directory: " + getReportsDirectory());
try {
RunResult summary = isSummaryFile(summaryFile) ?
readSummary(summaryFile) : noTestsRun();
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java
index e72d34fcf..14d5e7299 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java
@@ -42,7 +42,7 @@
import static javax.xml.xpath.XPathConstants.NODE;
import static
org.apache.maven.surefire.shared.lang3.StringEscapeUtils.escapeXml10;
import static
org.apache.maven.surefire.shared.lang3.StringEscapeUtils.unescapeXml;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank;
/**
* @author <a href="mailto:[email protected]">Tibor Digana (tibor17)</a>
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index a25488ecb..9ed719ae7 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -25,6 +25,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
+import java.nio.charset.Charset;
import java.nio.file.Files;
import java.text.ChoiceFormat;
import java.util.ArrayList;
@@ -111,8 +112,8 @@
import org.apache.maven.surefire.providerapi.ProviderDetector;
import org.apache.maven.surefire.providerapi.ProviderInfo;
import org.apache.maven.surefire.providerapi.ProviderRequirements;
-import org.apache.maven.surefire.shared.utils.StringUtils;
-import org.apache.maven.surefire.shared.utils.io.FileUtils;
+import org.apache.maven.surefire.shared.io.FileUtils;
+import org.apache.maven.surefire.shared.lang3.StringUtils;
import org.apache.maven.toolchain.DefaultToolchain;
import org.apache.maven.toolchain.Toolchain;
import org.apache.maven.toolchain.ToolchainManager;
@@ -150,13 +151,13 @@
import static
org.apache.maven.surefire.booter.SystemUtils.toJdkHomeFromJvmExec;
import static
org.apache.maven.surefire.booter.SystemUtils.toJdkVersionFromReleaseFile;
import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.capitalize;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotEmpty;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.split;
import static
org.apache.maven.surefire.shared.lang3.StringUtils.substringBeforeLast;
import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS;
-import static
org.apache.maven.surefire.shared.utils.StringUtils.capitalizeFirstLetter;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isEmpty;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isNotEmpty;
-import static org.apache.maven.surefire.shared.utils.StringUtils.split;
import static
org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook;
import static
org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.removeShutdownHook;
@@ -1521,7 +1522,7 @@ protected void cleanupForkConfiguration(ForkConfiguration
forkConfiguration) {
}
protected void logReportsDirectory() {
- logDebugOrCliShowErrors(capitalizeFirstLetter(getPluginName()) + "
report directory: " + getReportsDirectory());
+ logDebugOrCliShowErrors(capitalize(getPluginName()) + " report
directory: " + getReportsDirectory());
}
private boolean existsModuleDescriptor(ResolvePathResultWrapper
resolvedJavaModularityResult) {
@@ -2245,6 +2246,13 @@ private boolean isSpecificTestSpecified() {
}
@Nonnull
+ private static List<String> loadList(File file) throws IOException {
+ return Files.readAllLines(file.toPath(),
Charset.defaultCharset()).stream()
+ .map(String::trim)
+ .filter(line -> !line.isEmpty() && !line.startsWith("#"))
+ .collect(Collectors.toList());
+ }
+
private List<String> readListFromFile(@Nonnull final File file) {
getConsoleLogger().debug("Reading list from: " + file);
@@ -2253,7 +2261,7 @@ private List<String> readListFromFile(@Nonnull final File
file) {
}
try {
- List<String> list = FileUtils.loadFile(file);
+ List<String> list = loadList(file);
if (getConsoleLogger().isDebugEnabled()) {
getConsoleLogger().debug("List contents:");
@@ -3045,7 +3053,7 @@ private void warnIfWrongShutdownValue() throws
MojoFailureException {
}
private void warnIfIllegalTempDir() throws MojoFailureException {
- if (isEmpty(getTempDir())) {
+ if (isBlank(getTempDir())) {
throw new MojoFailureException("Parameter 'tempDir' should not be
blank string.");
}
}
@@ -3313,7 +3321,7 @@ public Set<Artifact> getProviderClasspath() throws
MojoExecutionException {
// need to check there is at least one test engine in the classpath
String junit = (String) getProperties().get("junit");
- boolean runJunit = Boolean.parseBoolean(StringUtils.isEmpty(junit)
? "true" : junit);
+ boolean runJunit = Boolean.parseBoolean(StringUtils.isBlank(junit)
? "true" : junit);
if (StringUtils.isNotEmpty(junit) && !runJunit) {
consoleLogger.debug("System property 'junit' is explicity set
to '" + junit + "'");
} else {
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java
index 0424ff894..426359753 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java
@@ -35,7 +35,7 @@
import org.apache.maven.surefire.booter.Classpath;
import org.apache.maven.surefire.booter.KeyValueSource;
-import org.apache.maven.surefire.shared.utils.StringUtils;
+import org.apache.maven.surefire.shared.lang3.StringUtils;
import static java.util.Arrays.asList;
import static java.util.Map.Entry;
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java
index f5ae2c5e7..b81ea48e7 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java
@@ -28,7 +28,7 @@
import org.apache.maven.surefire.booter.Classpath;
import static java.util.Collections.addAll;
-import static org.apache.maven.surefire.shared.utils.StringUtils.split;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.split;
/**
* this class is part of internal implementation and should not be used.
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java
index c5711ee52..2ad883315 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java
@@ -32,7 +32,7 @@
import org.apache.maven.surefire.booter.SurefireBooterForkException;
import org.apache.maven.surefire.extensions.ForkNodeFactory;
-import static org.apache.maven.surefire.shared.utils.StringUtils.join;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.join;
/**
* @author <a href="mailto:[email protected]">Tibor Digana (tibor17)</a>
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java
index e3faca566..e3987d0c3 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java
@@ -56,7 +56,7 @@
import static
org.apache.maven.plugin.surefire.booterclient.JarManifestForkConfiguration.ClasspathElementUri.absolute;
import static
org.apache.maven.plugin.surefire.booterclient.JarManifestForkConfiguration.ClasspathElementUri.relative;
import static org.apache.maven.surefire.api.util.internal.StringUtils.NL;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank;
/**
* @author <a href="mailto:[email protected]">Tibor Digana (tibor17)</a>
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java
index ab85aca42..3022ab080 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java
@@ -46,7 +46,7 @@
import static java.io.File.pathSeparatorChar;
import static
org.apache.maven.plugin.surefire.SurefireHelper.escapeToPlatformPath;
import static org.apache.maven.surefire.api.util.internal.StringUtils.NL;
-import static org.apache.maven.surefire.shared.utils.StringUtils.replace;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.replace;
/**
* @author <a href="mailto:[email protected]">Tibor Digana (tibor17)</a>
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
index 0504aa899..0eaffd532 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
@@ -41,7 +41,7 @@
import
org.apache.maven.surefire.extensions.StatelessTestsetInfoConsoleReportEventListener;
import
org.apache.maven.surefire.extensions.StatelessTestsetInfoFileReportEventListener;
import org.apache.maven.surefire.report.RunStatistics;
-import org.apache.maven.surefire.shared.utils.StringUtils;
+import org.apache.maven.surefire.shared.lang3.StringUtils;
import org.apache.maven.surefire.shared.utils.logging.MessageBuilder;
import static org.apache.maven.plugin.surefire.log.api.Level.resolveLevel;
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
index dfafeb531..d25d38b9f 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
@@ -31,7 +31,7 @@
import
org.apache.maven.surefire.extensions.StatelessTestsetInfoFileReportEventListener;
import static
org.apache.maven.plugin.surefire.report.FileReporterUtils.stripIllegalFilenameChars;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank;
/**
* Base class for file reporters.
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index 71cfaf630..1ae9acc28 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -47,8 +47,8 @@
import static
org.apache.maven.plugin.surefire.report.FileReporterUtils.stripIllegalFilenameChars;
import static org.apache.maven.plugin.surefire.report.ReportEntryType.SKIPPED;
import static org.apache.maven.plugin.surefire.report.ReportEntryType.SUCCESS;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank;
// CHECKSTYLE_OFF: LineLength
/**
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
index be7dc3686..7ea3a93c6 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
@@ -32,7 +32,7 @@
import static java.util.Collections.unmodifiableMap;
import static org.apache.maven.surefire.api.util.internal.StringUtils.NL;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank;
/**
* @author Kristian Rosenvold
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java
index 29e19bfbb..3c8f25473 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java
@@ -23,7 +23,7 @@
import org.apache.maven.surefire.api.testset.TestFilter;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank;
final class FileScanner {
private final File basedir;
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java
b/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java
index d3d669eb8..d3393e421 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java
@@ -21,7 +21,7 @@
import java.util.Objects;
import static java.util.Objects.requireNonNull;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank;
/**
* Encapsulates data and command sent from master to forked process.
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/api/report/CategorizedReportEntry.java
b/surefire-api/src/main/java/org/apache/maven/surefire/api/report/CategorizedReportEntry.java
index 0155d6788..b3a33e80b 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/api/report/CategorizedReportEntry.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/api/report/CategorizedReportEntry.java
@@ -25,7 +25,7 @@
import java.util.Map;
import java.util.Objects;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank;
/**
* @author Kristian Rosenvold
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java
b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java
index 915894fce..74fb74664 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java
@@ -20,12 +20,12 @@
import java.util.regex.Pattern;
-import org.apache.maven.surefire.shared.utils.StringUtils;
+import org.apache.maven.surefire.shared.lang3.StringUtils;
import org.apache.maven.surefire.shared.utils.io.MatchPatterns;
import static java.io.File.separatorChar;
import static java.util.regex.Pattern.compile;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank;
import static org.apache.maven.surefire.shared.utils.io.MatchPatterns.from;
import static
org.apache.maven.surefire.shared.utils.io.SelectorUtils.PATTERN_HANDLER_SUFFIX;
import static
org.apache.maven.surefire.shared.utils.io.SelectorUtils.REGEX_HANDLER_PREFIX;
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java
b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java
index efc61cb05..7b51a8552 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java
@@ -28,9 +28,9 @@
import static java.util.Collections.unmodifiableSet;
import static org.apache.maven.surefire.api.testset.ResolvedTest.Type.CLASS;
import static org.apache.maven.surefire.api.testset.ResolvedTest.Type.METHOD;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
-import static org.apache.maven.surefire.shared.utils.StringUtils.split;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.split;
import static
org.apache.maven.surefire.shared.utils.io.SelectorUtils.PATTERN_HANDLER_SUFFIX;
import static
org.apache.maven.surefire.shared.utils.io.SelectorUtils.REGEX_HANDLER_PREFIX;
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java
b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java
index a4436e702..ee819ade6 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java
@@ -20,7 +20,7 @@
import java.util.Objects;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank;
/**
* Data transfer object of class and method literals.
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
index 18deb3e9c..44430ad8e 100644
---
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
@@ -54,8 +54,8 @@
import static
org.apache.maven.surefire.api.booter.MasterProcessCommand.SHUTDOWN;
import static
org.apache.maven.surefire.api.booter.MasterProcessCommand.SKIP_SINCE_NEXT_TEST;
import static
org.apache.maven.surefire.api.util.internal.DaemonThreadFactory.newDaemonThread;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank;
/**
* Reader of commands coming from plugin(master) process.
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java
index a75c7561d..7ff990cc5 100644
---
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.booter;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank;
public enum ProcessCheckerType {
PING("ping"),
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
index 9d250c6ba..d06b6432d 100644
---
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
@@ -23,7 +23,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.maven.surefire.shared.utils.StringUtils;
+import org.apache.maven.surefire.shared.lang3.StringUtils;
/**
* @author Kristian Rosenvold
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
index 56c5e4408..418a31c6d 100644
---
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
@@ -20,7 +20,7 @@
import org.apache.maven.surefire.api.suite.RunResult;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank;
/**
* Encapsulates exceptions thrown during Surefire forking.
diff --git
a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java
b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java
index ceaa3944d..959ca7a33 100644
---
a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java
+++
b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java
@@ -21,7 +21,7 @@
import java.io.File;
import java.io.PrintStream;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank;
/**
* Extension for logger.
diff --git
a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
index 06fb83fd3..98cd57000 100644
---
a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
+++
b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
@@ -20,7 +20,7 @@
import org.apache.maven.surefire.api.report.TestSetReportEntry;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank;
/**
* Extension for stateless reporter.
diff --git
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
index f96a7039a..4a449695c 100644
---
a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
+++
b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java
@@ -26,8 +26,8 @@
import static java.util.Arrays.asList;
import static java.util.Collections.reverse;
-import static org.apache.maven.surefire.shared.utils.StringUtils.chompLast;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isNotEmpty;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotEmpty;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.removeEnd;
/**
* @author Kristian Rosenvold
@@ -126,10 +126,10 @@ public String getString() {
private static String toMinimalThrowableMiniMessage(Class<?> excType) {
String name = excType.getSimpleName();
if (name.endsWith("Exception")) {
- return chompLast(name, "Exception");
+ return removeEnd(name, "Exception");
}
if (name.endsWith("Error")) {
- return chompLast(name, "Error");
+ return removeEnd(name, "Error");
}
return name;
}
diff --git
a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
index 6f4dc15bc..7a4fc17e0 100644
---
a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
+++
b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java
@@ -55,7 +55,7 @@
import org.apache.maven.surefire.api.util.ReflectionUtils;
import org.apache.maven.surefire.api.util.ScanResult;
import org.apache.maven.surefire.api.util.TestsToRun;
-import org.apache.maven.surefire.shared.utils.StringUtils;
+import org.apache.maven.surefire.shared.lang3.StringUtils;
import org.junit.platform.commons.JUnitException;
import org.junit.platform.engine.ConfigurationParameters;
import org.junit.platform.engine.DiscoverySelector;
@@ -96,7 +96,7 @@
import static
org.apache.maven.surefire.api.testset.TestListResolver.optionallyWildcardFilter;
import static org.apache.maven.surefire.api.util.TestsToRun.fromClass;
import static
org.apache.maven.surefire.api.util.internal.ConcurrencyUtils.runIfZeroCountDown;
-import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank;
import static
org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
import static
org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId;
import static
org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml
index cc649d9af..251ac6cdc 100644
--- a/surefire-report-parser/pom.xml
+++ b/surefire-report-parser/pom.xml
@@ -38,8 +38,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-utils</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
diff --git
a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java
b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java
index bbe7f6a75..17bdc5480 100644
---
a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java
+++
b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java
@@ -22,7 +22,7 @@
import java.util.Collections;
import java.util.List;
-import static org.apache.maven.shared.utils.StringUtils.isNotBlank;
+import static
org.apache.maven.plugins.surefire.report.TestSuiteXmlParser.isBlank;
public final class ReportTestCase {
private String fullClassName;
@@ -130,7 +130,7 @@ public ReportTestCase setFailureDetail(String
failureDetail) {
}
public ReportTestCase setFailure(String message, String type) {
- hasFailure = isNotBlank(type);
+ hasFailure = !isBlank(type);
hasError = false;
hasSkipped = false;
return setFailureMessage(message).setFailureType(type);
@@ -138,7 +138,7 @@ public ReportTestCase setFailure(String message, String
type) {
public ReportTestCase setError(String message, String type) {
hasFailure = false;
- hasError = isNotBlank(type);
+ hasError = !isBlank(type);
hasSkipped = false;
return setFailureMessage(message).setFailureType(type);
}
@@ -146,7 +146,7 @@ public ReportTestCase setError(String message, String type)
{
public ReportTestCase setSkipped(String message) {
hasFailure = false;
hasError = false;
- hasSkipped = isNotBlank(message);
+ hasSkipped = !isBlank(message);
return setFailureMessage(message).setFailureType("skipped");
}
diff --git
a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
index 522bd3be2..02e38f40c 100644
---
a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
+++
b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
@@ -29,16 +29,15 @@
import java.util.Map;
import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
-import org.apache.maven.shared.utils.io.DirectoryScanner;
+import org.codehaus.plexus.util.DirectoryScanner;
import org.xml.sax.SAXException;
-import static org.apache.maven.shared.utils.StringUtils.split;
-
public final class SurefireReportParser {
- private static final String INCLUDES = "*.xml";
+ private static final String[] INCLUDES = {"*.xml"};
- private static final String EXCLUDES =
- "*.txt, testng-failed.xml, testng-failures.xml,
testng-results.xml, failsafe-summary*.xml";
+ private static final String[] EXCLUDES = {
+ "*.txt", "testng-failed.xml", "testng-failures.xml",
"testng-results.xml", "failsafe-summary*.xml"
+ };
private final List<ReportTestSuite> testSuites = new ArrayList<>();
@@ -171,14 +170,14 @@ public static boolean hasReportFiles(File directory) {
&& getIncludedFiles(directory, INCLUDES, EXCLUDES).length != 0;
}
- private static String[] getIncludedFiles(File directory, String includes,
String excludes) {
+ private static String[] getIncludedFiles(File directory, String[]
includes, String[] excludes) {
DirectoryScanner scanner = new DirectoryScanner();
scanner.setBasedir(directory);
- scanner.setIncludes(split(includes, ","));
+ scanner.setIncludes(includes);
- scanner.setExcludes(split(excludes, ","));
+ scanner.setExcludes(excludes);
scanner.scan();
diff --git
a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
index 157b20e7b..aa2dc63b1 100644
---
a/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
+++
b/surefire-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
@@ -38,7 +38,6 @@
import org.xml.sax.helpers.DefaultHandler;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.maven.shared.utils.StringUtils.isBlank;
public final class TestSuiteXmlParser extends DefaultHandler {
private final ConsoleLogger consoleLogger;
@@ -273,6 +272,10 @@ public boolean isValid() {
return valid;
}
+ static boolean isBlank(String s) {
+ return s == null || s.chars().allMatch(Character::isWhitespace);
+ }
+
static boolean isNotBlank(int from, int len, char... s) {
assert from >= 0;
assert len >= 0;