Try fix in plexus-xml

Author: slawekjaranowski

pom.xml

@@ -211,11 +211,6 @@ under the License.
       <artifactId>maven-script-interpreter</artifactId>
       <version>1.6</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-text</artifactId>
-      <version>1.12.0</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -252,6 +247,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-xml</artifactId>
+      <version>4.0.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

src/it/MINVOKER-351/invoker.properties

@@ -15,4 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals = initialize site
+invoker.goals.1 = initialize
+invoker.buildResult.1 = failure
+
+invoker.goals.2 = site

src/it/MINVOKER-351/pom.xml

@@ -28,6 +28,8 @@ under the License.
   <version>1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <description>Special XML chars in build-job, junit reports</description>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <version.maven-compiler-plugin>@version.maven-compiler-plugin@</version.maven-compiler-plugin>

src/it/MINVOKER-351/src/it/minvoker-351/pom.xml

@@ -26,35 +26,10 @@ under the License.
   <groupId>example.minvoker351</groupId>
   <artifactId>minvoker-351</artifactId>
   <version>1.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>8</maven.compiler.source>
-    <maven.compiler.target>8</maven.compiler.target>
   </properties>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>@version.maven-compiler-plugin@</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>@version.maven-surefire@</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <version>5.10.2</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
 </project>

…ava/example/minvoker351/ExampleTest.java …351/src/it/minvoker-351/postbuild.groovysrc/it/MINVOKER-351/src/it/minvoker-351/src/test/java/example/minvoker351/ExampleTest.java renamed to src/it/MINVOKER-351/src/it/minvoker-351/postbuild.groovy src/it/MINVOKER-351/src/it/minvoker-351/src/test/java/example/minvoker351/ExampleTest.java renamed to src/it/MINVOKER-351/src/it/minvoker-351/postbuild.groovy

@@ -16,13 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package example.minvoker351;
 
-import org.junit.jupiter.api.Test;
-
-public class ExampleTest {
-  @Test
-  public void f() {
-    new Example().printAscii();
-  }
-}
+throw new Exception("Special chars \tcharName=" + Character.getName(7) + (char) 7 + ";")

src/it/MINVOKER-351/src/it/minvoker-351/src/main/java/example/minvoker351/Example.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
+// we have a special chars in build.log
 // we have a special chars in build.log
 def buildLog = new File(basedir, 'target/it/minvoker-351/build.log').text
-buildLog.contains('\u0002 - name: START OF TEXT')
-buildLog.contains('\u0007 - name: BEL')
+buildLog.contains('Special chars \tcharName=BEL\u0007;')
 
 
 def surefireReport = new File(basedir, 'target/site/surefire-report.html').text

src/it/MINVOKER-351/verify.groovy

@@ -50,7 +50,6 @@
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
-import org.apache.commons.text.StringEscapeUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Model;
@@ -99,7 +98,6 @@
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
 import org.codehaus.plexus.util.cli.StreamConsumer;
-import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
 import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.XmlStreamWriter;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -1642,7 +1640,7 @@ private void runBuild(
             }
         } catch (RunFailureException e) {
             buildJob.setResult(e.getType());
-            buildJob.setFailureMessage(StringEscapeUtils.escapeXml10(e.getMessage()));
+            buildJob.setFailureMessage(e.getMessage());
 
             if (!suppressSummaries) {
                 getLog().info("  " + e.getMessage());
@@ -1781,7 +1779,7 @@ private void writeJunitReport(BuildJob buildJob, String safeFileName) throws Moj
         if (buildLogFile != null && buildLogFile.exists()) {
             getLog().debug("fileLogger:" + buildLogFile);
             try {
-                systemOut.setValue(StringEscapeUtils.escapeXml10(FileUtils.fileRead(buildLogFile)));
+                systemOut.setValue(FileUtils.fileRead(buildLogFile));
             } catch (IOException e) {
                 throw new MojoExecutionException("Failed to read logfile " + buildLogFile, e);
             }
@@ -1791,7 +1789,7 @@ private void writeJunitReport(BuildJob buildJob, String safeFileName) throws Moj
 
         try (FileOutputStream fos = new FileOutputStream(reportFile);
                 Writer osw = new OutputStreamWriter(fos, buildJob.getModelEncoding())) {
-            Xpp3DomWriter.write(new PrettyPrintXMLWriter(osw), testsuite, false);
+            Xpp3DomWriter.write(osw, testsuite);
         } catch (IOException e) {
             throw new MojoExecutionException("Failed to write JUnit build report " + reportFile, e);
         }