[SUREFIRE-2012] Use maven-shared-utils instead of surefire-shared-uti…

…ls in Report Parser. Removed commons-lang in Report Plugin.
apache · Feb 14, 2022 · 79ae093 · 79ae093
1 parent e8ac9b6
commit 79ae093
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 15 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -6,3 +6,10 @@ indent_style = space
 indent_size = 4
 end_of_line = lf
 insert_final_newline = true
+
+[*.{xml,xsd,vm}]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
@@ -71,10 +71,6 @@
             <groupId>org.apache.maven.reporting</groupId>
             <artifactId>maven-reporting-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.fusesource.jansi</groupId>
             <artifactId>jansi</artifactId>

diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml
@@ -18,7 +18,8 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -39,9 +40,8 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.surefire</groupId>
-      <artifactId>surefire-shared-utils</artifactId>
-      <version>${surefire-shared-utils.version}</version>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-shared-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
@@ -71,7 +71,8 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.0.0-M4</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+            <version>3.0.0-M4
+            </version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
           </dependency>
         </dependencies>
         <configuration>

diff --git a/...-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java b/...-report-parser/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
+import static org.apache.maven.shared.utils.StringUtils.isNotBlank;
 
 /**
  *

diff --git a/...t-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java b/...t-parser/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
@@ -33,10 +33,10 @@
 
 import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
 import org.apache.maven.reporting.MavenReportException;
-import org.apache.maven.surefire.shared.utils.io.DirectoryScanner;
+import org.apache.maven.shared.utils.io.DirectoryScanner;
 import org.xml.sax.SAXException;
 
-import static org.apache.maven.surefire.shared.utils.StringUtils.split;
+import static org.apache.maven.shared.utils.StringUtils.split;
 
 /**
  *

diff --git a/...ort-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java b/...ort-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
@@ -35,14 +35,14 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
-import org.apache.maven.surefire.shared.utils.StringUtils;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Locale.ENGLISH;
+import static org.apache.maven.shared.utils.StringUtils.isBlank;
 
 /**
  *
@@ -138,7 +138,7 @@ public void startElement( String uri, String localName, String qName, Attributes
 
                         final String name = attributes.getValue( "name" );
                         final String group = attributes.getValue( "group" );
-                        defaultSuite.setFullClassName( StringUtils.isBlank( group )
+                        defaultSuite.setFullClassName( isBlank( group )
                                 ? /*name is full class name*/ name
                                 : /*group is package name*/ group + "." + name );
 
@@ -171,7 +171,7 @@ public void startElement( String uri, String localName, String qName, Attributes
                         }
 
                         String timeAsString = attributes.getValue( "time" );
-                        Number time = StringUtils.isBlank( timeAsString ) ? 0 : numberFormat.parse( timeAsString );
+                        Number time = isBlank( timeAsString ) ? 0 : numberFormat.parse( timeAsString );
 
                         testCase.setFullClassName( currentSuite.getFullClassName() )
                                 .setClassName( currentSuite.getName() )