[ARCHETYPE-632] Add logging conflict line in integration-test (#114)

* [ARCHETYPE-632] Add logging conflict line in integration-test * Resolve conflicts --------- Co-authored-by: Slawomir Jaranowski <s.jaranowski@gmail.com>
apache · Sep 14, 2024 · 2e1552b · 2e1552b
1 parent 835d927
commit 2e1552b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/...-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java b/...-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
@@ -405,6 +405,10 @@ private boolean contentEquals(File referenceFile, File actualFile) throws IOExce
                 refLine = referenceFileReader.readLine();
                 actualLine = actualFileReader.readLine();
                 if (!Objects.equals(refLine, actualLine)) {
+                    getLog().warn("Conflict found. Reference line :");
+                    getLog().warn(refLine);
+                    getLog().warn("Actual line :");
+                    getLog().warn(actualLine);
                     return false;
                 }
             } while (refLine != null || actualLine != null);